Imported Upstream version 5.2.8

340 files changed, 178062 insertions, 90068 deletions

diff --git a/AUTHORS b/AUTHORS
index dd9d17b..8b6e1e8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,7 +17,8 @@ was released in November 2001.  Roger Leigh in particular has
 reimplemented the build system to match the GNU standard, making for a
 far more flexible and powerful system.
 
-Version 4.3 is being developed by essentially the same team.
+Versions 5.0 and 5.2 have been developed by various people, who have
+changed over time.
 
 The list of contributors, in alphabetical order, is as follows.  The
 principal areas that each contributed to are listed in addition.
@@ -51,6 +52,9 @@ Eugene Anikin		<eugene@anikin.com>
 	Performance instrumentation
 	Sharp-eyed bug fixer
 
+Gernot Hassenpflug	<aikishugyo@gmail.com>
+	Canon driver
+
 Grant Taylor		<gtaylor@picante.com>
 	Implementor of the "foomatic" spooler configuration system
 
@@ -71,6 +75,9 @@ Karl Heinz Kremer	<khk@khk.net>
 Karsten Festag		<karsten.festag@gmx.de>
 	Canon S200 support
 
+Matthew Broughton	<walterwego@macosx.com>
+	Mac support
+
 Mark Tomlinson		<mark.tomlinson@xtra.co.nz>
 	Implementation of Raph Levien's EvenTone dither
 
diff --git a/ChangeLog b/ChangeLog
index 36f37b3..f973e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4572 @@
+2012-06-07	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.578) (+7 -7)
+
+	Fix numbering.
+
+2012-06-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.577) (+7 -8)
+
+	Tweaks
+
+2012-06-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.576) (+284 -247)
+
+	Draft release notes, out for review.
+
+2012-06-05	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.575) (+3 -3)
+		README (1.213) (+20 -20)
+		configure.ac (1.233) (+3 -3)
+
+	Bump version
+
+2012-06-02	<rlk@sourceforge.net>
+
+	Files:	doc/gutenprint-users-manual.odt (1.6) (+379 -424)
+		doc/gutenprint-users-manual.pdf (1.6) (+2424 -4265)
+
+	Remove printer list
+
+2012-05-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.574) (+25 -12)
+
+	Added comment on PIXUS models to NEWS file.
+
+2012-05-27	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.247) (+1 -2)
+
+	Removed duplicate Canon iP2700 printer entry in printers.xml
+
+2012-05-26	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.232) (+10 -2)
+		doc/Makefile.am (1.50) (+5 -1)
+		doc/developer/Makefile.am (1.23) (+5 -1)
+
+	Add --with/without-doc
+
+2012-05-26	<rlk@sourceforge.net>
+
+	Files:	src/main/print-weave.c (1.81) (+16 -9)
+
+	Fix compiler warning
+
+2012-05-26	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/printer_options.c (1.53) (+2 -1)
+		src/testpattern/printer_options.c (1.6) (+2 -1)
+
+	Clear resolution after setting it to ensure that it doesn't pollute
+	the option choices.
+
+2012-05-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.523) (+143 -72)
+		src/main/print-weave.c (1.80) (+1 -8)
+
+	Fixed weave code in Canon backend to avoid accessing uninitialized variables. Created new function for finding correct InkType in canon_check_current_mode, and added debug statements to clarify changes before and after processing of canon_check_current_mode.
+
+2012-05-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.522) (+11 -11)
+
+	Changed some debug printf casting in Canon backend
+
+2012-05-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.521) (+28 -2)
+		src/main/print-weave.c (1.79) (+8 -1)
+
+	Added initialization to some weave code in Canon backend
+
+2012-05-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.520) (+3 -3)
+
+	Set ncolors correctly for CMY inktype in Canon weave mode.
+
+2012-05-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.377) (+1 -1)
+		src/main/print-canon.c (1.519) (+20 -11)
+
+	Fixed missing Color cartridge support flag in Canon iP6210D mode.
+
+2012-05-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.518) (+6 -4)
+
+	Changed number of inks for CMY inktype in S200 weave code in Canon backend.
+
+2012-05-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.517) (+20 -8)
+
+	Added debug statements to Canon backend
+
+2012-05-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.160) (+6 -6)
+		src/main/canon-modes.h (1.376) (+4 -4)
+
+	Removed color(-only) inkset (cartridge) support from plain, envelope, hagaki media for Canon iP90 and iP100. Known InkTypes for these printers do not yet permit this inkset (cartridge) to be used.
+
+2012-05-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.516) (+12 -8)
+
+	Added setting of local variable for each PrintingMode setting change in Canon backend canon_check_current_mode.
+
+2012-05-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.515) (+518 -28)
+
+	Corrected InkType matching and substitution in Canon backend canon_check_current_mode function.
+
+2012-05-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.375) (+58 -57)
+		src/main/print-canon.c (1.514) (+150 -88)
+
+	In Canon backend, fixed checking routine for PrintingMode and InkType parameter consistency when mode is known.
+
+2012-05-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.513) (+3 -1)
+
+	Added debug lines to Canon backend
+
+2012-05-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.573) (+41 -31)
+		src/main/print-canon.c (1.512) (+7 -2)
+		src/xml/printers.xml (1.246) (+6 -5)
+
+	Moved Resolution modification in canon_do_print to check_current_mode in Canon backend. Updated and rewrote NEWS.
+
+2012-05-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.511) (+28 -9)
+
+	Bug fix to Canon backend: made sure Resolution is set to match that of current mode after mode replacement.
+
+2012-05-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.510) (+19 -4)
+
+	Removed parameter verification outside of the Canon backend for InkType, InkSet and PrintingMode.
+
+2012-05-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.509) (+22 -8)
+
+	added more debug statements to Canon backend. Made canon_check_current_mode an unconditional call(bugfix).
+
+2012-05-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.508) (+3 -3)
+
+	Fix a couple of minor compiler warnings
+
+2012-05-18	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.507) (+7 -4)
+
+	Added some debug lines for Canon printhead color function
+
+2012-05-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.306) (+3 -3)
+		src/main/print-canon.c (1.506) (+13 -8)
+		src/main/print-canon.h (1.9) (+5 -5)
+
+	Added flag to Canon backend for printers without black ink only cartridge support.
+
+2012-05-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.572) (+13 -9)
+
+	Minor updates.
+
+2012-05-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.505) (+10 -16)
+
+	Changed fullbleed margins in Canon backend to match Windows ones.
+
+2012-05-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.504) (+91 -71)
+
+	Provisional working support for borderless printing with Canon backend (WIP).
+
+2012-05-11	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui2/printrcl.l (1.2) (+3 -1)
+		src/testpattern/testpatternl.l (1.27) (+3 -1)
+
+	Add extern declaration for yylval; some versions of bison apparently do not
+
+2012-05-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.159) (+26 -26)
+		src/main/canon-modes.h (1.374) (+4 -4)
+		src/main/print-canon.c (1.503) (+10 -17)
+
+	Added partial support for Color InkSet in Canon iP90 and iP100 (known as 'black save', with two different settings of which only 1 is implemented at this stage).
+
+2012-05-09	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.571) (+18 -21)
+		src/main/canon-modes.h (1.373) (+50 -50)
+		src/main/canon-printers.h (1.305) (+2 -2)
+
+	Corrected some notation in Canon mode names. Updated NEWS file.
+
+2012-05-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.158) (+239 -162)
+		src/main/canon-modes.h (1.372) (+27 -0)
+		src/main/canon-printers.h (1.304) (+3 -3)
+
+	Checked and corrected Canon InkSet and Duplex capabilities for various media. Set duplex capability for Hagaki media even where Windows driver does not expose such capability. Corrected Canon iP6600D printer modes and media definitions.
+
+2012-05-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.157) (+7 -7)
+		src/main/canon-modes.h (1.371) (+2 -2)
+
+	Added flags to several Canon MX series media-mode data.
+
+2012-05-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.502) (+57 -34)
+
+	Modified Canon backend code to comply with compiler warnings.
+
+2012-05-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.156) (+14 -14)
+		src/main/canon-printers.h (1.303) (+3 -5)
+		src/xml/printers.xml (1.245) (+3 -1)
+
+	Added remaining support for Canon E500 and E600.
+
+2012-05-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.155) (+59 -0)
+
+	Added partial media-mode data (less flags) for Canon E500.
+
+2012-05-08	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.570) (+2 -0)
+		src/main/canon-modes.h (1.370) (+18 -0)
+		src/main/canon-printers.h (1.302) (+34 -0)
+		src/main/print-canon.c (1.501) (+2 -1)
+
+	Added partial code for Canon E500 and E600 multi-function pritners.
+
+2012-05-08	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.569) (+2 -0)
+		src/main/canon-modes.h (1.369) (+1 -1)
+		src/xml/printers.xml (1.244) (+2 -1)
+
+	Added Canon iP6320D (same as iP6310D).
+
+2012-05-08	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.243) (+2 -1)
+		test/pixma_parse.c (1.33) (+1 -1)
+
+	Added Canon MP260 (clone of MP240). Added newline in pixma_parse output.
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.301) (+3 -3)
+
+	changed max paper dimensions for Canon MP360, MP370, MP375R, MP390; MP700, MP730; and MP710, MP740.
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.300) (+2 -2)
+
+	changed max paper dimensions for Canon MP493 and MP990.
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.299) (+34 -34)
+		src/xml/printers.xml (1.242) (+3 -3)
+
+	changed max paper dimensions for Canon MP series printers. Added some printer aliases, removed duplicates.
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.298) (+7 -7)
+
+	Corrected maximum paper sizes for several Canon modes (MP series).
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.297) (+67 -67)
+		src/xml/printers.xml (1.241) (+4 -1)
+
+	Corrected maximum paper sizes for several Canon modes (iP series). Fixed erroroneous page width for previous commits. Added several Canon printer aliases.
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.296) (+14 -14)
+
+	Corrected maximum paper sizes for several Canon modes (MX series).
+
+2012-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.295) (+34 -34)
+
+	Corrected maximum paper sizes for several Canon modes (i series).
+
+2012-05-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.500) (+12 -1)
+
+	Added missing function prototype declarations to canon-print.c
+
+2012-05-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.294) (+4 -4)
+
+	changed max paper dimensions for Canon iX series printers.
+
+2012-05-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.293) (+32 -36)
+		src/main/print-canon.c (1.499) (+29 -29)
+
+	changed max paper dimensions and margins for several Canon models.
+
+2012-05-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.498) (+3 -2)
+
+	correct Canon get_current_mode to return NULL if no mode selected (regression).
+
+2012-05-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.292) (+51 -0)
+		src/main/print-canon.c (1.497) (+417 -811)
+
+	Wrote various sub-functions for Canon backend mode replacement code.
+
+2012-05-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.496) (+10 -10)
+
+	Settled constant declarations in Canon backend.
+
+2012-05-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.495) (+58 -4)
+
+	Replaced canon_get_current_mode in Canon backend with original one, and created new canon_replace_current_mode to be called in canon_do_print. WIP.
+
+2012-05-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.291) (+1 -1)
+
+	Added cassette to Canon i990 and 990i media sources.
+
+2012-04-30	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.568) (+2 -0)
+		src/main/canon-media-mode.h (1.154) (+105 -0)
+		src/main/canon-modes.h (1.368) (+39 -2)
+		src/main/canon-printers.h (1.290) (+16 -0)
+		src/main/print-canon.c (1.494) (+3 -3)
+		src/xml/printers.xml (1.240) (+3 -1)
+
+	Added Canon i990, and corresponding Japan model 990i. Fixed CD mode flags for i9900.
+
+2012-04-30	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.567) (+1 -0)
+		src/xml/printers.xml (1.239) (+2 -1)
+
+	Added Canon i9950, clone of i9900.
+
+2012-04-30	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.566) (+2 -0)
+		src/main/canon-media-mode.h (1.153) (+19 -11)
+		src/main/canon-media.h (1.130) (+37 -1)
+		src/main/canon-modes.h (1.367) (+10 -0)
+		src/main/canon-printers.h (1.289) (+3 -3)
+		src/xml/printers.xml (1.238) (+3 -1)
+
+	Added inkjet Hagaki modes to Canon i9100 and i9900, and CD support to i9900. Added corresponding Japan models 9100i and 9900i.
+
+2012-04-29	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.565) (+1 -0)
+		src/xml/printers.xml (1.237) (+4 -1)
+
+	Added Canon i965, clone of i960 (Europe). Updated printers.xml.
+
+2012-04-29	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.564) (+2 -0)
+		src/main/canon-media-mode.h (1.152) (+47 -27)
+		src/main/canon-media.h (1.129) (+20 -0)
+		src/main/canon-modes.h (1.366) (+25 -12)
+		src/main/canon-printers.h (1.288) (+3 -3)
+
+	Added Hagaki, inkjet Hagaki, CD to i950 and i960. Added corresponding Japan models 950i and 960i.
+
+2012-04-28	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.563) (+2 -0)
+		src/main/canon-media-mode.h (1.151) (+19 -4)
+		src/main/canon-modes.h (1.365) (+9 -2)
+		src/main/canon-printers.h (1.287) (+2 -2)
+		src/xml/printers.xml (1.236) (+4 -2)
+
+	Added Hagaki, inkjet Hagaki, CD to i900D. Added corresponding Japan model 900PD. Also added i905D which seems to be clone of i900D (although missing high resolution for CD in Windows driver).
+
+2012-04-28	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.562) (+2 -0)
+		src/main/canon-media-mode.h (1.150) (+0 -82)
+		src/main/canon-media.h (1.128) (+2 -27)
+		src/main/canon-modes.h (1.364) (+0 -31)
+		src/main/canon-printers.h (1.286) (+1 -17)
+		src/xml/printers.xml (1.235) (+3 -2)
+
+	Removed separate driver for Canon i865, as it is same as i860. Added corresponding Japan model 865R.
+
+2012-04-28	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.561) (+2 -0)
+		src/main/canon-media-mode.h (1.149) (+29 -15)
+		src/main/canon-modes.h (1.363) (+13 -10)
+		src/main/canon-printers.h (1.285) (+2 -2)
+		src/xml/printers.xml (1.234) (+2 -1)
+
+	Added inkjet Hagaki, Hagaki, and CD media types and corresponding modes to Canon i860, and added Japan model 860i.
+
+2012-04-28	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.560) (+10 -3)
+		src/main/canon-media-mode.h (1.148) (+13 -3)
+		src/main/canon-media.h (1.127) (+20 -1)
+		src/main/canon-modes.h (1.362) (+13 -7)
+		src/main/canon-printers.h (1.284) (+19 -19)
+		src/xml/printers.xml (1.233) (+2 -1)
+
+	Added inkjet Hagaki, Hagaki, and CD media types and corresponding modes to Canon i560, and added Japan model 560i. Also added borderless option to all Canon i* and *i series printers.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.232) (+5 -1)
+
+	Added Canon modes i450X, i455X, i550X and i560X, which are clones of the non-X models sold by some European media outlets. Distinguished only by different cover color.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.559) (+3 -0)
+		src/xml/printers.xml (1.231) (+4 -1)
+
+	Added Japan model Canon 470PD and 475PD, corresponding to non-Japan models i470D and i475D, which are PictBridge-enabled versions of the 450i and 455i, and i450 and i455 respectively.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.558) (+1 -0)
+		src/main/canon-media.h (1.126) (+1 -1)
+		src/main/canon-modes.h (1.361) (+1 -0)
+		src/xml/printers.xml (1.230) (+2 -1)
+
+	Added separate driver for Japan model Canon 850i. The non-Japan model i850 gets support for inkjet Hagaki and Hagaki media.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.557) (+5 -0)
+		src/main/canon-media.h (1.125) (+1 -1)
+		src/main/canon-modes.h (1.360) (+1 -0)
+		src/xml/printers.xml (1.229) (+3 -1)
+
+	Added separate drivers for Japan models Canon 6100i and 6500i. The non-Japan models i6100 and i6500 get support for inkjet Hagaki and Hagaki media.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.147) (+14 -2)
+		src/main/canon-media.h (1.124) (+21 -5)
+		src/main/canon-modes.h (1.359) (+11 -4)
+		src/main/canon-printers.h (1.283) (+1 -1)
+		src/xml/printers.xml (1.228) (+4 -1)
+
+	Added separate inkjet Hagaki modes to Canon i450, i455, i550. Added separate drivers for Japan models 450i, 455i, 550i.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.556) (+6 -1)
+		src/main/canon-media-mode.h (1.146) (+19 -6)
+		src/main/canon-media.h (1.123) (+2 -2)
+		src/main/canon-modes.h (1.358) (+6 -1)
+		src/main/canon-printers.h (1.282) (+1 -1)
+		src/xml/printers.xml (1.227) (+5 -4)
+
+	added inkjet Hagaki and Hagaki support to Canon i80. Added missing mode for plusGlossy photo paper. Created new printer for Japanese model 80i.
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.32) (+0 -1)
+
+	fixed output for ESC (l command in parser
+
+2012-04-27	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.226) (+7 -7)
+
+	Corrected entry for Canon 50i
+
+2012-04-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.493) (+4 -3)
+
+	Commented out Canon borderless deactivation in case of paper margins. Need to fix.
+
+2012-04-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.145) (+2 -72)
+		src/main/canon-media.h (1.122) (+0 -17)
+		src/main/canon-modes.h (1.357) (+3 -25)
+		src/main/canon-printers.h (1.281) (+1 -16)
+		src/main/print-canon.c (1.492) (+3 -3)
+		src/xml/printers.xml (1.225) (+2 -2)
+
+	Updated Canon 50i modes. i70 is the non-Japanese counterpart, so removed definitions for i70 and used 50i driver instead. Updated some debugging statements.
+
+2012-04-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.491) (+74 -77)
+
+	Changed debug statements in Canon backend.
+
+2012-04-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.555) (+1 -0)
+		src/xml/printers.xml (1.224) (+2 -1)
+
+	Added Canon MX320, same as MX330.
+
+2012-04-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.490) (+12 -10)
+
+	further debug statement changes to Canon backend.
+
+2012-04-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.489) (+39 -15)
+
+	more debugging statement to Canon backend for borderless printing debugging.
+
+2012-04-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.488) (+16 -9)
+
+	debugging Canon borderless printing. Commented out problematic code.
+
+2012-04-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.487) (+35 -13)
+
+	smal changes to borderless printing of Canon backend, part of debugging attempt.
+
+2012-04-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.486) (+42 -14)
+
+	Added corrections for borderless printing. page_height is still incorrect.
+
+2012-04-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.280) (+103 -103)
+		src/main/print-canon.c (1.485) (+121 -35)
+
+	borderless printing for Canon backend partially implemented. Writing area_right and area_top (negative values) to printjob header not yet working. use_aximum_area condition not yet implemented.
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.554) (+2 -0)
+		src/main/canon-media-mode.h (1.144) (+70 -0)
+		src/main/canon-modes.h (1.356) (+23 -0)
+		src/main/canon-printers.h (1.279) (+16 -0)
+		src/xml/printers.xml (1.223) (+3 -1)
+
+	Added support for Canon MX710 (and MX890).
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.553) (+1 -0)
+		src/main/canon-media-mode.h (1.143) (+57 -0)
+		src/main/canon-modes.h (1.355) (+23 -5)
+		src/main/canon-printers.h (1.278) (+16 -0)
+		src/main/print-canon.c (1.484) (+2 -2)
+		src/xml/printers.xml (1.222) (+2 -1)
+
+	Added provisional support for Canon MX510. Color-only cartridge selection does not work yet.
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.552) (+2 -0)
+		src/main/canon-media-mode.h (1.142) (+57 -1)
+		src/main/canon-modes.h (1.354) (+17 -0)
+		src/main/canon-printers.h (1.277) (+16 -0)
+		src/xml/printers.xml (1.221) (+3 -1)
+
+	Added provisional support for Canon MX370 (and MX430). Color-only cartridge selection does not work yet.
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.141) (+7 -1)
+		src/main/canon-modes.h (1.353) (+86 -75)
+
+	Corrected flags for CD modes for all Canon models.
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.551) (+1 -0)
+		src/main/canon-media-mode.h (1.140) (+67 -7)
+		src/main/canon-printers.h (1.276) (+5 -5)
+		src/main/print-canon.c (1.483) (+73 -3)
+		src/xml/printers.xml (1.220) (+2 -1)
+
+	Added experimental support for Canon iP90 and iP100, with ESC (S command. ESC (T variations not yet fully implemented. Also, printjob format is still uncertain, as the parser segfaults on the print data.
+
+2012-04-22	<gernot2270@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.31) (+97 -91)
+
+	Changed parse output of pixma_parse to go to stderr, to help debug printjobs where the parser segfaults.
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.550) (+2 -0)
+		src/main/canon-printers.h (1.275) (+158 -154)
+
+	Adjusted top margin of most Canon models.
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.549) (+3 -0)
+		src/main/canon-inks.h (1.115) (+32 -0)
+		src/main/canon-media-mode.h (1.139) (+9 -5)
+		src/main/canon-modes.h (1.352) (+3 -3)
+		src/main/print-canon.c (1.482) (+18 -5)
+
+	Added experimental support for high quality photo modes with Canon iP6210D, iP6220D, and iP6310D.
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.138) (+5 -6)
+		src/main/canon-modes.h (1.351) (+1 -1)
+
+	Added 8-bit ink modes to Canon MX300 (and MX310).
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.548) (+2 -0)
+		src/main/canon-media-mode.h (1.137) (+72 -0)
+		src/main/canon-modes.h (1.350) (+1 -1)
+		src/main/canon-printers.h (1.274) (+1 -1)
+		src/xml/printers.xml (1.219) (+3 -1)
+
+	Added experimental support for Canon iP90, iP90v. Still need to check orientation of print (may need vertical dimension reversed).
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.136) (+8 -12)
+		src/main/canon-modes.h (1.349) (+1 -1)
+		src/main/canon-printers.h (1.273) (+2 -2)
+
+	Added 8-bit ink modes to Canon MP190. Adjusted top margin on MP190, MP210 models.
+
+2012-04-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.547) (+3 -0)
+		src/main/canon-media-mode.h (1.135) (+24 -24)
+		src/main/canon-modes.h (1.348) (+16 -7)
+		src/main/canon-printers.h (1.272) (+1 -1)
+
+	Added 8-bit ink modes to Canon i80, i450, i455 models. Adjusted top margin on MP150 model.
+
+2012-04-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.347) (+4 -7)
+
+	Activated 8-bit modes in unsupported printers for completeness.
+
+2012-04-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.134) (+5 -2)
+		src/main/canon-modes.h (1.346) (+1 -1)
+
+	Activated 8-bit ink mode in Canon iP6210D model.
+
+2012-04-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.133) (+17 -27)
+		src/main/canon-modes.h (1.345) (+2 -2)
+
+	Activated 8-bit ink modes in Canon MP210 and MP470 models.
+
+2012-04-19	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.546) (+3 -0)
+		src/main/canon-printers.h (1.271) (+481 -162)
+		src/main/print-canon.c (1.481) (+21 -46)
+
+	Added length of ESC (P command to printer definitions in Canon backend.
+
+2012-04-19	<gernot2270@sourceforge.net>
+
+	Files:	include/gutenprint/bit-ops.h (1.5) (+12 -1)
+		src/main/bit-ops.c (1.15) (+104 -1)
+		src/main/print-canon.c (1.480) (+32 -33)
+		test/pixma_parse.c (1.30) (+6 -2)
+
+	Completed support for 8-bit inks in Canon backend. Mode present in Canon MP150 model. To be added to other models.
+
+2012-04-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.479) (+43 -33)
+
+	added initial support code (WIP) for 8-bpp inks to Canon backend in canon_compress function.
+
+2012-04-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.132) (+17 -17)
+		src/main/canon-modes.h (1.344) (+1 -1)
+		src/main/print-canon.c (1.478) (+24 -7)
+
+	activated 600x600dpi_photohigh mode with 13_c9m9y9 inkset in Canon backend in order to debug the incorrect image width. This mode is used by several printer families for high quality photo printing.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.545) (+7 -2)
+		src/main/canon-printers.h (1.270) (+161 -160)
+		src/main/print-canon.c (1.477) (+7 -9)
+
+	Implemented correct ESC (l command length for Canon printers.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.131) (+401 -401)
+		src/main/canon-printers.h (1.269) (+165 -0)
+		src/main/print-canon.c (1.476) (+1244 -1733)
+
+	Implemented mode and media cross-checking for Canon backend: only modes permitted for given media will be used, replacing as necessary. Supports: duplex mode substitution, black and color-only cartridge mode substitution, and photo cartridge mode substitution.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.130) (+75 -0)
+		src/main/print-canon.c (1.475) (+9 -5)
+
+	Added Canon BJC S900 to media-mode combinations.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.129) (+70 -0)
+		src/main/print-canon.c (1.474) (+9 -5)
+
+	Added Canon BJC S820 to media-mode combinations.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.128) (+83 -0)
+		src/main/print-canon.c (1.473) (+9 -5)
+
+	Added Canon BJC S800 to media-mode combinations.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.127) (+72 -0)
+		src/main/canon-modes.h (1.343) (+2 -2)
+		src/main/print-canon.c (1.472) (+9 -5)
+
+	Added Canon BJC S750 to media-mode combinations.
+
+2012-04-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.126) (+75 -0)
+		src/main/print-canon.c (1.471) (+9 -5)
+
+	Added Canon BJC S600 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.125) (+74 -0)
+		src/main/print-canon.c (1.470) (+9 -5)
+
+	Added Canon BJC S520 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.124) (+68 -0)
+		src/main/canon-modes.h (1.342) (+1 -1)
+		src/main/print-canon.c (1.469) (+9 -5)
+
+	Added Canon BJC S500 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.123) (+65 -0)
+		src/main/print-canon.c (1.468) (+9 -5)
+
+	Added Canon BJC S330 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.122) (+60 -23)
+		src/main/print-canon.c (1.467) (+9 -5)
+
+	Added Canon BJC S300 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.121) (+370 -0)
+		src/xml/printers.xml (1.218) (+2 -2)
+
+	added all remaining distinct Canon BJC printers to media-mode data. No data available to choose modes per media, so all modes qualify for all media.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.120) (+38 -0)
+		src/main/print-canon.c (1.466) (+9 -5)
+
+	Added Canon BJC 4550 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.119) (+60 -0)
+		src/main/print-canon.c (1.465) (+9 -5)
+
+	Added Canon BJC 4300 to media-mode combinations.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.118) (+80 -0)
+		src/main/canon-printers.h (1.268) (+2 -2)
+		src/main/print-canon.c (1.464) (+414 -25)
+
+	Added Canon BJC 3000 to media-mode combinations. Added support for photo and full-color ink cartridge selection for BJC series.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.117) (+71 -0)
+		src/main/canon-modes.h (1.341) (+31 -0)
+		src/main/canon-printers.h (1.267) (+1 -1)
+		src/main/print-canon.c (1.463) (+9 -5)
+
+	Added Canon MG3100 to media-mode combinations. Separated out mode definitions from MG2100.
+
+2012-04-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.116) (+70 -0)
+		src/main/canon-modes.h (1.340) (+14 -14)
+		src/main/print-canon.c (1.462) (+9 -5)
+
+	Added Canon MG2100 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.115) (+93 -0)
+		src/main/canon-modes.h (1.339) (+2 -2)
+		src/main/print-canon.c (1.461) (+9 -5)
+
+	Added Canon MG8200 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.114) (+93 -0)
+		src/main/canon-modes.h (1.338) (+2 -2)
+		src/main/print-canon.c (1.460) (+9 -5)
+
+	Added Canon MG6200 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.113) (+78 -0)
+		src/main/canon-modes.h (1.337) (+2 -2)
+		src/main/print-canon.c (1.459) (+9 -5)
+
+	Added Canon MG5300 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.112) (+93 -0)
+		src/main/canon-modes.h (1.336) (+2 -2)
+		src/main/print-canon.c (1.458) (+9 -5)
+
+	Added Canon MG8100 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.111) (+92 -0)
+		src/main/canon-modes.h (1.335) (+1 -1)
+		src/main/print-canon.c (1.457) (+9 -5)
+
+	Added Canon MG6100 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.110) (+79 -0)
+		src/main/canon-modes.h (1.334) (+1 -1)
+		src/main/print-canon.c (1.456) (+9 -5)
+
+	Added Canon MG5200 to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.109) (+70 -8)
+		src/main/canon-media.h (1.121) (+1 -0)
+		src/main/canon-modes.h (1.333) (+2 -2)
+		src/main/print-canon.c (1.455) (+9 -5)
+
+	Added Canon MG5100 to media-mode combinations. Also added missing media type to Canon pro9500 Mk.II.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.108) (+80 -0)
+		src/main/print-canon.c (1.454) (+9 -5)
+
+	Added Canon MP750 (and MP760, MP770, MP780, MP790) to media-mode combinations.
+
+2012-04-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.107) (+92 -0)
+		src/main/print-canon.c (1.453) (+9 -5)
+
+	Added Canon MP710 (and MP740) to mode-media data.
+
+2012-04-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.106) (+92 -0)
+		src/main/print-canon.c (1.452) (+9 -5)
+
+	Added Canon MP700 (and MP730) to media-mode combinations.
+
+2012-04-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.105) (+105 -0)
+		src/main/canon-modes.h (1.332) (+9 -9)
+		src/main/print-canon.c (1.451) (+9 -5)
+
+	Added Canon MP950 to media-mode combinations.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.104) (+82 -0)
+		src/main/canon-modes.h (1.331) (+19 -19)
+		src/main/print-canon.c (1.450) (+9 -5)
+
+	Added Canon MP490 to media-mode combinations.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.103) (+100 -0)
+		src/main/canon-modes.h (1.330) (+23 -19)
+		src/main/print-canon.c (1.449) (+9 -5)
+
+	Added Canon MP470 to media-mode combinations.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.102) (+102 -0)
+		src/main/print-canon.c (1.448) (+9 -5)
+
+	Added Canon MP900 to media-mode combinations.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.101) (+70 -0)
+		src/main/print-canon.c (1.447) (+9 -5)
+
+	Added Canon MP360 (and MP370, MP375R, MP390) to media-mode combinations.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.100) (+105 -1)
+		src/main/canon-modes.h (1.329) (+1 -1)
+		src/main/print-canon.c (1.446) (+9 -5)
+
+	Added Canon iP9910 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.99) (+106 -0)
+		src/main/canon-modes.h (1.328) (+1 -1)
+		src/main/print-canon.c (1.445) (+9 -5)
+
+	Added Canon iP8600 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.98) (+116 -4)
+		src/main/canon-modes.h (1.327) (+2 -2)
+		src/main/print-canon.c (1.444) (+9 -5)
+
+	Added Canon iP8100 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.97) (+7226 -7128)
+		src/main/canon-modes.h (1.326) (+1 -1)
+		src/main/print-canon.c (1.443) (+9 -5)
+
+	Added Canon iP7100 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.96) (+69 -0)
+		src/main/print-canon.c (1.442) (+9 -5)
+
+	Added Canon iP3600 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.95) (+68 -0)
+		src/main/print-canon.c (1.441) (+9 -5)
+
+	Added Canon iP3300 to mode-media data.
+
+2012-04-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.94) (+85 -1)
+		src/main/canon-modes.h (1.325) (+2 -2)
+		src/main/print-canon.c (1.440) (+9 -5)
+
+	Added Canon MP560 to mode-media data.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.93) (+85 -0)
+		src/main/canon-modes.h (1.324) (+1 -1)
+		src/main/print-canon.c (1.439) (+9 -5)
+
+	Added Canon MP640 to media-mode combinations.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.92) (+82 -0)
+		src/main/canon-modes.h (1.323) (+2 -2)
+		src/main/print-canon.c (1.438) (+9 -5)
+
+	Added Canon MP630  to media-mode combinations.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.91) (+69 -0)
+		src/main/print-canon.c (1.437) (+9 -5)
+
+	Added Canon MP620 to mode-media data.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.90) (+86 -0)
+		src/main/print-canon.c (1.436) (+9 -5)
+
+	Added Canon iP6100D to mode-media data.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.89) (+86 -0)
+		src/main/canon-modes.h (1.322) (+3 -3)
+		src/main/print-canon.c (1.435) (+9 -5)
+
+	Added Canon MP980 to mode-media data.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.88) (+90 -0)
+		src/main/print-canon.c (1.434) (+9 -5)
+
+	Added Canon MP810 to mode-media data.
+
+2012-04-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.87) (+80 -0)
+		src/main/canon-modes.h (1.321) (+1 -1)
+		src/main/print-canon.c (1.433) (+13 -9)
+
+	Added Canon MP800 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.86) (+128 -0)
+		src/main/canon-modes.h (1.320) (+1 -1)
+		src/main/print-canon.c (1.432) (+14 -9)
+
+	Added Canon Pro9500 Mk.II  to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.85) (+130 -0)
+		src/main/canon-modes.h (1.319) (+2 -2)
+		src/main/print-canon.c (1.431) (+5 -5)
+
+	Added Canon Pro9500 to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.84) (+9 -2)
+		src/main/print-canon.c (1.430) (+9 -5)
+
+	Added transparency modes to iX4000 media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.83) (+73 -2)
+		src/main/canon-modes.h (1.318) (+24 -0)
+		src/main/canon-printers.h (1.266) (+1 -1)
+		src/main/print-canon.c (1.429) (+9 -5)
+
+	Added Canon MX880 to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.82) (+49 -0)
+		src/main/print-canon.c (1.428) (+9 -5)
+
+	Added Canon MX7600 to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.81) (+72 -0)
+		src/main/print-canon.c (1.427) (+9 -5)
+
+	Added Canon MX870 to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.80) (+70 -0)
+		src/main/canon-modes.h (1.317) (+1 -1)
+		src/main/print-canon.c (1.426) (+9 -5)
+
+	Added Canon MX860 to media-mode combinations.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.79) (+86 -0)
+		src/main/canon-media.h (1.120) (+1 -1)
+		src/main/print-canon.c (1.425) (+9 -5)
+
+	Added Canon MX850 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.78) (+69 -0)
+		src/main/print-canon.c (1.424) (+9 -5)
+
+	Added Canon MX700 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.77) (+80 -0)
+		src/main/canon-modes.h (1.316) (+20 -20)
+		src/main/print-canon.c (1.423) (+9 -5)
+
+	Added Canon MX340 (and MX350) to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.76) (+78 -0)
+		src/main/canon-modes.h (1.315) (+20 -20)
+		src/main/print-canon.c (1.422) (+9 -5)
+
+	Added Canon MX330 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.75) (+92 -0)
+		src/main/canon-modes.h (1.314) (+23 -23)
+		src/main/print-canon.c (1.421) (+9 -5)
+
+	Added Canon MX300 (and MX310) to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.74) (+93 -0)
+		src/main/canon-media.h (1.119) (+2 -2)
+		src/main/canon-modes.h (1.313) (+2 -1)
+		src/main/print-canon.c (1.420) (+9 -5)
+
+	Added Canon MP990 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.73) (+83 -0)
+		src/main/print-canon.c (1.419) (+9 -5)
+
+	Added Canon MP600 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.72) (+69 -0)
+		src/main/print-canon.c (1.418) (+9 -5)
+
+	Added Canon MP520 (and MP510) to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.71) (+77 -0)
+		src/main/print-canon.c (1.417) (+9 -5)
+
+	Added Canon MP480 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.70) (+81 -0)
+		src/main/canon-modes.h (1.312) (+21 -21)
+		src/main/print-canon.c (1.416) (+9 -5)
+
+	Added Canon MP280 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.69) (+52 -0)
+		src/main/print-canon.c (1.415) (+9 -5)
+
+	Added Canon mini320 (and mini360) to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.68) (+50 -0)
+		src/main/canon-modes.h (1.311) (+1 -1)
+		src/main/print-canon.c (1.414) (+9 -5)
+
+	Added Canon mini220 to mode-media data.
+
+2012-04-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.67) (+80 -0)
+		src/main/canon-media.h (1.118) (+1 -1)
+		src/main/print-canon.c (1.413) (+9 -5)
+
+	Added Canon MP493 to mode-media data.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.66) (+63 -0)
+		src/main/canon-modes.h (1.310) (+5 -0)
+		src/main/print-canon.c (1.412) (+9 -5)
+
+	Added Canon PIXMA iX7000 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.65) (+50 -0)
+		src/main/canon-modes.h (1.309) (+1 -1)
+		src/main/print-canon.c (1.411) (+9 -5)
+
+	Added Canon SELPHY DS810 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.64) (+52 -0)
+		src/main/canon-modes.h (1.308) (+1 -1)
+		src/main/print-canon.c (1.410) (+9 -5)
+
+	Added Canon SELPHY DS700 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.63) (+80 -0)
+		src/main/canon-media.h (1.117) (+3 -2)
+		src/main/canon-modes.h (1.307) (+56 -19)
+		src/main/canon-printers.h (1.265) (+1 -1)
+		src/main/print-canon.c (1.409) (+9 -5)
+
+	Added Canon MX420 to media-mode combinations. Added missing paper type and created custom mode definition.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.62) (+73 -0)
+		src/main/print-canon.c (1.408) (+9 -5)
+
+	Added Canon PIXMA iX6500 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.61) (+96 -0)
+		src/main/print-canon.c (1.407) (+9 -5)
+
+	Added Canon BJC i9900 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.60) (+86 -0)
+		src/main/print-canon.c (1.406) (+9 -5)
+
+	Added Canon BJC i9100 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.59) (+83 -0)
+		src/main/canon-modes.h (1.306) (+1 -1)
+		src/main/print-canon.c (1.405) (+9 -5)
+
+	Added Canon BJC i6610 (and i6500) to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.58) (+82 -0)
+		src/main/canon-modes.h (1.305) (+1 -1)
+		src/main/print-canon.c (1.404) (+9 -5)
+
+	Added Canon BJC i865 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.57) (+83 -0)
+		src/main/print-canon.c (1.403) (+9 -5)
+
+	Added Canon BJC i560 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.56) (+71 -0)
+		src/main/print-canon.c (1.402) (+9 -5)
+
+	Added Canon BJC i70 to media-mode combinations.
+
+2012-04-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.55) (+72 -0)
+		src/main/print-canon.c (1.401) (+9 -5)
+
+	Added Canon BJC i80 to media-mode combinations.
+
+2012-04-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.54) (+69 -1)
+		src/main/canon-modes.h (1.304) (+3 -3)
+		src/main/print-canon.c (1.400) (+9 -5)
+
+	Added Canon BJC i900 to media-mode combinations.
+
+2012-04-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.53) (+102 -0)
+		src/main/canon-modes.h (1.303) (+1 -1)
+		src/main/print-canon.c (1.399) (+9 -5)
+
+	Added Canon BJC i960 to media-mode combinations.
+
+2012-04-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.52) (+93 -0)
+		src/main/canon-modes.h (1.302) (+3 -3)
+		src/main/canon-printers.h (1.264) (+1 -1)
+		src/main/print-canon.c (1.398) (+9 -5)
+
+	Added Canon BJC i950 to media-mode combinations.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.51) (+72 -0)
+		src/main/print-canon.c (1.397) (+9 -5)
+
+	Added Canon BJC i860 to media-mode combinations.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.50) (+96 -0)
+		src/main/canon-modes.h (1.301) (+1 -1)
+		src/main/print-canon.c (1.396) (+9 -5)
+
+	Added Canon BJC i850 to media-mode combinations.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.49) (+90 -0)
+		src/main/canon-modes.h (1.300) (+3 -3)
+		src/main/print-canon.c (1.395) (+9 -5)
+
+	Added Canon BJC i550 to media-mode combinations.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.48) (+83 -1)
+		src/main/canon-media.h (1.116) (+1 -1)
+		src/main/print-canon.c (1.394) (+9 -5)
+
+	Added Canon BJC i455 to media-mode combinations.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.47) (+78 -0)
+		src/main/print-canon.c (1.393) (+9 -5)
+
+	Added Canon BJC i450 to mode-media data.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.46) (+76 -0)
+		src/main/canon-modes.h (1.299) (+1 -1)
+		src/main/print-canon.c (1.392) (+9 -5)
+
+	Added Canon BJC i50 to mode-media data.
+
+2012-04-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.45) (+78 -0)
+		src/main/canon-modes.h (1.298) (+2 -2)
+		src/main/print-canon.c (1.391) (+9 -5)
+
+	Added Canon iP5000 to mode-media data.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.44) (+87 -0)
+		src/main/print-canon.c (1.390) (+9 -6)
+
+	Added Canon iP7500 to media-mode combinations.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.43) (+80 -0)
+		src/main/canon-modes.h (1.297) (+21 -21)
+		src/main/print-canon.c (1.389) (+9 -5)
+
+	Added Canon MP240 to media-mode combinations.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.42) (+100 -1)
+		src/main/canon-modes.h (1.296) (+22 -22)
+		src/main/print-canon.c (1.388) (+9 -5)
+
+	Added Canon MP210 to media-mode combinations.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.41) (+93 -1)
+		src/main/canon-modes.h (1.295) (+22 -22)
+		src/main/print-canon.c (1.387) (+9 -5)
+
+	Added Canon MP190 to mode-media data.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.40) (+69 -0)
+		src/main/print-canon.c (1.386) (+9 -5)
+
+	Added Canon MP540 to mode-media data.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.39) (+71 -0)
+		src/main/print-canon.c (1.385) (+9 -5)
+
+	Added Canon iX4000 to mode-media data.
+
+2012-04-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.38) (+89 -0)
+		src/main/print-canon.c (1.384) (+17 -9)
+
+	Added Canon iP3100 to mode-media data.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.37) (+79 -0)
+		src/main/canon-modes.h (1.294) (+2 -2)
+		src/main/print-canon.c (1.383) (+9 -7)
+
+	Added Canon iP2000 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.36) (+88 -1)
+		src/main/canon-modes.h (1.293) (+5 -5)
+		src/main/print-canon.c (1.382) (+16 -9)
+
+	Added Canon MP970 (although no mono modes are yet added) to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.35) (+74 -3)
+		src/main/canon-modes.h (1.292) (+13 -13)
+		src/main/print-canon.c (1.381) (+9 -5)
+		src/xml/printers.xml (1.217) (+4 -1)
+
+	Added Canon iP2700 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.34) (+75 -0)
+		src/main/canon-modes.h (1.291) (+2 -2)
+		src/main/print-canon.c (1.380) (+9 -5)
+
+	Added Canon MP530 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.33) (+80 -0)
+		src/main/canon-modes.h (1.290) (+11 -11)
+		src/main/print-canon.c (1.379) (+30 -26)
+
+	Added Canon iP46210D (incl. iP6220D, iP6310D) to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.32) (+62 -0)
+		src/main/canon-modes.h (1.289) (+3 -0)
+		src/main/print-canon.c (1.378) (+9 -5)
+
+	Added Canon iP4300 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.31) (+88 -3)
+		src/main/canon-media.h (1.115) (+1 -0)
+		src/main/print-canon.c (1.377) (+10 -6)
+
+	Added Canon iP4100 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.30) (+78 -0)
+		src/main/canon-modes.h (1.288) (+3 -3)
+		src/main/print-canon.c (1.376) (+9 -5)
+
+	Added Canon iP4900 to media-mode combinations.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.29) (+189 -105)
+		src/main/canon-modes.h (1.287) (+9 -6)
+		src/main/print-canon.c (1.375) (+9 -5)
+
+	Added Canon iP4600 to mode-media data. Fixed several missing duplex-specific entries in media-mode data.
+
+2012-04-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.28) (+85 -0)
+		src/main/canon-modes.h (1.286) (+4 -4)
+		src/main/print-canon.c (1.374) (+9 -5)
+
+	Added Canon iP4500 to mode-media data.
+
+2012-04-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.27) (+9 -12)
+
+	Added remaining data for Canon MP250 to media-mode combinations.
+
+2012-04-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.26) (+89 -0)
+		src/main/canon-modes.h (1.285) (+23 -23)
+		src/main/print-canon.c (1.373) (+9 -5)
+
+	Added Canon MP250 (some checks of color-only modes required) to mode-media data.
+
+2012-04-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.25) (+130 -20)
+		src/main/canon-media.h (1.114) (+94 -94)
+		src/main/canon-modes.h (1.284) (+7 -7)
+		src/main/print-canon.c (1.372) (+23 -17)
+
+	Added Canon MP960 to mode-media data. Corrected several more printer models in print-canon.c, and corrected conditional statement. Commented out unused variables.
+
+2012-04-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.24) (+144 -0)
+		src/main/canon-modes.h (1.283) (+2 -0)
+		src/main/print-canon.c (1.371) (+20 -16)
+
+	Added Canon Pro9000 Mk.II to mode-media data. Also fixed several printer names conditional statements in print-canon.c: the strings must match the printer name definitions in canon-printers.h.
+
+2012-04-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.23) (+37 -5)
+		src/main/canon-modes.h (1.282) (+1 -1)
+
+	Added remaining settings of Canon Pro9000 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.22) (+125 -7)
+		src/main/print-canon.c (1.370) (+9 -6)
+
+	Added Canon Pro9000 (partial data) to media-mode combinations.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.21) (+3 -3)
+
+	Revised slightly Canon iP4700, iP4800 in media-mode combinations.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.20) (+86 -0)
+		src/main/canon-media.h (1.113) (+25 -25)
+		src/main/canon-modes.h (1.281) (+2 -2)
+		src/main/print-canon.c (1.369) (+9 -5)
+
+	Added Canon iP4700, iP4800 to media-mode combinations.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.19) (+90 -0)
+		src/main/canon-modes.h (1.280) (+1 -1)
+		src/main/print-canon.c (1.368) (+9 -5)
+
+	Added Canon iP8500 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.18) (+84 -0)
+		src/main/print-canon.c (1.367) (+9 -5)
+
+	Added Canon iP6700 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.17) (+85 -0)
+		src/main/print-canon.c (1.366) (+11 -7)
+
+	Added Canon iP5300 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.16) (+75 -6)
+		src/main/canon-media.h (1.112) (+1 -0)
+		src/main/print-canon.c (1.365) (+9 -5)
+
+	Added Canon MP830 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.15) (+79 -0)
+		src/main/print-canon.c (1.364) (+9 -5)
+
+	Added Canon iX5000 to mode-media data.
+
+2012-04-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.14) (+72 -1)
+		src/main/print-canon.c (1.363) (+12 -5)
+
+	Added Canon iP4200 to mode-media data.
+
+2012-04-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.13) (+65 -0)
+		src/main/print-canon.c (1.362) (+21 -17)
+
+	Added Canon MP550 toia-mode combinations.
+
+2012-04-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.12) (+115 -25)
+		src/main/print-canon.c (1.361) (+19 -11)
+
+	Added Canon iP3000 to media-mode combinations.
+
+2012-03-31	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.11) (+79 -0)
+		src/main/canon-modes.h (1.279) (+30 -29)
+		src/main/print-canon.c (1.360) (+21 -8)
+
+	Corrected Canon MX360 mode names and added media-mode combinations.
+
+2012-03-31	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.359) (+174 -56)
+
+	Completed addition of PrintingMode option in mode replacement support in Canon backend
+
+2012-03-31	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.358) (+32 -9)
+
+	Increased priority of PrintingMode to that of InkSet in mode replacement support in Canon backend (partial implementation).
+
+2012-03-31	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.357) (+349 -29)
+
+	Completed duplex mode replacement support in Canon backend.
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.356) (+14 -55)
+
+	Removed duplicate code, cleaned up comments in duplex mode substitution for Canon backend (still some sections remaining to be completed).
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.355) (+122 -25)
+
+	Added further support for duplex mode substitution for Canon backend.
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.10) (+1 -0)
+		src/main/print-canon.c (1.354) (+8 -5)
+
+	fixed Canon iP6000D media-mode data.
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.9) (+87 -0)
+		src/main/canon-modes.h (1.278) (+2 -2)
+
+	Added Canon iP6000D media-mode data, corrected a photo mode name.
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.8) (+90 -1)
+
+	Added Canon iP4000 media-mode data.
+
+2012-03-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.353) (+72 -33)
+
+	Added partial support for duplex mode replacement to Canon backend.
+
+2012-03-29	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.352) (+192 -91)
+
+	Added (possibly only partial) support for ink cartridge-specific mode selection to Canon backend.
+
+2012-03-29	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.277) (+3 -2)
+		src/main/print-canon.c (1.351) (+13 -1)
+
+	Updated flags for inkset support, duplex support and corresponding replacement modes to Canon backend data files.
+
+2012-03-29	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.7) (+26 -15)
+		src/main/canon-modes.h (1.276) (+16 -13)
+		src/main/print-canon.c (1.350) (+3 -3)
+
+	Added flags for inkset support and replacement modes to Canon backend data files. Currently only PIXMA MP450.
+
+2012-03-28	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.349) (+29 -14)
+
+	Added PrintingMode setting to Canon backend get_current_mode logic.
+
+2012-03-28	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.348) (+7 -6)
+
+	Fixed undeclared ink_type handling bug in Canon backend get_current_mode logic
+
+2012-03-28	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.6) (+92 -1)
+		src/main/print-canon.c (1.347) (+149 -20)
+
+	Added experimental logic to Canon backend get_current_mode function to find a mode if the one currently active is not for the media selected. Added MP450 mode-media data.
+
+2012-03-28	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.346) (+16 -12)
+
+	Corrected bug in Canon backend get_current_mode logic regarding InkSet.
+
+2012-03-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.345) (+181 -14)
+
+	Added major portion of decision logic for mode selection and replacement based on media type, ink set (cartridge selection), ink type, to Canon backend. Still missing: duplex mode replacement, enhance logic for replacing an existing mode.
+
+2012-03-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.344) (+35 -14)
+
+	Canon backend: added comments in preparation for further option decision logic to print-canon.c
+
+2012-03-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.343) (+17 -2)
+
+	Canon backend: added InkType adjustment based on InkSet selection to canon_do_print. Currently sets InkType to Gray for Black InkSet, and to RGB(CMY) for Color InkSet. Devices with such cartridge selections do not use more complex ink sets in the modes (as far as is currently known).
+
+2012-03-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.5) (+3 -0)
+		src/main/print-canon.c (1.342) (+41 -1)
+
+	Added InkSet adjustment in do_print for Canon backend. Limited to MP610 for testing.
+
+2012-03-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.341) (+3 -7)
+
+	Corrected InkType parameter and InkSet parameter in canon_do_print.
+
+2012-03-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.340) (+7 -1)
+
+	Added InkType parameter to privdata in canon_do_print routine.
+
+2012-03-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.339) (+20 -6)
+
+	Added InkSet parameter to privdata in canon_do_print routine. Removed several noisy debug statements.
+
+2012-03-25	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.122) (+8 -6)
+		src/cups/genppd.c (1.192) (+12 -4)
+		src/cups/test-ppds (1.7) (+1 -1)
+
+	Generate PPD files without extra_version when running test-ppds
+
+2012-03-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.338) (+235 -42)
+
+	Updated canon_printhead_colors function to highest possible colors for a given mode, or the highest possible for a given printer, if black is not specifically selected by printing mode or inkset (cartridge) selection. As a fallback, the lowest (previously black) amount of colors is returned, although this case should not occur.
+
+2012-03-25	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.191) (+3 -2)
+
+	Clear resolution before enumerating other options.
+
+2012-03-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.337) (+2 -1)
+
+	Corrected missing default ink type setting
+
+2012-03-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.275) (+108 -108)
+
+	Set default modes for most Canon printers to be standard rather than high-quality.
+
+2012-03-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.336) (+32 -34)
+
+	Set default ink type in Canon backend to be that of default mode (color if present). Changed debug statements to respect debug flags.
+
+2012-03-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.335) (+12 -18)
+
+	Removed comments and debug statements
+
+2012-03-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.334) (+11 -10)
+
+	Testing version of print-canon.c with default mode setting switched back on, and resolution disabled in ink type enumeration in canon_parameters.
+
+2012-03-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.333) (+56 -38)
+
+	Testing version of print-canon.c with default mode setting switched off.
+
+2012-03-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.332) (+37 -13)
+
+	changed function to get current mode to return NULL when no modes found.
+
+2012-03-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.331) (+26 -8)
+
+	Modified InkType code to return all inks for all modes: but first need to fix get_current_mode to return NULL instead of default mode.
+
+2012-03-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.330) (+18 -19)
+
+	Modified printhead_colors code to check for mode. Cleaned up comments.
+
+2012-03-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.329) (+3 -3)
+
+	moved one debug statement into Canon MP610-specific block
+
+2012-03-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.328) (+4 -5)
+
+	Corrected conditional logic in mode replacement code for Canon backend
+
+2012-03-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.327) (+43 -68)
+
+	Cleaned up comments in mode replacement code
+
+2012-03-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.4) (+30 -133)
+		src/main/print-canon.c (1.326) (+41 -31)
+
+	Working mode replacement code committed: limited to Canon MP610 for now.
+
+2012-03-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.3) (+28 -10)
+		src/main/print-canon.c (1.325) (+74 -4)
+
+	added to media and mode checking code, simplified for debugging.
+
+2012-03-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media-mode.h (1.2) (+3 -3)
+		src/main/print-canon.c (1.324) (+2 -2)
+
+	Corrected addition of canon-media-mode.h to code.
+
+2012-03-18	<gernot2270@sourceforge.net>
+
+	Files:	src/main/Makefile.am (1.105) (+3 -2)
+		src/main/canon-media-mode.h (1.1) (added +10663 -0)
+		src/main/canon-modes.h (1.274) (+1 -1)
+		src/main/print-canon.c (1.323) (+31 -3)
+
+	Adding canon-media-mode.h header file for recording relationship between media types and permitted modes.
+
+2012-03-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.322) (+2 -19)
+
+	reverted changed to ESC (L command for Canon i80: all components are present.
+
+2012-03-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.273) (+2 -1)
+		src/main/print-canon.c (1.321) (+21 -4)
+
+	added corrections to ESC (l and ESC (L commands for Canon i80. Added a further transparency modes for i80.
+
+2012-03-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.272) (+8 -3)
+
+	Added Env/Hagaki modes to Canon i80.
+
+2012-03-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.271) (+2 -2)
+
+	corrected mode names for Canon i80
+
+2012-03-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.111) (+32 -32)
+		src/main/canon-modes.h (1.270) (+2 -4)
+
+	corrected a mode name for Canon MP610, and Canon media name PhotoPlusGloss2
+
+2012-03-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.320) (+22 -3)
+
+	debug statements added for page width and length. Correction to conditional statement where incorrect printer model name was typed.
+
+2012-03-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.114) (+8 -150)
+
+	cleaned up comments
+
+2012-03-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.269) (+8 -8)
+
+	removed Canon 13_c9m9y9 mode since page width is incorrectly set, reason currently unknown.
+
+2012-02-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.319) (+82 -10)
+
+	Initial addition of CUPS option InkSet for Canon backend to select ink cartridge for 2-cartridge printers where options both, black-only, color-only are available.
+
+2012-02-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.113) (+36 -40)
+		src/main/canon-modes.h (1.268) (+22 -22)
+
+	Corrected use of inkset 9_C4M4Y4K2c4m4y4 for plain (with K) and photo media modes (no K) on Canon printers.
+
+2012-02-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.267) (+7 -7)
+
+	Reordered modes for Canon iP90, iP100. ESC S) command still unsupported.
+
+2012-02-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.266) (+4 -4)
+
+	Corrected non-unique mode names for Canon iP6210D, iP6220D, and iP6310D.
+
+2012-02-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.265) (+22 -15)
+		src/main/print-canon.c (1.318) (+26 -1)
+
+	Added several cmy and CMYcmy modes to Canon iP6210D, iP6220D, and iP6310D printers. Some modes still not supportable.
+
+2012-02-18	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.112) (+34 -0)
+		src/main/canon-modes.h (1.264) (+20 -14)
+		src/main/print-canon.c (1.317) (+2 -2)
+
+	Added mode using cmy inks to Canon MG2100, MG3100, MG4100.
+
+2012-02-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.111) (+1 -0)
+		src/main/canon-modes.h (1.263) (+5 -3)
+
+	Added support for cmy and 1200dpi photo modes on Canon mini220.
+
+2012-02-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.316) (+2 -2)
+
+	Added support for cmy and 1200dpi photo mode on Canon MP495.
+
+2012-02-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.262) (+23 -18)
+		src/main/print-canon.c (1.315) (+2 -2)
+
+	Added cmy and 1200dpi photo mode on Canon MP480, MP490.
+
+2012-02-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.261) (+9 -5)
+		src/main/print-canon.c (1.314) (+2 -2)
+
+	Added cmy and 1200dpi photo modes on Canon MP470.
+
+2012-02-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.110) (+14 -15)
+		src/main/canon-modes.h (1.260) (+7 -8)
+
+	Corrected photo modes on Canon MP360, MP370, MP375R, MP390. cmy and CMYcmy modes now supported.
+
+2012-02-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.259) (+5 -4)
+
+	Corrected cmy modes for Canon iP2000 (these modes, no 0x60 subtraction in ink names).
+
+2012-02-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.258) (+31 -20)
+		src/main/print-canon.c (1.313) (+2 -2)
+
+	Added 1200dpi cmy mode to Canon MX330, MX340, MX350, MX360, MX410.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.257) (+10 -8)
+		src/main/print-canon.c (1.312) (+2 -2)
+
+	Add 1200dpi mode support to Canon iP2700.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.256) (+9 -7)
+
+	added cmy and 1200dpi modes to Canon MX300 and MX310.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.255) (+18 -14)
+		src/main/print-canon.c (1.311) (+2 -2)
+
+	Added 1200dpi mode to Canon MP280, and added support for cmy modes to print-canon.c for MP240, MP250, MP270, MP280.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.254) (+34 -23)
+
+	Added 1200dpi mode to Canon MP240 and MP250.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.253) (+0 -41)
+		src/main/canon-printers.h (1.263) (+0 -13)
+		src/xml/printers.xml (1.216) (+2 -2)
+
+	Added cmy modes and 1200dpi mode, then consolidated Canon MP210 and MP220 into one driver.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.252) (+7 -4)
+
+	Added cmy and 1200dpi mode support to Canon MP220 (incomplete).
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.251) (+17 -7)
+		src/main/print-canon.c (1.310) (+2 -2)
+
+	Added cmy and 1200dpi mode support to Canon MP210.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.250) (+9 -3)
+
+	Added modes with cmy inks to Canon MP190, including 1200dpi mode.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.110) (+2 -2)
+		src/main/canon-printers.h (1.262) (+47 -47)
+
+	changed slotlist name for MP150-clones.
+
+2012-02-15	<gernot2270@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-generator.in (1.81) (+0 -1)
+		src/main/canon-media.h (1.109) (+0 -17)
+		src/main/canon-modes.h (1.249) (+4 -45)
+		src/main/canon-printers.h (1.261) (+3 -29)
+		src/xml/printers.xml (1.215) (+5 -5)
+
+	consolidated Canon MP140, MP150, MP160, MP170, MP180 into single driver with identical modes, sources and media.
+
+2012-02-14	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-templates-ijs/gutenprint.xml (1.7) (+1 -1)
+
+	Add the "-dNOINTERPOLATE" option to the Ghostscript command line used
+	for the IJS flavor of Gutenprint. This makes rendering of pages
+	containing bitmaps significantly faster. The interpolation also does
+	not visibly enhance the print quality at the high resolutions we need.
+
+2012-02-14	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-generator.in (1.80) (+0 -2)
+
+	Removed unneeded import of the Data::Dumper module. The
+	foomatic-generator script does not use it. Also this removes unneeded
+	Perl library dependencies.
+
+2012-02-14	<tillkamppeter@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.60) (+19 -5)
+
+	Use Getopt::Long instead of Getopt::Std. This reduces Perl library
+	dependencies and makes it easier this way to use Gutenprint in
+	space-restricted environments (Live CDs, routers, ...). The command
+	line syntax of cups-genppdupdate does not change by this step.
+
+2012-02-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.109) (+4 -12)
+		src/main/canon-modes.h (1.248) (+15 -10)
+		src/main/print-canon.c (1.309) (+3 -2)
+
+	Continued adding cmy and CMYcmy inksets to Canon MP150 printer modes.
+
+2012-02-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.108) (+1 -1)
+		src/main/canon-modes.h (1.247) (+28 -25)
+		src/main/print-canon.c (1.308) (+11 -13)
+		test/pixma_parse.c (1.29) (+2 -2)
+
+	add support in Canon printers for cmy inksets, and inksets containing cmy, where 0x60 is subtracted from the inkname in the printjob header. Applied currently to following models: MP140, MP150, MP160, MP170, MP180, MP190, MP220, MP450, MP460, MX300, MX310. To be extended to other printers (need to add such modes to canon-modes.h).
+
+2012-01-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.107) (+1 -1)
+		src/main/canon-modes.h (1.246) (+11 -11)
+		src/main/print-canon.c (1.307) (+23 -6)
+		src/main/print-canon.h (1.8) (+5 -1)
+
+	added support for a couple mofr modes in Canon MP150, MP170, MP220 among others, that use CMYcmk inksets.
+
+2012-01-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.245) (+8 -8)
+
+	added previously commented-out CMYKcmy modes for several Canon printers
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.108) (+3 -1)
+		src/gutenprintui2/ui-utils.c (1.4) (+3 -3)
+
+	Error: VARARGS
+	gutenprint-5.2.6/src/escputil/escputil.c:616: va_init: Initializing va_list "args".
+	gutenprint-5.2.6/src/escputil/escputil.c:637: missing_va_end: va_end was not called for "args".
+
+	Error: VARARGS
+	gutenprint-5.2.6/src/escputil/escputil.c:644: va_init: Initializing va_list "args".
+	gutenprint-5.2.6/src/escputil/escputil.c:663: missing_va_end: va_end was not called for "args".
+
+	Error: VARARGS
+	gutenprint-5.2.6/src/gutenprintui2/ui-utils.c:217: va_init: Initializing va_list "args".
+	gutenprint-5.2.6/src/gutenprintui2/ui-utils.c:219: missing_va_end: va_end was not called for "args".
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/mxml-file.c (1.13) (+2 -19)
+
+	Error: USE_AFTER_FREE
+	gutenprint-5.2.6/src/main/mxml-file.c:939: freed_arg: "mxml_add_char" frees "name".
+	gutenprint-5.2.6/src/main/mxml-file.c:326: freed_arg: "free" frees parameter "*buffer".
+	gutenprint-5.2.6/src/main/mxml-file.c:941: double_free: Calling "free" frees pointer "name" which has already been freed.
+
+	Error: USE_AFTER_FREE
+	gutenprint-5.2.6/src/main/mxml-file.c:968: alias: Assigning: "ptr" = "value". Now both point to the same storage.
+	gutenprint-5.2.6/src/main/mxml-file.c:973: freed_arg: "mxml_add_char" frees "value".
+	gutenprint-5.2.6/src/main/mxml-file.c:326: freed_arg: "free" frees parameter "*buffer".
+	gutenprint-5.2.6/src/main/mxml-file.c:976: double_free: Calling "free" frees pointer "value" which has already been freed.
+
+	Error: USE_AFTER_FREE
+	gutenprint-5.2.6/src/main/mxml-file.c:760: freed_arg: "mxml_add_char" frees "buffer".
+	gutenprint-5.2.6/src/main/mxml-file.c:326: freed_arg: "free" frees parameter "*buffer".
+	gutenprint-5.2.6/src/main/mxml-file.c:762: double_free: Calling "free" frees pointer "buffer" which has already been freed.
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.306) (+2 -2)
+
+	Error: SIZEOF_MISMATCH
+	gutenprint-5.2.6/src/main/print-canon.c:1962: suspicious_sizeof: Passing argument "privdata.head_offset" of type "int *" and argument "sizeof (privdata.head_offset) /*8*/" to function "memset" is suspicious.  Did you intend to use "sizeof(*privdata.head_offset)" instead of "sizeof (privdata.head_offset)" ?
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.438) (+2 -2)
+		src/main/print-weave.c (1.78) (+7 -1)
+
+	Error: REVERSE_INULL
+	gutenprint-5.2.6/src/main/print-escp2.c:4394: deref_ptr: Directly dereferencing pointer "pd->inkname".
+	gutenprint-5.2.6/src/main/print-escp2.c:4400: check_after_deref: Dereferencing "pd->inkname" before a null check.
+
+	Error: REVERSE_INULL
+	gutenprint-5.2.6/src/main/print-weave.c:1479: deref_ptr: Directly dereferencing pointer "sw->head_offset".
+	gutenprint-5.2.6/src/main/print-weave.c:1509: check_after_deref: Dereferencing "sw->head_offset" before a null check.
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/mxml-file.c (1.12) (+4 -2)
+
+	Error: RESOURCE_LEAK
+	gutenprint-5.2.6/src/main/mxml-file.c:879: alloc_fn: Calling allocation function "malloc".
+	gutenprint-5.2.6/src/main/mxml-file.c:879: var_assign: Assigning: "value" =  storage returned from "malloc(64UL)".
+	gutenprint-5.2.6/src/main/mxml-file.c:958: leaked_storage: Variable "value" going out of scope leaks the storage it points to.
+
+	Error: RESOURCE_LEAK
+	gutenprint-5.2.6/src/main/mxml-file.c:871: alloc_fn: Calling allocation function "malloc".
+	gutenprint-5.2.6/src/main/mxml-file.c:871: var_assign: Assigning: "name" =  storage returned from "malloc(64UL)".
+	gutenprint-5.2.6/src/main/mxml-file.c:934: var_assign: Assigning: "ptr" = "name".
+	gutenprint-5.2.6/src/main/mxml-file.c:956: noescape: Variable "name" is not freed or pointed-to in function "fprintf".
+	gutenprint-5.2.6/src/main/mxml-file.c:958: leaked_storage: Variable "ptr" going out of scope leaks the storage it points to.
+	gutenprint-5.2.6/src/main/mxml-file.c:958: leaked_storage: Variable "name" going out of scope leaks the storage it points to.
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/print-vars.c (1.94) (+8 -3)
+
+	Error: NULL_RETURNS
+	gutenprint-5.2.6/src/main/print-vars.c:1664: returned_null: Function "stp_list_get_item_by_index" returns null (checked 4 out of 5 times).
+	gutenprint-5.2.6/src/main/print-list.c:254: return_null: Explicitly returning NULL.
+	gutenprint-5.2.6/src/main/color.c:91: example_assign: Assigning: "color" = return value from "stp_list_get_item_by_index(color_list, idx)".
+	gutenprint-5.2.6/src/main/color.c:92: example_checked: "color" has its value checked in "color == NULL".
+	gutenprint-5.2.6/src/main/print-papers.c:154: example_assign: Assigning: "paper" = return value from "stp_list_get_item_by_index(paper_list, idx)".
+	gutenprint-5.2.6/src/main/print-papers.c:155: example_checked: "paper" has its value checked in "paper".
+	gutenprint-5.2.6/src/main/printers.c:123: example_assign: Assigning: "printer" = return value from "stp_list_get_item_by_index(printer_list, idx)".
+	gutenprint-5.2.6/src/main/printers.c:124: example_checked: "printer" has its value checked in "printer == NULL".
+	gutenprint-5.2.6/src/main/string-list.c:85: example_assign: Assigning: "answer" = return value from "stp_list_get_item_by_index((stp_list_t const *)list, element)".
+	gutenprint-5.2.6/src/main/string-list.c:87: example_checked: "answer" has its value checked in "answer".
+	gutenprint-5.2.6/src/main/print-vars.c:1664: dereference: Dereferencing a pointer that might be null "stp_list_get_item_by_index(ilist, item)" when calling "stp_list_item_get_data".
+	gutenprint-5.2.6/src/main/print-list.c:697: deref_parm: Directly dereferencing parameter "item".
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/gimp2/print.c (1.9) (+2 -1)
+		src/main/print-lexmark.c (1.161) (+3 -1)
+
+	Error: MISSING_BREAK
+	gutenprint-5.2.6/src/gimp2/print.c:296: unterminated_default: The default case is not terminated by a 'break' statement.
+	gutenprint-5.2.6/src/gimp2/print.c:298: fallthrough: The above case falls through to this one.
+
+	Error: MISSING_BREAK
+	gutenprint-5.2.6/src/main/print-lexmark.c:1406: unterminated_case: This case (value 10052) is not terminated by a 'break' statement.
+	gutenprint-5.2.6/src/main/print-lexmark.c:1412: fallthrough: The above case falls through to this one.
+
+2012-01-19	<m0m@sourceforge.net>
+
+	Files:	src/main/escp2-driver.c (1.58) (+2 -2)
+		src/main/module.c (1.27) (+3 -2)
+		src/main/print-canon.c (1.305) (+11 -8)
+		src/main/print-color.c (1.145) (+3 -3)
+		src/main/print-escp2.c (1.437) (+8 -5)
+		src/main/print-list.c (1.26) (+5 -5)
+		src/main/print-ps.c (1.105) (+3 -3)
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-list.c:352: var_compare_op: Comparing "name" to null implies that "name" might be null.
+	gutenprint-5.2.6/src/main/print-list.c:385: var_deref_model: Passing null variable "name" to function "stp_list_get_item_by_name_internal", which dereferences it.
+	gutenprint-5.2.6/src/main/print-list.c:333: deref_parm_in_call: Function "strcmp" dereferences parameter "name". (The dereference is assumed on the basis of the 'nonnull' parameter attribute.)
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-list.c:426: var_compare_op: Comparing "long_name" to null implies that "long_name" might be null.
+	gutenprint-5.2.6/src/main/print-list.c:459: var_deref_model: Passing null variable "long_name" to function "stp_list_get_item_by_long_name_internal", which dereferences it.
+	gutenprint-5.2.6/src/main/print-list.c:407: deref_parm_in_call: Function "strcmp" dereferences parameter "long_name". (The dereference is assumed on the basis of the 'nonnull' parameter attribute.)
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/escp2-driver.c:246: var_compare_op: Comparing "pd->input_slot" to null implies that "pd->input_slot" might be null.
+	gutenprint-5.2.6/src/main/escp2-driver.c:276: var_deref_op: Dereferencing null variable "pd->input_slot".
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/module.c:96: var_compare_op: Comparing "module" to null implies that "module" might be null.
+	gutenprint-5.2.6/src/main/module.c:99: var_deref_op: Dereferencing null variable "module".
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-canon.c:380: var_compare_op: Comparing "caps->paperlist" to null implies that "caps->paperlist" might be null.
+	gutenprint-5.2.6/src/main/print-canon.c:387: var_deref_op: Dereferencing null variable "caps->paperlist".
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-color.c:1566: var_compare_op: Comparing "color_description" to null implies that "color_description" might be null.
+	gutenprint-5.2.6/src/main/print-color.c:1577: var_deref_op: Dereferencing null variable "color_description".
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-escp2.c:1660: var_compare_op: Comparing "ink_list" to null implies that "ink_list" might be null.
+	gutenprint-5.2.6/src/main/print-escp2.c:1673: var_deref_op: Dereferencing null variable "ink_list".
+
+	Error: FORWARD_NULL
+	gutenprint-5.2.6/src/main/print-ps.c:826: var_compare_op: Comparing "node->child" to null implies that "node->child" might be null.
+	gutenprint-5.2.6/src/main/print-ps.c:841: var_deref_op: Dereferencing null variable "node->child".
+
+2012-01-18	<m0m@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.107) (+12 -6)
+
+	fixed NULL pointer access in escputil
+
+2012-01-18	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.106) (+12 -12)
+
+	Modified experimental Canon inksets using only sub-channel outputs.
+
+2012-01-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.244) (+13 -5)
+		src/main/print-canon.c (1.304) (+2 -2)
+
+	modified modes for Canon BJC-4300, added support for one photo cartridge mode. WIP.
+
+2012-01-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.303) (+3 -6)
+
+	reverted CANON_CD_X and Y in print-canon.c from previous commit
+
+2012-01-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.243) (+13 -14)
+		src/main/print-canon.c (1.302) (+26 -13)
+
+	adjusted Canon BJC-4550 modes to use 4 inks. Added photo mode.
+
+2012-01-10	<gernot2270@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.28) (+9 -5)
+
+	added printout of inks used for 1-bpp modes in pixma_parse
+
+2012-01-08	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.544) (+3 -0)
+		src/xml/printers.xml (1.214) (+4 -1)
+
+	Add support for Epson SX420 and related
+
+2012-01-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.301) (+25 -24)
+
+	changed code to use extended page setting command even for CD media for selected printers.
+
+2012-01-02	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.543) (+20 -5)
+		src/xml/printers.xml (1.213) (+2 -2)
+
+	corrected printers.xml printer name with trailing spaces. Added latest CD support to NEWS file.
+
+2012-01-02	<rlk@sourceforge.net>
+
+	Files:	po/POTFILES.in (1.26) (+1 -0)
+
+	3468320 POTFILES.in needs fixing
+
+2012-01-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.260) (+12 -12)
+		src/main/print-canon.c (1.300) (+4 -4)
+
+	Added support for second ESC (r command for CD media only (Canon PIXMA MP980, MP990, MG6100, MG8100) and single ESC (r command in case of CD media only (MG5200, MG5300, MG6200, MG8200).
+
+2012-01-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.259) (+8 -8)
+		src/main/print-canon.c (1.299) (+16 -3)
+
+	Added support for second ESC (r command for CD media only (Canon PIXMA iP4600, iP4700, iP4800) and single ESC (r command in case of CD media only (iP4900).
+
+2012-01-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.542) (+5 -2)
+		src/xml/printers.xml (1.212) (+4 -4)
+
+	Try again to fix printing to the NX200, SX200, and SX205.  The SX215
+	(and presumably SX210) appear to be different from the SX200.
+
+2012-01-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.541) (+16 -13)
+		src/cups/genppd.c (1.190) (+4 -2)
+
+	3299815 CUPS PPD broken on Linux
+
+2012-01-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.298) (+158 -95)
+		src/main/print-canon.h (1.7) (+3 -2)
+
+	Added support for correct CD and FineArt media codes in ESC (P command
+
+2011-12-31	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.540) (+5 -5)
+
+	updated NEWS with SELPHY series corrected names
+
+2011-12-31	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.211) (+17 -17)
+
+	updated Canon SELPHY series names
+
+2011-12-31	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.539) (+1 -0)
+
+	updated NEWS for SELPHY series without CP-600
+
+2011-12-31	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.210) (+3 -1)
+
+	removed Canon SELPHY CP-600 from supported printers
+
+2011-12-30	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.209) (+2 -2)
+
+	corrected foomatic driver for Canon MX310
+
+2011-12-30	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.59) (+22 -5)
+		src/cups/genppd.c (1.189) (+10 -10)
+
+	Make genppdupdate more robust against missing drivers
+
+2011-12-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.208) (+3 -3)
+
+	Fix driver names for Pixma MG4100 and MX350.
+
+2011-12-30	<rlk@sourceforge.net>
+
+	Files:	src/main/channel.c (1.35) (+5 -3)
+
+	Fix a couple of potential null pointer derefs (from stpere@gmail.com).
+
+2011-12-27	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.538) (+4 -2)
+
+	Fix a few typos, add a few printers.
+
+===============================================================================
+Name: gutenprint-5_2_8-pre1
+
+2011-12-27	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.62) (+3776 -3402)
+		po/da.po (1.105) (+3817 -3409)
+		po/de.po (1.77) (+3819 -3411)
+		po/el.po (1.77) (+3771 -3401)
+		po/en_GB.po (1.170) (+3819 -3411)
+		po/es.po (1.75) (+3775 -3401)
+		po/fi.po (1.7) (+3815 -3411)
+		po/fr.po (1.103) (+3846 -3441)
+		po/gl.po (1.2) (+4010 -3466)
+		po/hu.po (1.35) (+3819 -3411)
+		po/it.po (1.15) (+3817 -3409)
+		po/ja.po (1.72) (+4070 -3427)
+		po/nb.po (1.36) (+3824 -3430)
+		po/nl.po (1.88) (+4072 -3417)
+		po/pl.po (1.81) (+3771 -3401)
+		po/pt.po (1.76) (+3775 -3401)
+		po/ru.po (1.9) (+3815 -3411)
+		po/sk.po (1.80) (+3775 -3401)
+		po/sl.po (1.4) (+3817 -3409)
+		po/sv.po (1.106) (+3846 -3441)
+		po/uk.po (1.5) (+4047 -3403)
+		po/zh_CN.po (1.2) (+3904 -3439)
+		po/zh_TW.po (1.36) (+3840 -3441)
+
+	Gutenprint 5.2.8-pre1 release
+
+2011-12-27	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.537) (+11 -1)
+		README (1.212) (+3 -2)
+		src/xml/printers.xml (1.207) (+8 -2)
+
+	Remove support for Canon CP-720, 780, 800, and all ES models per requirement for special spooler
+
+2011-12-24	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.536) (+3 -3)
+		README (1.211) (+13 -13)
+		configure.ac (1.231) (+4 -3)
+
+	Prep for Gutenprint 5.2.8-pre1
+
+2011-12-24	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/Makefile.am (1.56) (+3 -3)
+
+	Use rm -rf to remove foomatic-db.
+
+2011-12-24	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/Makefile.am (1.55) (+2 -12)
+
+	Back out parallelism change (causes dependency issues).
+
+2011-12-24	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_116.xml (1.4) (+2 -13)
+		src/xml/escp2/model/model_117.xml (1.2) (+2 -2)
+
+	Adjust 720x1440 and 1440x1440 DPI drop sizes per Laurent Martelli
+
+2011-12-23	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.297) (+2 -2)
+
+	Use memmove() rather than memcpy() when source and destination overlap.
+
+2011-12-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.242) (+11 -11)
+
+	corrected modes using CMYK to reference inkset with CMYK inks
+
+2011-12-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.436) (+2 -8)
+		src/main/print-papers.c (1.42) (+1 -9)
+		src/main/print-weave.c (1.77) (+1 -13)
+		src/main/xmlppd.c (1.6) (+0 -2)
+
+	Clean up some unused variables
+
+2011-12-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.296) (+7 -2)
+
+	corrected stp_color_init function call in print-canon.c
+
+2011-12-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.295) (+2 -6)
+
+	removed incorrectly commented out stp_color_init function call in print-canon.c
+
+2011-12-20	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.535) (+2 -1)
+		configure.ac (1.230) (+3 -3)
+		po/zh_CN.po (1.1) (added +14693 -0)
+
+	Add Chinese Mandarin translation
+
+2011-12-20	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.43) (+2 -0)
+
+	Report crash of the underlying program more prominently.
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.241) (+8 -8)
+
+	corrected inkset in modes for Canon BJC S300 and S330.
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.258) (+156 -156)
+
+	adjusted page width of Canon MP495, added INCH function for specifying inch measurements.
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.294) (+28 -12)
+
+	commented out unused code
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.240) (+2 -2)
+
+	updated Canon BJC S300 and S330 T-shirt modes to use inksets including K.
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.257) (+0 -6)
+
+	removed unused control_cmd_MULTIPASS_MP150
+
+2011-12-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.293) (+4 -4)
+
+	changed printf to use integer rather than unsigned for local loop variables, and num_channels
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.292) (+8 -8)
+
+	Change some debug messages to stp_dprintf.
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/Makefile.am (1.54) (+12 -2)
+
+	Allow building both foomatic-dbs in parallel
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	scripts/autogen.sh (1.39) (+1 -1)
+
+	Tweak libtool version regexp to handle just two version components.
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.139) (+3 -2)
+
+	Add one more debug line.
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	src/cups/rastertoprinter.c (1.138) (+375 -117)
+
+	Improve debugging output, and some code cleanup.
+
+2011-12-18	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.188) (+4 -9)
+
+	Work around a sporadic crash in pstoraster.  Per Mike Sweet this
+	should not be necessary and may be due to a bug that has since been
+	fixed in Ghostscript 9.01.
+
+2011-12-14	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.534) (+26 -2)
+		src/xml/escp2/model/Makefile.am (1.30) (+4 -2)
+		src/xml/escp2/model/model_116.xml (1.3) (+75 -107)
+		src/xml/escp2/model/model_117.xml (1.1) (added +139 -0)
+		src/xml/escp2/qualitypresets/Makefile.am (1.5) (+2 -1)
+		src/xml/escp2/qualitypresets/prox900.xml (1.1) (added +70 -0)
+		src/xml/printers.xml (1.206) (+16 -1)
+
+	Add various Epson printers.
+
+	Add preliminary (CcMmYKkk) support for Stylus Pro 7900/9900.
+
+2011-12-06	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.435) (+3 -2)
+
+	Correctly initialize the default value, from Dmitry V. Levin.
+
+2011-11-30	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.533) (+4 -0)
+
+	Added photo cartridge support information to README.
+
+2011-11-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.239) (+3 -0)
+		src/main/print-canon.c (1.291) (+5 -2)
+
+	Added support for photo cartridge in Canon BJC-3000 series (flag for the mode to select that cartridge).
+
+2011-11-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.238) (+2 -0)
+		src/main/canon-printers.h (1.256) (+1 -1)
+		src/main/print-canon.c (1.290) (+16 -2)
+
+	Added support for differentiating ESC (t codes based on media code for Canon BJC-3000 series.
+
+2011-11-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.237) (+5 -4)
+		src/main/canon-printers.h (1.255) (+1 -1)
+
+	fixed type in control command, and added CMY to modes for Canon BJC-3000 series.
+
+2011-11-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.236) (+7 -5)
+		src/main/canon-printers.h (1.254) (+1 -1)
+
+	Corrected command set and added modes for Canon BJC-3000.
+
+2011-11-27	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.235) (+1 -1)
+
+	Correction to high-quality mode for Canon BJC-4550.
+
+2011-11-27	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.532) (+1 -0)
+		src/main/canon-modes.h (1.234) (+10 -0)
+		src/main/canon-printers.h (1.253) (+13 -0)
+		src/main/print-canon.c (1.289) (+7 -1)
+		src/xml/printers.xml (1.205) (+2 -1)
+
+	Added experimental support for Canon BJC-4550.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.288) (+92 -5)
+
+	listed media size codes for CDs and Fine Art A4.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.108) (+7 -6)
+		src/main/canon-modes.h (1.233) (+11 -8)
+		src/main/canon-printers.h (1.252) (+1 -1)
+
+	Corrected Canon MP960 modes, customized media.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.232) (+2 -2)
+
+	Corrected Canon MP950 mode for T-Shirt transfers.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.531) (+2 -0)
+		src/main/canon-inks.h (1.105) (+48 -0)
+		src/main/canon-media.h (1.107) (+22 -0)
+		src/main/canon-modes.h (1.231) (+28 -3)
+		src/main/canon-printers.h (1.251) (+3 -3)
+
+	Corrected Canon MP950 printer definition, added modes, customized media and sources.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.106) (+5 -3)
+		src/main/canon-modes.h (1.230) (+35 -21)
+
+	Updated Canon iP4000 modes, leaving legacy modes (not actual driver modes) as default.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.105) (+279 -312)
+
+	Corrected incorrect media type codes, especially FineArtOther.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.530) (+33 -3)
+		src/xml/printers.xml (1.204) (+1 -17)
+
+	Removed Canon printers currently unsupportable using ESC (z commands.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.104) (+12 -12)
+		src/main/canon-media.h (1.104) (+33 -39)
+		src/main/canon-modes.h (1.229) (+150 -150)
+
+	Corrected media type names, removed some comments.
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.529) (+5 -0)
+		src/main/canon-media.h (1.103) (+22 -1)
+		src/main/canon-printers.h (1.250) (+15 -2)
+		src/main/print-canon.c (1.287) (+2 -2)
+		src/xml/printers.xml (1.203) (+6 -6)
+
+	Changed printer definition and capabilities for Canon MP750 and its clones: MP760, MP770, MP780, MP790. Media and sources adjusted. Modes remain as for iP4000 (but using iP4100 which are identical to iP4000).
+
+2011-11-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.528) (+8 -6)
+		src/main/canon-media.h (1.102) (+28 -0)
+		src/main/canon-modes.h (1.228) (+40 -6)
+		src/main/canon-printers.h (1.249) (+13 -13)
+		src/main/print-canon.c (1.286) (+7 -2)
+		src/xml/printers.xml (1.202) (+3 -3)
+
+	Completely changed printer definition and capabilities for Canon MP740. Added modes, media, new sources. MP710 identical so driver renamed to that.
+
+2011-11-25	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.527) (+2 -0)
+		src/main/canon-media.h (1.101) (+20 -0)
+		src/main/canon-modes.h (1.227) (+34 -0)
+		src/main/canon-printers.h (1.248) (+15 -0)
+		src/xml/printers.xml (1.201) (+3 -3)
+
+	Changed printer definition, modes, media, sources for Canon MP700, MP730. Japanese model adds inkjet Hagaki, Hagaki and CD support, but also has SelectParallel=ECP in initialization, therefore kept this even though US model does not use it.
+
+2011-11-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.100) (+20 -0)
+		src/main/canon-modes.h (1.226) (+30 -0)
+		src/main/canon-printers.h (1.247) (+15 -2)
+		src/xml/printers.xml (1.200) (+2 -2)
+
+	Split Canon MP610 into separate driver, and modified iP5300 sources and modes.
+
+2011-11-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.246) (+1 -1)
+
+	Changed sources for Canon iP4200.
+
+2011-11-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.99) (+1 -1)
+		src/main/canon-modes.h (1.225) (+13 -10)
+
+	Added transparency print modes to Canon MP500 and iP4200.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.224) (+3 -3)
+
+	Activated extra modes for Canon mini220.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.223) (+17 -11)
+
+	Rearranged modes for Canon MP470.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.245) (+2 -2)
+
+	Corrected printer definition for Canon MP493.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.222) (+1 -1)
+		src/main/canon-printers.h (1.244) (+2 -2)
+
+	Corrected printer definition for Canon MX420, and Env/Hagaki modes for MP480 and MX420.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.243) (+2 -2)
+
+	Corrected printer definition for Canon iX6500.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.221) (+9 -5)
+		src/main/canon-printers.h (1.242) (+1 -1)
+
+	Corrected Canon MX7600 printer definition. Added photo modes and support for Env/Hagaki.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.220) (+3 -24)
+		src/main/canon-printers.h (1.241) (+2 -2)
+
+	Corrected printer definition for Canon MX860, MX870, adjusted modes.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.219) (+15 -15)
+		src/main/canon-printers.h (1.240) (+1 -1)
+
+	Corrected printer definition for Canon MX860, and corrected and enhanced modes. Added support for Env/Hagaki.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.239) (+1 -1)
+
+	Corrected printer definition for Canon MX850.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.238) (+1 -1)
+
+	Corrected printer definition for Canon MX700.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.526) (+8 -0)
+		src/main/canon-modes.h (1.218) (+48 -32)
+		src/main/canon-printers.h (1.237) (+3 -3)
+		src/main/print-canon.c (1.285) (+2 -2)
+
+	Corrected printer definitions and modes for Canon MX330, MX340, MX350. Added missing XML capability to Canon MX340 and MX350.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.217) (+27 -19)
+		src/main/canon-printers.h (1.236) (+1 -1)
+
+	Corrected printer definition for Canon MX300. Rearranged modes, and removed unsupported ones.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.525) (+2 -0)
+		src/main/canon-inks.h (1.103) (+14 -0)
+		src/main/canon-media.h (1.98) (+12 -0)
+		src/main/canon-modes.h (1.216) (+6 -0)
+		src/main/canon-printers.h (1.235) (+13 -0)
+		src/xml/printers.xml (1.199) (+3 -1)
+
+	Added experimental support for Canon mini320 and mini360.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.524) (+1 -0)
+		src/main/canon-modes.h (1.215) (+10 -0)
+		src/main/canon-printers.h (1.234) (+18 -0)
+		src/main/print-canon.c (1.284) (+2 -1)
+		src/xml/printers.xml (1.198) (+2 -1)
+
+	Added experimental support for Canon mini220.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.214) (+17 -9)
+		src/main/canon-printers.h (1.233) (+1 -1)
+
+	Adjusted modes for Canon MP990, added some photo modes, and Env/Hagaki support.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.523) (+1 -0)
+		src/main/canon-inks.h (1.102) (+6 -1)
+		src/main/canon-media.h (1.97) (+23 -1)
+		src/main/canon-modes.h (1.213) (+23 -40)
+		src/main/canon-printers.h (1.232) (+1 -1)
+
+	Corrected printer definition for Canon MP970, created correct and customized modes, created custom media.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.522) (+1 -0)
+		src/main/canon-inks.h (1.101) (+1 -0)
+		src/main/canon-modes.h (1.212) (+23 -1)
+		src/main/canon-printers.h (1.231) (+3 -3)
+
+	Corrected printer definition for MP600, created correct and customized modes.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.211) (+3 -3)
+
+	Corrected modes for Canon MP540 (used by other models too).
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.230) (+2 -2)
+
+	Corrected printer definition for Canon MP510 and MP520.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.229) (+2 -2)
+
+	Corrected printer definition for Canon MP495.
+
+2011-11-24	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.210) (+23 -15)
+		src/main/canon-printers.h (1.228) (+1 -1)
+
+	Corrected printer definition for Canon MP480, and reorganized modes.
+
+2011-11-23	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.521) (+7 -6)
+		src/main/canon-media.h (1.96) (+26 -0)
+		src/main/canon-modes.h (1.209) (+22 -14)
+		src/main/canon-printers.h (1.227) (+4 -4)
+
+	Corrected printer definition, modes for Canon iP2000. Created custom media, and rearranged and expanded modes.
+
+2011-11-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.208) (+24 -17)
+		src/main/canon-printers.h (1.226) (+3 -3)
+
+	Corrected printer definition for Canon MP280. Rearranged modes.
+
+2011-11-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.225) (+2 -2)
+
+	Corrected printer definition for Canon MP270.
+
+2011-11-23	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.207) (+38 -0)
+		src/main/canon-printers.h (1.224) (+13 -0)
+		src/xml/printers.xml (1.197) (+2 -2)
+		test/pixma_parse.c (1.27) (+11 -2)
+
+	Changed printer driver for Canon MP220. Added new printer definition and modes.
+
+2011-11-23	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.196) (+3 -1)
+
+	Add Epson WorkForce 63 and Artisan 835
+
+2011-11-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.100) (+70 -0)
+		src/main/canon-modes.h (1.206) (+38 -30)
+		src/main/canon-printers.h (1.223) (+4 -4)
+		src/main/print-canon.c (1.283) (+2 -1)
+
+	Added definition of ESC (S use flag, capability, and defined all modes for Canon iP90 and iP100.
+
+2011-11-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.99) (+14 -0)
+		src/main/canon-media.h (1.95) (+17 -0)
+		src/main/canon-modes.h (1.205) (+26 -6)
+		src/main/canon-printers.h (1.222) (+13 -1)
+
+	Added definitions for Canon iP100, cleaned up iP90 definition. Both not yet usable.
+
+2011-11-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.204) (+23 -15)
+		src/main/canon-printers.h (1.221) (+1 -1)
+
+	Corrected printer definition for Canon MX360, and reorganized modes.
+
+2011-11-22	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.195) (+2 -2)
+
+	Corrected Canon PIXUS iP3100 driver (PIXMA previously corrected).
+
+2011-11-22	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.94) (+22 -19)
+		src/main/canon-modes.h (1.203) (+33 -18)
+		src/main/canon-printers.h (1.220) (+3 -3)
+
+	Corrected Canon iP3100 and iP3000 printer definitions. Rearranged modes to iP3100 and experimental inkjet Hagaki support to iP3000.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.219) (+2 -2)
+
+	Corrected Canon MP450 printer definition.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.202) (+5 -5)
+		src/main/canon-printers.h (1.218) (+1 -1)
+
+	Corrected Canon iP90 printer definition, commented out unsupported modes.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.217) (+1 -1)
+
+	Corrected Canon iP4000 printer definition.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.93) (+19 -0)
+		src/main/canon-modes.h (1.201) (+27 -11)
+		src/main/canon-printers.h (1.216) (+3 -3)
+
+	Corrected Canon iP3000 printer definition and commands, made custom media, and added and corrected modes.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.200) (+13 -4)
+		src/main/canon-printers.h (1.215) (+2 -5)
+
+	Corrected Canon MP150 printer definition, customized modes.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.92) (+1 -1)
+		src/main/canon-modes.h (1.199) (+35 -0)
+		src/main/canon-printers.h (1.214) (+2 -2)
+
+	Corrected Canon MP190 printer definition, customized modes.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.91) (+0 -11)
+		src/main/canon-modes.h (1.198) (+26 -12)
+		src/main/canon-printers.h (1.213) (+2 -2)
+		src/xml/printers.xml (1.194) (+2 -2)
+
+	Updated modes for Canon MP170 (commented out some unsupported modes), corrected printer definition. Also added MP180 which is a clone of MP170.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.520) (+2 -0)
+		src/main/canon-media.h (1.90) (+18 -0)
+		src/main/canon-modes.h (1.197) (+35 -0)
+		src/main/canon-printers.h (1.212) (+13 -0)
+		src/xml/printers.xml (1.193) (+2 -1)
+
+	Added experimental support for Canon MP240.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.196) (+25 -0)
+		src/main/canon-printers.h (1.211) (+13 -0)
+		src/xml/printers.xml (1.192) (+2 -2)
+
+	created separate printr definition for Canon iX4000.
+
+2011-11-21	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.519) (+3 -2)
+		src/main/canon-media.h (1.89) (+26 -0)
+		src/main/canon-modes.h (1.195) (+31 -0)
+		src/main/canon-printers.h (1.210) (+13 -0)
+		src/main/print-canon.c (1.282) (+4 -4)
+		src/xml/printers.xml (1.191) (+7 -6)
+
+	Changed driver for Canon i865, adding custom media, soruce and mode definitions. Kept old printer definition in xml/printers.xml, renamed to make the old ones have an extension 'old', so that depreciation will be simpler.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.194) (+31 -0)
+		src/main/canon-printers.h (1.209) (+13 -0)
+		src/xml/printers.xml (1.190) (+2 -1)
+
+	Added experimental support for Canon MP210.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.518) (+2 -1)
+		src/main/canon-modes.h (1.193) (+9 -2)
+		src/main/canon-printers.h (1.208) (+13 -0)
+		src/xml/printers.xml (1.189) (+3 -2)
+
+	Added experimental support for Canon MP140 and changed driver for MP160 (clone of MP140).
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.192) (+2 -1)
+		src/main/print-canon.c (1.281) (+4 -1)
+
+	Added ESC (t flag for Canon MP130 and other early devices. Corrected MP360 flag definition.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.517) (+2 -0)
+		src/main/canon-modes.h (1.191) (+26 -0)
+		src/main/canon-printers.h (1.207) (+13 -0)
+		src/main/print-canon.c (1.280) (+2 -2)
+		src/xml/printers.xml (1.188) (+3 -1)
+
+	Added experimental support for Canon S900 and S9000.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.516) (+1 -0)
+		src/main/canon-printers.h (1.206) (+13 -0)
+		src/xml/printers.xml (1.187) (+2 -1)
+
+	Added experimenal support for Canon S830D.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.515) (+1 -0)
+		src/main/canon-modes.h (1.190) (+28 -0)
+		src/main/canon-printers.h (1.205) (+13 -0)
+		src/main/print-canon.c (1.279) (+2 -2)
+		src/xml/printers.xml (1.186) (+2 -1)
+
+	Added experimenal support for Canon S820.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.514) (+1 -0)
+		src/foomatic/foomatic-generator.in (1.79) (+2 -0)
+		src/main/canon-inks.h (1.98) (+36 -0)
+		src/main/canon-media.h (1.88) (+25 -0)
+		src/main/canon-modes.h (1.189) (+32 -0)
+		src/main/canon-printers.h (1.204) (+13 -0)
+		src/xml/printers.xml (1.185) (+2 -2)
+
+	Changed printer definition of Canon S800, correcting command sets, and adding media, sources, modes.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.513) (+1 -0)
+		src/main/canon-media.h (1.87) (+18 -0)
+		src/main/canon-modes.h (1.188) (+29 -4)
+		src/main/canon-printers.h (1.203) (+15 -2)
+		src/xml/printers.xml (1.184) (+2 -1)
+
+	Added experimental support for Canon S750.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.183) (+1 -2)
+
+	Removed existing (was copy of original S600 definition) entry for Canon S630. New definition remains.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.512) (+2 -0)
+		src/main/canon-modes.h (1.187) (+29 -0)
+		src/main/canon-printers.h (1.202) (+13 -0)
+		src/xml/printers.xml (1.182) (+3 -2)
+
+	Changed printer definition for Canon S600. Added modes. Added support for clone S630.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.511) (+1 -0)
+		src/main/canon-modes.h (1.186) (+1 -0)
+		src/main/canon-printers.h (1.201) (+1 -1)
+		src/xml/printers.xml (1.181) (+2 -1)
+
+	Added experimental support for Canon S530D (same as S520). Corrected modes, command set for S520.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.510) (+1 -0)
+		src/main/canon-media.h (1.86) (+20 -2)
+		src/main/canon-modes.h (1.185) (+26 -0)
+		src/main/canon-printers.h (1.200) (+13 -0)
+		src/xml/printers.xml (1.180) (+2 -1)
+
+	Added experimental support for Canon S520.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.509) (+1 -0)
+		src/main/canon-modes.h (1.184) (+22 -5)
+		src/main/canon-printers.h (1.199) (+13 -13)
+
+	Changed printer definition for Canon S500, added custom media and source lists, and added modes.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.508) (+1 -0)
+		src/main/canon-media.h (1.85) (+18 -0)
+		src/main/canon-modes.h (1.183) (+24 -0)
+		src/main/canon-printers.h (1.198) (+13 -2)
+		src/xml/printers.xml (1.179) (+2 -1)
+
+	Added experimental support for Canon S330.
+
+2011-11-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.507) (+1 -0)
+		src/main/canon-media.h (1.84) (+19 -0)
+		src/main/canon-modes.h (1.182) (+27 -0)
+		src/main/canon-printers.h (1.197) (+4 -4)
+
+	Changed driver for Canon S300: new printer definition, modes, papers.
+
+2011-11-19	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.83) (+18 -0)
+		src/main/canon-printers.h (1.196) (+2 -2)
+
+	created custom source and media sets for Canon S200.
+
+2011-11-19	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.506) (+1 -0)
+		src/main/canon-media.h (1.82) (+1 -1)
+		src/main/canon-modes.h (1.181) (+29 -0)
+		src/main/canon-printers.h (1.195) (+13 -0)
+		src/main/print-canon.c (1.278) (+3 -3)
+		src/xml/printers.xml (1.178) (+2 -1)
+
+	Added experimental support for Canon i9900.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.505) (+1 -0)
+		src/main/canon-inks.h (1.97) (+48 -0)
+		src/main/canon-modes.h (1.180) (+31 -2)
+		src/main/canon-printers.h (1.194) (+13 -0)
+		src/main/print-canon.c (1.277) (+2 -2)
+		src/xml/printers.xml (1.177) (+2 -1)
+
+	Added experimental support for Canon i9100.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.504) (+2 -0)
+		src/main/canon-inks.h (1.96) (+12 -0)
+		src/main/canon-media.h (1.81) (+17 -0)
+		src/main/canon-modes.h (1.179) (+29 -1)
+		src/main/canon-printers.h (1.193) (+19 -0)
+		src/xml/printers.xml (1.176) (+3 -1)
+
+	Added experimental support for Canon i6100 and i6500.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.503) (+1 -0)
+		src/main/canon-inks.h (1.95) (+0 -1)
+		src/main/canon-modes.h (1.178) (+29 -6)
+		src/main/canon-printers.h (1.192) (+13 -13)
+		src/main/print-canon.c (1.276) (+2 -2)
+
+	Added missing CAP_P to some Canon i-series.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.502) (+1 -0)
+		src/main/canon-inks.h (1.94) (+1 -2)
+		src/main/canon-modes.h (1.177) (+24 -0)
+		src/main/canon-printers.h (1.191) (+13 -0)
+		src/main/print-canon.c (1.275) (+2 -2)
+		src/xml/printers.xml (1.175) (+2 -1)
+
+	Added experimental support for Canon i900D.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.501) (+1 -0)
+		src/main/canon-modes.h (1.176) (+38 -2)
+		src/main/canon-printers.h (1.190) (+13 -0)
+		src/main/print-canon.c (1.274) (+4 -4)
+		src/xml/printers.xml (1.174) (+2 -1)
+
+	Added experimental support for Canon i960.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.500) (+1 -0)
+		src/main/canon-modes.h (1.175) (+33 -0)
+		src/main/canon-printers.h (1.189) (+13 -0)
+		src/main/print-canon.c (1.273) (+2 -2)
+		src/xml/printers.xml (1.173) (+2 -1)
+
+	Added experimental support for Canon i850.
+
+2011-11-18	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.499) (+6 -1)
+		src/main/canon-media.h (1.80) (+6 -0)
+		src/main/canon-modes.h (1.174) (+27 -0)
+		src/main/canon-printers.h (1.188) (+14 -1)
+		src/main/print-canon.c (1.272) (+24 -4)
+		src/xml/printers.xml (1.172) (+3 -2)
+
+	Major changes to Canon i860 support. Created printer definition, added modes (Note: iP4000 modes are used correctly in previous definition), new source definition. Added support for ESC (M command, and new ESC ($ command used also for simplex mode with this printer.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.498) (+1 -0)
+		src/main/canon-inks.h (1.93) (+12 -0)
+		src/main/canon-media.h (1.79) (+20 -0)
+		src/main/canon-modes.h (1.173) (+29 -0)
+		src/main/canon-printers.h (1.187) (+13 -0)
+		src/xml/printers.xml (1.171) (+2 -1)
+
+	Changed Canon i850 printer definition, added media types, modes.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.497) (+2 -0)
+		src/main/canon-media.h (1.78) (+21 -3)
+		src/main/canon-modes.h (1.172) (+30 -0)
+		src/main/canon-printers.h (1.186) (+20 -0)
+		src/xml/printers.xml (1.170) (+2 -1)
+
+	Added experimental support for Canon i550.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.496) (+2 -0)
+		src/main/canon-inks.h (1.92) (+26 -1)
+		src/main/canon-media.h (1.77) (+20 -2)
+		src/main/canon-modes.h (1.171) (+51 -1)
+		src/main/canon-printers.h (1.185) (+26 -0)
+		src/xml/printers.xml (1.169) (+4 -1)
+
+	Added experimental support for Canon i450, i455 and i470D.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.495) (+1 -0)
+		src/main/canon-modes.h (1.170) (+2 -1)
+		src/xml/printers.xml (1.168) (+2 -1)
+
+	Added experimental support for Canon i350 (same as i250). Corrected i250 plain draft mode.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.494) (+2 -0)
+		src/main/canon-media.h (1.76) (+18 -0)
+		src/main/canon-modes.h (1.169) (+32 -0)
+		src/main/canon-printers.h (1.184) (+13 -0)
+		src/xml/printers.xml (1.167) (+2 -1)
+
+	Added experimental support for Canon i320. Format of data not known.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.91) (+13 -0)
+		src/main/canon-media.h (1.75) (+17 -0)
+		src/main/canon-modes.h (1.168) (+26 -0)
+		src/main/canon-printers.h (1.183) (+17 -3)
+		src/xml/printers.xml (1.166) (+2 -1)
+
+	Added experimental support for Canon i250. Format of data not known.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.493) (+1 -0)
+		src/main/canon-media.h (1.74) (+19 -2)
+		src/main/canon-modes.h (1.167) (+25 -2)
+		src/main/canon-printers.h (1.182) (+13 -0)
+		src/xml/printers.xml (1.165) (+2 -1)
+
+	Added support for Canon i50.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.492) (+1 -0)
+		src/main/canon-media.h (1.73) (+17 -0)
+		src/main/canon-modes.h (1.166) (+24 -0)
+		src/main/canon-printers.h (1.181) (+13 -0)
+		src/xml/printers.xml (1.164) (+2 -1)
+
+	Added support for Canon i70.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.491) (+1 -0)
+		src/main/canon-inks.h (1.90) (+25 -0)
+		src/main/canon-media.h (1.72) (+17 -0)
+		src/main/canon-modes.h (1.165) (+17 -3)
+		src/main/canon-printers.h (1.180) (+4 -4)
+		src/main/print-canon.c (1.271) (+2 -2)
+
+	Corrected Canon i80 printer definition, commands, paperlist, changed and extended modes, added inksets.
+
+2011-11-17	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.164) (+22 -8)
+
+	Rearranged modes for Canon Pro9000 Mk.II.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.163) (+26 -14)
+		src/main/canon-printers.h (1.179) (+2 -2)
+
+	Corrected Canon Pro9000, Pro9000 Mk.II command control sets. Rearranged modes for Pro9000.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.178) (+1 -1)
+
+	Corrected Canon iP4800 command control set.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.71) (+19 -0)
+		src/main/canon-modes.h (1.162) (+30 -12)
+		src/main/canon-printers.h (1.177) (+3 -4)
+		src/main/print-canon.c (1.270) (+2 -2)
+
+	Corrected Canon iP8500 command control set and papers. Added, corrected and rearranged modes.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.161) (+17 -11)
+
+	Reorganized modes for Canon iP6700D (iP6600D same).
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.160) (+2 -2)
+		src/main/canon-printers.h (1.176) (+8 -8)
+
+	Corrected control comands for Canon iP6000D, iP6600D, iP6700D. Added missing I, P or both capabilities to iP6000D, iP6100D, iP6210D, 6600D, 6700D. Rearranged modes for iP6000D.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.89) (+1 -0)
+		src/main/canon-modes.h (1.159) (+18 -11)
+		src/main/canon-printers.h (1.175) (+1 -2)
+
+	Corrected command set, several modes, and added Env/Hagaki and CD modes for Canon iP5300. Corrected duplicate mode names in Canon MP830.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.88) (+6 -3)
+		src/main/canon-modes.h (1.158) (+15 -8)
+		src/main/canon-printers.h (1.174) (+2 -4)
+
+	Corrected command set for Canon MP830, added high quality mode. Rearranged remaining modes.
+
+2011-11-16	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.157) (+6 -3)
+
+	Reorder modes for Canon iX5000
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.490) (+1 -0)
+		src/main/canon-inks.h (1.87) (+68 -42)
+		src/main/canon-media.h (1.70) (+19 -0)
+		src/main/canon-modes.h (1.156) (+30 -0)
+		src/main/canon-printers.h (1.173) (+13 -0)
+		src/main/print-canon.c (1.269) (+2 -2)
+		src/xml/printers.xml (1.163) (+3 -3)
+
+	Separated Canon iP4100 from iP4000, giving it a new definition with corrected control set. Modes are nominally as for iP4000.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.155) (+2 -2)
+
+	Corrected names in Canon MP530 modes (bugfix for previous commit).
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.154) (+15 -12)
+
+	Reordered Canon MP530 modes.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.153) (+14 -16)
+
+	Reordered Canon iP2700 modes.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.152) (+13 -12)
+		src/main/canon-printers.h (1.172) (+1 -1)
+
+	Added CAP_T capability to some Canon printers. Reorganized Canon iP4900 modes.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.86) (+52 -16)
+		src/main/canon-modes.h (1.151) (+114 -91)
+		src/main/canon-printers.h (1.171) (+12 -12)
+
+	Reorganized modes, added CD flag, added some photo modes to following Canon devices: MG5100, MG5200, MG5300, MG6100, MG6200, MG8100, MG8200.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.150) (+25 -25)
+		src/main/canon-printers.h (1.170) (+43 -43)
+
+	Rearranged Canon iP4700 modes, added CD flag, added Env/Hagaki support. Added missing CD flag to several other printers
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.489) (+2 -1)
+		src/main/canon-inks.h (1.85) (+17 -0)
+		src/main/canon-modes.h (1.149) (+28 -26)
+		src/main/canon-printers.h (1.169) (+14 -14)
+
+	Corrected photo modes for Canon iP4500, added Env/Hagaki modes.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.488) (+5 -1)
+		src/foomatic/foomatic-generator.in (1.78) (+14 -0)
+		src/main/canon-media.h (1.69) (+0 -1)
+		src/main/canon-modes.h (1.148) (+27 -11)
+		src/main/canon-printers.h (1.168) (+2 -2)
+
+	Corrected printer definition, some modes, and added more modes for Canon MP250.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.84) (+3 -1)
+		src/main/canon-media.h (1.68) (+19 -1)
+		src/main/canon-modes.h (1.147) (+20 -0)
+		src/main/canon-printers.h (1.167) (+13 -0)
+		src/xml/printers.xml (1.162) (+2 -2)
+
+	Created new printer definition, modes, and media for Canon iP5000 (was using iP4000 driver). Notable is the most common mode for high quality in most media uses more output inks than declared in the inkset, so is as yet unsupported.
+
+2011-11-15	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.83) (+1 -1)
+		src/main/canon-modes.h (1.146) (+29 -36)
+		src/main/canon-printers.h (1.166) (+2 -2)
+
+	Rearranged modes for Canon MP960. Corrected output inks for some modes.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.82) (+2 -2)
+		src/main/canon-modes.h (1.145) (+5 -5)
+
+	Cleaned up mode names and inkset comments for Canon MP550.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.487) (+1 -0)
+		src/main/canon-inks.h (1.81) (+54 -3)
+		src/main/canon-media.h (1.67) (+24 -1)
+		src/main/canon-modes.h (1.144) (+43 -18)
+		src/main/canon-printers.h (1.165) (+13 -0)
+		src/xml/printers.xml (1.161) (+2 -1)
+
+	Added experimental support for Canon iP7500. Corrected inkset also required for MP960.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.143) (+4 -4)
+
+	renamed Env/Hagaki mode for Canon MP490. Changed default print mode to highest quality plain media for Canon MP470, MP490.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.80) (+4 -4)
+		src/main/canon-modes.h (1.142) (+25 -13)
+		src/main/canon-printers.h (1.164) (+9 -9)
+		src/main/print-canon.c (1.268) (+10 -3)
+
+	Added ESC (r 0x62 0x0 support to gutenprint. Capability added to PIXMA Pro9000, Pro9000 Mk.II, Pro9500, Pro9500 Mk.II, iP7100, iP8100, iP8600, iP9910, MP900. Modes for MP900 reorganized for easier readability. Correction to standard quality inkset.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.79) (+13 -0)
+		src/main/canon-modes.h (1.141) (+3 -3)
+
+	added inkset for Canon MP360 family for high quality photo modes, using only logical cmy inks (subchannels). Unfortunately, Canon backend cannot handle such a case yet, so modes commented out for now.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.140) (+21 -14)
+
+	rearranged modes for Canon MP360, MP370, MP375R, MP390 for easier readability. Still need to check if commented-out modes (using cmy output inks only) can be supported.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.139) (+4 -4)
+
+	checked, renamed modes for MP540, iP3600 - no functional change.
+
+2011-11-14	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.138) (+19 -14)
+
+	corrected T-shirt mode, split out for easier readability for Canon MP510, MP520, MP600, iP3300, iP3500, MX700
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.137) (+36 -13)
+		src/main/canon-printers.h (1.163) (+3 -3)
+
+	Added Env/Hagaki modes to Canon MP550 and MP560 which used same modelist. Created separate MP560 modelist to cater for duplex high quality plain media mode.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.162) (+2 -2)
+
+	Added duplex capability to Canon MP630, changed ink order.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.136) (+14 -17)
+
+	Added Env/Hagaki modes to Canon MP540 and MP620. Renamed and split out modes for easier readability.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.135) (+16 -15)
+		src/main/canon-printers.h (1.161) (+2 -2)
+
+	Added duplex capability, and Env/Hagaki modes to Canon MP640. Renamed and split out modes for easier readability.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.134) (+10 -5)
+		src/main/canon-printers.h (1.160) (+2 -2)
+
+	Corrected control set for Canon iP6100D, renamed and split out modes for easier readability.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.78) (+45 -29)
+		src/main/canon-modes.h (1.133) (+15 -8)
+
+	Added Env/Hagaki modes to Canon MP980. Renamed and split out modes for easier readability. Reordered inksets.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.132) (+12 -12)
+
+	corrected FineArt mode for Canon iP8600. Corrected duplicate mode names in iP7100, iP8100, iP8600, iP9910.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.77) (+7 -8)
+		src/main/canon-modes.h (1.131) (+50 -44)
+		src/main/canon-printers.h (1.159) (+1 -1)
+
+	added Env/Hagaki modes to Canon MP810, corrected output inks for several photo modes. Cleaned up inkset definitions.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.76) (+1 -0)
+		src/main/canon-modes.h (1.130) (+11 -4)
+		src/main/canon-printers.h (1.158) (+1 -1)
+
+	added Env/Hagaki modes to Canon MP800, corrected output inks for plain and several photo modes.
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.129) (+5 -5)
+		src/main/canon-printers.h (1.157) (+2 -2)
+
+	added duplex capability to Canon iX7000, and corrected photo mode definitions
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.156) (+2 -2)
+
+	corrected control command set for Canon pro9500, pro9500 Mk.II
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.128) (+0 -3)
+		src/main/canon-printers.h (1.155) (+2 -2)
+
+	corrected control command set for Canon pro9000, pro9000 Mk.II
+
+2011-11-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.127) (+39 -39)
+
+	added missing mode flag to Canon iP7100, iP8100, iP8600 iP9910 modes
+
+2011-11-12	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.486) (+1 -0)
+		src/main/canon-media.h (1.66) (+23 -0)
+		src/main/canon-modes.h (1.126) (+35 -0)
+		src/main/canon-printers.h (1.154) (+13 -0)
+		src/main/print-canon.c (1.267) (+3 -2)
+		src/xml/printers.xml (1.160) (+2 -1)
+
+	Experimental support added for Canon iP9910
+
+2011-11-12	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.485) (+1 -0)
+		src/main/canon-modes.h (1.125) (+35 -0)
+		src/main/canon-printers.h (1.153) (+13 -0)
+		src/xml/printers.xml (1.159) (+2 -1)
+
+	Experimental support added for Canon iP8600
+
+2011-11-12	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.484) (+1 -0)
+		src/main/canon-modes.h (1.124) (+33 -1)
+		src/main/canon-printers.h (1.152) (+13 -1)
+		src/xml/printers.xml (1.158) (+2 -1)
+
+	Experimental support added for Canon iP8100
+
+2011-11-12	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.483) (+1 -0)
+		src/main/canon-inks.h (1.75) (+15 -0)
+		src/main/canon-media.h (1.65) (+23 -0)
+		src/main/canon-modes.h (1.123) (+31 -1)
+		src/main/canon-printers.h (1.151) (+14 -0)
+		src/xml/printers.xml (1.157) (+2 -1)
+
+	Experimental support added for Canon iP7100
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.482) (+3 -0)
+		src/foomatic/foomatic-generator.in (1.77) (+6 -0)
+		src/main/canon-inks.h (1.74) (+81 -14)
+		src/main/canon-media.h (1.64) (+1 -1)
+		src/main/canon-modes.h (1.122) (+30 -0)
+		src/main/canon-printers.h (1.150) (+13 -0)
+		src/main/print-canon.c (1.266) (+6 -1)
+		src/xml/printers.xml (1.156) (+4 -1)
+
+	Added support for Canon iP6210D, iP6220D, iP6310D. Uses cartridge selection, but currently only use of both is supported. Other option is color-only.
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.121) (+13 -15)
+
+	Corrected Envelope/Hagaki modes for Canon iP4900. Added CD flag.
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.120) (+15 -17)
+
+	Corrected Envelope/Hagaki modes for Canon MG8200. Added CD flag.
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.73) (+2 -2)
+		src/main/canon-modes.h (1.119) (+12 -14)
+
+	Add Env/Hagaki printing to Canon MG6200. Added CD flag.
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.118) (+8 -7)
+
+	corrected Canon MP530 high-resolution plain mode. Added Hagaki/Envelope modes.
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.117) (+11 -14)
+
+	modified Canon MG5300 mode names and small change to inkset mask for Hagaki/Env/Duplex modes
+
+2011-11-08	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.116) (+9 -8)
+
+	added Hagaki/Envelope modes to Canon MG5100
+
+2011-11-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.72) (+9 -4)
+		src/main/canon-modes.h (1.115) (+27 -5)
+		src/main/canon-printers.h (1.149) (+1 -1)
+
+	corrected and extended print modes for Canon iP4600
+
+2011-11-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.114) (+22 -1)
+		src/main/canon-printers.h (1.148) (+13 -0)
+		src/xml/printers.xml (1.155) (+2 -2)
+
+	corrected modes and printer defition for Canon iP4300, and added support for Envelope and Hagaki modes.
+
+2011-11-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.113) (+10 -0)
+		src/main/canon-printers.h (1.147) (+2 -3)
+
+	Added modes to Canon iX5000. Corrected printer definition.
+
+2011-11-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.265) (+36 -7)
+
+	Added workaround for setting FineArt papersize argument in ESC (P command (iP7100 excption partially implemented)
+
+2011-11-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.71) (+52 -7)
+		src/main/canon-media.h (1.63) (+21 -2)
+		src/main/canon-modes.h (1.112) (+18 -12)
+		src/main/canon-printers.h (1.146) (+5 -4)
+		src/main/print-canon.c (1.264) (+3 -3)
+		src/main/print-canon.h (1.6) (+5 -2)
+
+	Added support for CcMmYKk (i.e., CMYKcmk inks output). Extended Canon iP4200 modes, media, printer definition.
+
+2011-11-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.263) (+20 -6)
+		src/xml/papers.xml (1.10) (+37 -2)
+
+	Added Japanese Western-style envelopes and business cards to paper sizes. Extend paper size support in Canon backend.
+
+2011-11-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.70) (+15 -1)
+		src/main/canon-media.h (1.62) (+3 -0)
+		src/main/canon-modes.h (1.111) (+7 -2)
+		src/main/print-canon.c (1.262) (+4 -2)
+		src/main/print-canon.h (1.5) (+10 -7)
+
+	Added CMYKk capability to Canon backend. Added Hagaki, T-shirt, OHP media to iP4000 for testing.
+
+2011-11-05	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.110) (+0 -4)
+
+	removed unsupported modes from Canon MG5100
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.481) (+1 -0)
+		src/main/canon-media.h (1.61) (+7 -6)
+		src/main/canon-modes.h (1.109) (+25 -0)
+		src/main/canon-printers.h (1.145) (+13 -0)
+		src/xml/printers.xml (1.154) (+2 -1)
+
+	add support for Canon iP4900
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.480) (+1 -0)
+		src/xml/printers.xml (1.153) (+2 -1)
+
+	add support for Canon MG4100
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.479) (+1 -0)
+		src/main/canon-printers.h (1.144) (+13 -0)
+		src/xml/printers.xml (1.152) (+2 -1)
+
+	add support for Canon MG3100
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.478) (+1 -0)
+		src/main/canon-inks.h (1.69) (+68 -0)
+		src/main/canon-media.h (1.60) (+5 -0)
+		src/main/canon-modes.h (1.108) (+25 -1)
+		src/main/canon-printers.h (1.143) (+13 -0)
+		src/xml/printers.xml (1.151) (+2 -1)
+
+	add support for Canon MG2100
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.477) (+1 -0)
+		src/main/canon-modes.h (1.107) (+25 -1)
+		src/main/canon-printers.h (1.142) (+13 -0)
+		src/xml/printers.xml (1.150) (+2 -1)
+
+	added support for Canon MG8200
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.476) (+2 -0)
+		src/main/canon-inks.h (1.68) (+68 -0)
+		src/main/canon-media.h (1.59) (+8 -8)
+		src/main/canon-modes.h (1.106) (+25 -1)
+		src/main/canon-printers.h (1.141) (+13 -0)
+		src/xml/printers.xml (1.149) (+3 -1)
+
+	added support for Canon MG6200
+
+2011-11-03	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.67) (+17 -0)
+		src/main/canon-modes.h (1.105) (+32 -5)
+		src/main/canon-printers.h (1.140) (+18 -106)
+
+	added support for Canon MG5300
+
+2011-11-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.139) (+1 -1)
+
+	changed control set for Canon MX880
+
+2011-11-02	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.66) (+14 -0)
+		src/main/canon-modes.h (1.104) (+3 -3)
+
+	added plain media high-quality print mode to Canon iP4000
+
+2011-11-01	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.148) (+2 -2)
+
+	Fix the PX-V7 also.
+
+2011-10-31	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/Makefile.am (1.29) (+2 -3)
+		src/xml/escp2/model/model_116.xml (1.2) (removed)
+		src/xml/printers.xml (1.147) (+2 -2)
+
+	Epson R2000 is in fact wide carriage
+
+2011-10-30	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.65) (+49 -1)
+		src/main/canon-modes.h (1.103) (+9 -9)
+		src/main/canon-printers.h (1.138) (+1 -1)
+
+	corrected name for Canon MP900, added test inkets for MG5100
+
+2011-10-28	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.102) (+4 -12)
+
+	removed unsupported modes from Canon MG5100
+
+2011-10-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.475) (+1 -0)
+		src/main/canon-inks.h (1.64) (+61 -0)
+		src/main/canon-media.h (1.58) (+6 -1)
+		src/main/canon-modes.h (1.101) (+21 -0)
+		src/main/canon-printers.h (1.137) (+18 -4)
+		src/xml/printers.xml (1.146) (+2 -1)
+
+	added support for Canon MP900
+
+2011-10-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.474) (+1 -0)
+		src/main/canon-media.h (1.57) (+17 -0)
+		src/main/canon-modes.h (1.100) (+28 -0)
+		src/main/canon-printers.h (1.136) (+15 -1)
+		src/xml/printers.xml (1.145) (+2 -1)
+
+	added support for Canon MP470
+
+2011-10-26	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.473) (+1 -0)
+		src/main/canon-modes.h (1.99) (+32 -0)
+		src/main/canon-printers.h (1.135) (+15 -1)
+		src/main/print-canon.c (1.261) (+9 -2)
+		src/xml/printers.xml (1.144) (+2 -1)
+
+	added support for Canon MP490
+
+2011-10-25	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.134) (+4 -4)
+		src/main/print-canon.c (1.260) (+13 -3)
+
+	Corrected control set for Canon MG5100, MG5200, MG6200, MG8100. Corrected ESC (P command for so far known iP, MP, MX, iX and MG series.
+
+2011-10-22	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/Makefile.am (1.28) (+3 -2)
+		src/xml/escp2/model/model_116.xml (1.1) (added +139 -0)
+		src/xml/printers.xml (1.143) (+3 -1)
+
+	Add Epson PX-7V and R2000
+
+2011-10-20	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.133) (+1 -1)
+		src/main/print-canon.c (1.259) (+2 -2)
+
+	changed Canon iP4000 capabilites to include ESC (I and ESC (P commands, and set ESC (P command to use 2 bytes
+
+2011-10-20	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.472) (+1 -0)
+		src/main/canon-inks.h (1.63) (+51 -0)
+		src/main/canon-media.h (1.56) (+10 -0)
+		src/main/canon-modes.h (1.98) (+16 -0)
+		src/main/canon-printers.h (1.132) (+14 -0)
+		src/xml/printers.xml (1.142) (+2 -1)
+
+	added (experimental) support for Canon MP530
+
+2011-10-19	<rlk@sourceforge.net>
+
+	Files:	po/ja.po (1.71) (+3517 -4210)
+
+	Update Japanese translation
+
+2011-10-14	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.106) (+2 -2)
+
+	Fix a minor compile problem
+
+2011-09-30	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.434) (+9 -1)
+
+	Add SubchannelCutoff parameter.
+
+2011-09-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.141) (+2 -1)
+
+	Add support for Epson Stylus SX525.
+
+2011-09-18	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.471) (+1 -1)
+		configure.ac (1.229) (+3 -3)
+		po/gl.po (1.1) (added +15235 -0)
+
+	Add Galician translation.
+
+2011-08-13	<rlk@sourceforge.net>
+
+	Files:	src/cups/commandtocanon.c (1.2) (+1 -0)
+		src/cups/commandtoepson.c (1.4) (+3 -2)
+
+	stdio.h is needed.
+
+2011-08-09	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.258) (+1 -1)
+
+	add Canon printer family name (currently PIXMA or SELPHY) to string for model comparison, else comparison fails (reason unknown).
+
+2011-08-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.257) (+3 -2)
+
+	added MP990 to XML-capable printers to correct ESC P command from 4 bytes to 6 bytes length
+
+2011-08-01	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.131) (+14 -1)
+		src/main/print-canon.c (1.256) (+3 -2)
+		src/xml/printers.xml (1.140) (+2 -1)
+
+	added support for Canon MP560
+
+2011-07-16	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.470) (+1 -0)
+		src/main/canon-inks.h (1.62) (+13 -0)
+		src/main/canon-media.h (1.55) (+16 -0)
+		src/main/canon-modes.h (1.97) (+22 -0)
+		src/main/canon-printers.h (1.130) (+13 -0)
+		src/main/print-canon.c (1.255) (+5 -2)
+		src/xml/printers.xml (1.139) (+5 -4)
+
+	redone support for Canon MP360, MP370, MP390, added MP375R (same family).
+
+2011-07-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.469) (+1 -0)
+		src/main/canon-media.h (1.54) (+26 -0)
+		src/main/canon-printers.h (1.129) (+14 -0)
+		src/xml/printers.xml (1.138) (+2 -1)
+
+	add support for Canon iP3600
+
+2011-07-15	<gernot2270@sourceforge.net>
+
+	Files:	NEWS (1.468) (+2 -0)
+		src/main/canon-media.h (1.53) (+16 -0)
+		src/main/canon-printers.h (1.128) (+14 -0)
+		src/xml/printers.xml (1.137) (+4 -3)
+
+	corrected Canon PIXMA iP3100, iP3500 drivers in printers.xml. Added iP3300 support (similar to iP3500, but ifferent media selection).
+
+2011-07-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.52) (+19 -0)
+		src/main/canon-printers.h (1.127) (+14 -0)
+		src/xml/printers.xml (1.136) (+2 -1)
+
+	support for Canon MP190 added
+
+2011-07-12	<gernot2270@sourceforge.net>
+
+	Files:	test/pixma_parse.c (1.26) (+4 -3)
+
+	reduced output of unknown ink messages in parser
+
+2011-07-10	<gernot2270@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.135) (+3 -3)
+
+	change model of SELPHY CP-760 (tested) and CP-780 (assumed)
+
+2011-07-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.61) (+1 -1)
+		src/main/canon-printers.h (1.126) (+15 -1)
+		src/xml/printers.xml (1.134) (+2 -2)
+		test/pixma_parse.c (1.25) (+9 -9)
+
+	add separate printer definition for Canon MP620
+
+2011-07-10	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.254) (+13 -7)
+
+	add media size argument for ESC P command
+
+2011-07-09	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.87) (+1949 -2422)
+
+	Update Dutch translation
+
+2011-07-06	<gernot2270@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.99) (+52 -40)
+		src/xml/printers.xml (1.133) (+6 -6)
+
+	committing Solomon Peachy's patch (v3) for SELPHY CP series, with updated model numbers
+
+2011-07-06	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.467) (+4 -1)
+		src/xml/printers.xml (1.132) (+2 -1)
+
+	Add Epson RX650
+
+2011-07-04	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.60) (+1 -0)
+		src/main/canon-media.h (1.51) (+16 -0)
+		src/main/canon-modes.h (1.96) (+20 -0)
+		src/main/canon-printers.h (1.125) (+14 -0)
+		src/main/print-canon.c (1.253) (+21 -4)
+		src/xml/printers.xml (1.131) (+3 -1)
+
+	Canon iP90/iP90v experimental support added
+
+2011-07-03	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.121) (+3 -3)
+
+	Use build-time definition of ALL_LINGUAS rather than unnecessarily
+	substituting at autogen time.
+
+2011-07-03	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.228) (+3 -3)
+		po/uk.po (1.4) (+228 -47)
+
+	Re-enable Ukrainian translation
+
+2011-07-02	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.227) (+3 -3)
+
+	Remove Ukrainian translation (still has illegal strings).
+
+2011-07-02	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.226) (+3 -3)
+		po/uk.po (1.3) (+370 -347)
+
+	Add/update Ukrainian translation
+
+2011-06-16	<m0m@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.98) (+141 -16)
+		src/xml/printers.xml (1.130) (+10 -3)
+
+	fixed support for Canon SELPHY ES2, ES20
+	added support for Canon SELPHY ES3, ES30, ES40
+	added Canon SELPHY CP760, CP770, CP780, CP790 to the list of printers
+
+	Thanks to Solomon Peachy and Gernot Hassenpflug
+	(http://old.nabble.com/dye-sub-Canon-ES20%2C-ES40-help-tt31812008.html)
+
+2011-06-14	<gernot2270@sourceforge.net>
+
+	Files:	po/cs.po (1.61) (+1611 -1601)
+		po/da.po (1.104) (+1611 -1601)
+		po/de.po (1.76) (+1611 -1601)
+		po/el.po (1.76) (+1611 -1601)
+		po/en_GB.po (1.169) (+1611 -1601)
+		po/es.po (1.74) (+1611 -1601)
+		po/fi.po (1.6) (+1611 -1601)
+		po/fr.po (1.102) (+1611 -1601)
+		po/hu.po (1.34) (+1611 -1601)
+		po/it.po (1.14) (+1611 -1601)
+		po/ja.po (1.70) (+1611 -1601)
+		po/nb.po (1.35) (+1611 -1601)
+		po/nl.po (1.86) (+1611 -1601)
+		po/pl.po (1.80) (+1611 -1601)
+		po/pt.po (1.75) (+1611 -1601)
+		po/ru.po (1.8) (+1611 -1601)
+		po/sk.po (1.79) (+1611 -1601)
+		po/sl.po (1.3) (+1611 -1601)
+		po/sv.po (1.105) (+1612 -1602)
+		po/zh_TW.po (1.35) (+1611 -1601)
+		src/cups/genppd.c (1.187) (+3 -2)
+		src/main/canon-inks.h (1.59) (+29 -4)
+		src/main/canon-media.h (1.50) (+22 -0)
+		src/main/canon-modes.h (1.95) (+25 -0)
+		src/main/canon-printers.h (1.124) (+31 -0)
+		src/main/print-canon.c (1.252) (+3 -2)
+		src/xml/printers.xml (1.129) (+3 -1)
+
+	add experimental support for Canon SELPHY DS700 and DS810
+
+2011-06-13	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-media.h (1.49) (+1 -1)
+		src/main/canon-printers.h (1.123) (+2 -2)
+
+	updated MP540, MP550 command set
+
+2011-06-13	<rlk@sourceforge.net>
+
+	Files:	src/escputil/d4lib.c (1.14) (+45 -36)
+		src/escputil/escputil.c (1.105) (+86 -72)
+
+	Print debugging information more clearly
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.28) (+3 -2)
+
+	docbook-toys is called docbook-utils on some systems.
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.466) (+26 -1)
+		README (1.210) (+15 -11)
+
+	Bump version
+
+2011-06-12	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.94) (+680 -677)
+		src/main/canon-printers.h (1.122) (+100 -99)
+		src/main/print-canon.c (1.251) (+9 -5)
+
+	changed raster_lines_per_block from being part of printer definition to being part of each mode definition
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/vars.h (1.10) (+5 -5)
+
+	Correct documentation of stp_vars_copy_from.
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.225) (+5 -5)
+		include/gutenprint/vars.h (1.9) (+9 -1)
+		src/main/gutenprint-internal.h (1.5) (+4 -4)
+		src/main/print-vars.c (1.93) (+77 -14)
+
+	Add stp_vars_copy_from(dest, src).
+
+	Add prefix argument to stpi_vars_print_error.
+
+	Add some more debugging.
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	src/main/mxml-file.c (1.11) (+11 -10)
+
+	Make the buffer sizes be defined constants rather than arbitrary
+	inline integers.
+
+2011-06-12	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.18) (+9 -6)
+
+	Allow specifying how many pages should be tested.
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.121) (+2 -2)
+
+	changed raster blocks to 16 on MP540, MP550
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.120) (+4 -4)
+
+	added back CANON_CAP_I from iP4700, MP540, MP550, but changed raster blocks to 16 on iP4700
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.119) (+3 -3)
+
+	removed CANON_CAP_I from iP4700, MP540, MP550 experimentally
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-printers.h (1.118) (+20 -20)
+		src/main/print-canon.c (1.250) (+2 -2)
+
+	fixed CANON_CAP_P for several models and corrected CANON_CAP_P code in print-canon.c
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.93) (+0 -2)
+		src/main/canon-printers.h (1.117) (+3 -3)
+
+	added CANON_CAP_P support to Canon MP550, iP4700
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.92) (+4 -5)
+		src/main/canon-printers.h (1.116) (+1 -1)
+
+	changed Canon iP4700 ink definitions, changed command set
+
+2011-06-11	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.91) (+22 -0)
+		src/main/canon-printers.h (1.115) (+2 -2)
+
+	created separate mode list for MP550, changes ink channel order
+
+2011-06-09	<rlk@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.128) (+2 -1)
+
+	Add Epson CX3900
+
+2011-06-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.90) (+1 -1)
+
+	corrected Canon MP540, MP550 600dpi draft mode to not use photo black ink
+
+2011-06-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.89) (+1 -1)
+
+	corrected Canon MP540, MP550 600dpi high mode to not use photo black ink
+
+2011-06-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.88) (+3 -3)
+		src/main/canon-printers.h (1.114) (+2 -3)
+
+	corrected Canon MP990 command set, modified photo mode names
+
+2011-06-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-modes.h (1.87) (+1 -1)
+		src/main/canon-printers.h (1.113) (+1 -1)
+
+	corrected Canon MP250 command set, changed default print mode to 300dpi
+
+2011-05-23	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_115.xml (1.2) (+0 -2)
+
+	Fix a segfault in the CUPS driver with the Epson R3000.
+
+2011-05-22	<rlk@sourceforge.net>
+
+	Files:	src/cups/test-rastertogutenprint.in (1.17) (+1 -1)
+
+	Recognize -h option.
+
+2011-05-14	<rlk@sourceforge.net>
+
+	Files:	src/main/gutenprint-internal.h (1.4) (+4 -2)
+		src/main/print-color.c (1.144) (+2 -2)
+		src/main/print-vars.c (1.92) (+83 -1)
+
+	Add some debug information to the printout if an assertion trips
+
+2011-05-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.42) (+50 -1)
+
+	Add options to list printers, list options for a printer, and list
+	values for each option.
+
+2011-05-07	<gernot2270@sourceforge.net>
+
+	Files:	src/main/canon-inks.h (1.58) (+61 -3)
+		src/main/canon-media.h (1.48) (+7 -0)
+		src/main/canon-modes.h (1.86) (+7 -4)
+		src/main/canon-printers.h (1.112) (+14 -0)
+		src/xml/printers.xml (1.127) (+2 -1)
+		test/pixma_parse.c (1.24) (+78 -10)
+		test/pixma_parse.h (1.8) (+0 -1)
+
+	add support for Canon iP3500, add photo modes for MP520
+
+===============================================================================
+Name: gutenprint-5_2_7
+
+2011-05-03	<rlk@sourceforge.net>
+
+	Files:	AUTHORS (1.26) (+3 -0)
+
+	Update authors file.
+
+2011-05-03	<rlk@sourceforge.net>
+
+	Files:	AUTHORS (1.25) (+5 -1)
+
+	Add Gernot to the list.
+
 2011-05-02	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.60) (+3276 -3090)
@@ -472,7 +5041,7 @@
 
 	Files:	NEWS (1.448) (+4 -0)
 		configure.ac (1.222) (+3 -3)
-		po/sl.po (1.1) (added +14546 -0)
+		po/sl.po (1.1) (added +15239 -0)
 
 	Add Slovenian translation
 
@@ -551,7 +5120,7 @@
 		src/xml/escp2/inks/Makefile.am (1.13) (+2 -1)
 		src/xml/escp2/inks/f360_ultrachrome_k3v_2.xml (1.1) (added +610 -0)
 		src/xml/escp2/model/Makefile.am (1.27) (+3 -2)
-		src/xml/escp2/model/model_115.xml (1.1) (added +164 -0)
+		src/xml/escp2/model/model_115.xml (1.1) (added +162 -0)
 		src/xml/printers.xml (1.101) (+3 -1)
 
 	Experimental support for Epson Stylus Photo R3000
@@ -1758,7 +6327,7 @@ Name: gutenprint-5_2_6
 2010-04-19	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.217) (+3 -3)
-		po/fi.po (1.1) (added +14461 -0)
+		po/fi.po (1.1) (added +15150 -0)
 
 	Add Finnish translation
 
@@ -2096,7 +6665,7 @@ Name: gutenprint-5_2_4
 2009-06-24	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.213) (+3 -3)
-		po/ru.po (1.1) (added +14488 -0)
+		po/ru.po (1.1) (added +15175 -0)
 
 	Add Russian translation
 
@@ -3046,7 +7615,7 @@ Name: gutenprint-5_2_2
 2008-11-11	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.207) (+3 -3)
-		po/it.po (1.1) (added +14855 -0)
+		po/it.po (1.1) (added +15548 -0)
 
 	Add Italian translation
 
@@ -5732,7 +10301,7 @@ Name: gutenprint-5_2_0-beta4
 		src/xml/escp2/model/model_87.xml (1.6) (+1 -0)
 		src/xml/escp2/model/model_9.xml (1.5) (+1 -0)
 		src/xml/escp2/qualitypresets/.cvsignore (1.1) (added +3 -0)
-		src/xml/escp2/qualitypresets/Makefile.am (1.1) (added +46 -0)
+		src/xml/escp2/qualitypresets/Makefile.am (1.1) (added +47 -0)
 		src/xml/escp2/qualitypresets/p1_5.xml (1.1) (added +70 -0)
 		src/xml/escp2/qualitypresets/picturemate.xml (1.1) (added +60 -0)
 		src/xml/escp2/qualitypresets/standard.xml (1.1) (added +70 -0)
@@ -6592,7 +11161,7 @@ Name: gutenprint-5_2_0-beta3
 		src/xml/escp2/media/ultrachrome.xml (1.1) (added +918 -0)
 		src/xml/escp2/media/x80.xml (1.1) (added +465 -0)
 		src/xml/escp2/model/.cvsignore (1.1) (added +3 -0)
-		src/xml/escp2/model/Makefile.am (1.1) (added +157 -0)
+		src/xml/escp2/model/Makefile.am (1.1) (added +159 -0)
 		src/xml/escp2/model/model_0.xml (1.1) (added +126 -0)
 		src/xml/escp2/model/model_1.xml (1.1) (added +144 -0)
 		src/xml/escp2/model/model_10.xml (1.1) (added +146 -0)
@@ -6681,8 +11250,8 @@ Name: gutenprint-5_2_0-beta3
 		src/xml/escp2/model/model_86.xml (1.1) (added +122 -0)
 		src/xml/escp2/model/model_87.xml (1.1) (added +193 -0)
 		src/xml/escp2/model/model_9.xml (1.1) (added +145 -0)
-		src/xml/papers.xml (1.1) (added +1368 -0)
-		src/xml/printers.xml (1.1) (added +1777 -0)
+		src/xml/papers.xml (1.1) (added +1403 -0)
+		src/xml/printers.xml (1.1) (added +1910 -0)
 		test/run-testdither (1.13) (+1 -1)
 		test/run-weavetest (1.25) (+1 -1)
 
@@ -7897,7 +12466,7 @@ Name: gutenprint-5_1_5
 
 2007-12-24	<rlk@sourceforge.net>
 
-	Files:	src/main/xmlppd.c (1.1) (added +576 -0)
+	Files:	src/main/xmlppd.c (1.1) (added +574 -0)
 		src/main/xmlppd.h (1.1) (added +46 -0)
 
 	First checkin of replacement PPD code (compiles, does not run successfully)
@@ -7972,7 +12541,7 @@ Name: gutenprint-5_1_5
 		src/cups/Makefile.am (1.94) (+4 -3)
 		src/cups/genppd.c (1.139) (+7 -2)
 		src/cups/rastertoprinter.c (1.114) (+162 -91)
-		src/cups/test-rastertogutenprint.in (1.1) (added +247 -0)
+		src/cups/test-rastertogutenprint.in (1.1) (added +250 -0)
 
 	Add test for CUPS driver
 
@@ -10224,8 +14793,8 @@ Name: gutenprint-5_1_0
 2006-09-30	<faust3@sourceforge.net>
 
 	Files:	test/Makefile.am (1.47) (+4 -2)
-		test/pixma_parse.c (1.1) (added +816 -0)
-		test/pixma_parse.h (1.1) (added +266 -0)
+		test/pixma_parse.c (1.1) (added +907 -0)
+		test/pixma_parse.h (1.1) (added +265 -0)
 
 	add pixma_parse a parser for canon bjl printjobs that can also generate ppm images from the raster data
 
@@ -10918,13 +15487,13 @@ Name: gutenprint-5_0-bp
 
 2006-08-28	<faust3@sourceforge.net>
 
-	Files:	src/main/canon-modes.h (1.1) (added +1382 -0)
+	Files:	src/main/canon-modes.h (1.1) (added +3642 -0)
 
 	file canon-modes.h was initially added on branch canon_experimental.
 
 2006-08-07	<faust3@sourceforge.net>
 
-	Files:	src/main/canon-inks.h (1.1) (added +2148 -0)
+	Files:	src/main/canon-inks.h (1.1) (added +3116 -0)
 
 	file canon-inks.h was initially added on branch canon_experimental.
 
@@ -10980,15 +15549,15 @@ Name: gutenprint-5_0_0
 
 2006-07-23	<faust3@sourceforge.net>
 
-	Files:	src/main/canon-printers.h (1.1) (added +1589 -0)
+	Files:	src/main/canon-printers.h (1.1) (added +2915 -0)
 
 	file canon-printers.h was initially added on branch canon_experimental.
 
 2006-07-22	<faust3@sourceforge.net>
 
-	Files:	src/main/canon-media.h (1.1) (added +1129 -0)
+	Files:	src/main/canon-media.h (1.1) (added +1959 -0)
 		src/main/print-canon.c (1.175) (+43 -121)
-		src/main/print-canon.h (1.1) (added +142 -0)
+		src/main/print-canon.h (1.1) (added +153 -0)
 
 	Cleanup Step 1
 	create a header for the canon driver
@@ -11056,8 +15625,8 @@ Name: gutenprint-5_0_0
 		README (1.164) (+12 -306)
 		configure.ac (1.143) (+2 -3)
 		doc/Makefile.am (1.47) (+10 -11)
-		doc/gutenprint-users-manual.odt (1.1) (added +648 -0)
-		doc/gutenprint-users-manual.pdf (1.1) (added +6019 -0)
+		doc/gutenprint-users-manual.odt (1.1) (added +603 -0)
+		doc/gutenprint-users-manual.pdf (1.1) (added +4178 -0)
 
 	1260142 User documentation needs updating for 5.0.0
 
@@ -11578,8 +16147,8 @@ Name: gutenprint-5_0_0-rc3
 
 	Files:	configure.ac (1.139) (+4 -2)
 		src/testpattern/Makefile.am (1.24) (+4 -3)
-		src/testpattern/printer_options.c (1.1) (added +262 -0)
-		src/testpattern/run-testpattern-2.in (1.1) (added +705 -0)
+		src/testpattern/printer_options.c (1.1) (added +263 -0)
+		src/testpattern/run-testpattern-2.in (1.1) (added +756 -0)
 		test/Makefile.am (1.46) (+1 -5)
 
 	Add improved test based on testpattern generator.
@@ -13211,7 +17780,7 @@ Name: gutenprint-5_0_0-rc2
 2005-08-10	<rlk@sourceforge.net>
 
 	Files:	configure.ac (1.129) (+3 -3)
-		po/zh_TW.po (1.1) (added +15565 -0)
+		po/zh_TW.po (1.1) (added +16237 -0)
 
 	Add zh_TW support
 
@@ -14299,7 +18868,7 @@ Name: gutenprint-5_0_0_beta4
 2005-04-09	<rlk@sourceforge.net>
 
 	Files:	src/escputil/Makefile.am (1.18) (+2 -0)
-		src/escputil/d4lib.c (1.1) (added +1510 -0)
+		src/escputil/d4lib.c (1.1) (added +1519 -0)
 		src/escputil/d4lib.h (1.1) (added +55 -0)
 		src/escputil/escputil.c (1.67) (+547 -259)
 
@@ -15046,7 +19615,7 @@ Name: gutenprint-5_0_0-beta3
 		include/gutenprint/.cvsignore (1.1) (added +3 -0)
 		include/gutenprint/Makefile.am (1.1) (added +63 -0)
 		include/gutenprint/array.h (1.1) (added +169 -0)
-		include/gutenprint/bit-ops.h (1.1) (added +164 -0)
+		include/gutenprint/bit-ops.h (1.1) (added +175 -0)
 		include/gutenprint/channel.h (1.1) (added +91 -0)
 		include/gutenprint/color.h (1.1) (added +143 -0)
 		include/gutenprint/curve-cache.h (1.1) (added +82 -0)
@@ -15067,7 +19636,7 @@ Name: gutenprint-5_0_0-beta3
 		include/gutenprint/sequence.h (1.1) (added +409 -0)
 		include/gutenprint/string-list.h (1.1) (added +100 -0)
 		include/gutenprint/util.h (1.1) (added +187 -0)
-		include/gutenprint/vars.h (1.1) (added +1541 -0)
+		include/gutenprint/vars.h (1.1) (added +1549 -0)
 		include/gutenprint/weave.h (1.1) (added +180 -0)
 		include/gutenprint/xml.h (1.1) (added +93 -0)
 		include/gutenprintui/.cvsignore (1.1) (added)
@@ -15190,7 +19759,7 @@ Name: gutenprint-5_0_0-beta3
 		src/gutenprintui2/plist.c (1.1) (added +1838 -0)
 		src/gutenprintui2/print-image-thumbnail.c (1.1) (added +130 -0)
 		src/gutenprintui2/printrc.h (1.1) (added +44 -0)
-		src/gutenprintui2/printrcl.l (1.1) (added +115 -0)
+		src/gutenprintui2/printrcl.l (1.1) (added +117 -0)
 		src/gutenprintui2/printrcy.y (1.1) (added +447 -0)
 		src/gutenprintui2/ui-utils.c (1.1) (added +874 -0)
 		src/libgimpprintui/.cvsignore (1.5) (removed)
@@ -15250,7 +19819,7 @@ Name: gutenprint-5_0_0-beta3
 		src/main/gimpprint.dtd (1.7) (removed)
 		src/main/gimpprint.pc.in (1.4) (removed)
 		src/main/gimpprint.xsd (1.8) (removed)
-		src/main/gutenprint-internal.h (1.1) (added +85 -0)
+		src/main/gutenprint-internal.h (1.1) (added +87 -0)
 		src/main/gutenprint.dtd (1.1) (added +224 -0)
 		src/main/gutenprint.pc.in (1.1) (added +11 -0)
 		src/main/gutenprint.xsd (1.1) (added +370 -0)
@@ -16158,7 +20727,7 @@ Name: gimp-print-5_0_0-beta1
 
 2004-06-15	<rleigh@sourceforge.net>
 
-	Files:	src/gimp2/print.c (1.1) (added +445 -0)
+	Files:	src/gimp2/print.c (1.1) (added +446 -0)
 
 	file print.c was initially added on branch gtk2-20040615-branch.
 
@@ -16824,7 +21393,7 @@ Name: gimp-print-5_0_0-alpha3
 
 2004-05-01	<rlk@sourceforge.net>
 
-	Files:	po/hu.po (1.1) (added +14560 -0)
+	Files:	po/hu.po (1.1) (added +15252 -0)
 
 	file hu.po was initially added on branch gimp-print-4_2_branch.
 
@@ -17032,13 +21601,13 @@ Name: gimp-print-5_0_0-alpha3
 
 2004-04-17	<rlk@sourceforge.net>
 
-	Files:	po/uk.po (1.1) (added +14031 -0)
+	Files:	po/uk.po (1.1) (added +15158 -0)
 
 	file uk.po was initially added on branch gimp-print-4_2_branch.
 
 2004-04-17	<rlk@sourceforge.net>
 
-	Files:	po/nb.po (1.1) (added +15822 -0)
+	Files:	po/nb.po (1.1) (added +16487 -0)
 
 	file nb.po was initially added on branch gimp-print-4_2_branch.
 
@@ -21161,7 +25730,7 @@ Name: gimp-print-4_3_17
 
 2003-06-19	<rlk@sourceforge.net>
 
-	Files:	src/main/mxml-file.c (1.1) (added +1481 -0)
+	Files:	src/main/mxml-file.c (1.1) (added +1467 -0)
 
 	file mxml-file.c was initially added on branch mxml-branch.
 
@@ -22070,7 +26639,7 @@ Name: gimp-print-4_3_15
 
 2003-05-21	<m0m@sourceforge.net>
 
-	Files:	src/main/print-olympus.c (1.1) (added +2881 -0)
+	Files:	src/main/print-olympus.c (1.1) (added +3018 -0)
 
 	file print-olympus.c was initially added on branch olympus-driver-branch.
 
@@ -22100,7 +26669,7 @@ Name: gimp-print-4_3_15
 
 2003-05-15	<rlk@sourceforge.net>
 
-	Files:	src/main/channel.c (1.1) (added +1174 -0)
+	Files:	src/main/channel.c (1.1) (added +1176 -0)
 
 	file channel.c was initially added on branch channel-20030511-branch.
 
@@ -22415,7 +26984,7 @@ Name: gimp-print-4_3_14
 
 2003-05-04	<rlk@sourceforge.net>
 
-	Files:	po/cs.po (1.1) (added +16112 -0)
+	Files:	po/cs.po (1.1) (added +16761 -0)
 
 	file cs.po was initially added on branch gimp-print-4_2_branch.
 
@@ -24196,7 +28765,7 @@ Name: gimp-print-4_3_9
 
 	Files:	src/main/.cvsignore (1.14) (+1 -0)
 		src/main/Makefile.am (1.61) (+2 -1)
-		src/main/bit-ops.c (1.1) (added +1185 -0)
+		src/main/bit-ops.c (1.1) (added +1288 -0)
 		src/main/print-escp2.c (1.223) (+24 -10)
 		src/main/print-lexmark.c (1.103) (+24 -14)
 		src/main/print-weave.c (1.47) (+18 -914)
@@ -24554,7 +29123,7 @@ Name: gimp-print-4_3_9
 		man/cups-genppdconfig.8.in (1.3) (+6 -5)
 		man/cups-genppdupdate.8.in (1.1) (added +94 -0)
 		src/cups/Makefile.am (1.62) (+3 -3)
-		src/cups/cups-genppdupdate.in (1.1) (added +874 -0)
+		src/cups/cups-genppdupdate.in (1.1) (added +905 -0)
 
 	Add cups-genppdupdate, for upgrading PPDs between Gimp-Print revisions
 
@@ -24827,7 +29396,7 @@ Name: gimp-print-4_3_9
 		src/main/gimp-print-internal.h (1.64) (+2 -3)
 		src/main/gimpprint.xsd (1.3) (+2 -8)
 		src/main/libgimpprint.sym (1.1) (added)
-		src/main/module.c (1.1) (added +415 -0)
+		src/main/module.c (1.1) (added +416 -0)
 		src/main/module.h (1.1) (added)
 		src/main/papers.h (1.5) (+27 -2)
 		src/main/papers.xml (1.4) (+8 -1)
@@ -27162,13 +31731,13 @@ Name: gimp-print-4_3_6
 
 2002-10-21	<rlk@sourceforge.net>
 
-	Files:	src/main/print-vars.c (1.1) (added +2141 -0)
+	Files:	src/main/print-vars.c (1.1) (added +2291 -0)
 
 	file print-vars.c was initially added on branch reorg-20021020-branch.
 
 2002-10-21	<rlk@sourceforge.net>
 
-	Files:	src/main/print-papers.c (1.1) (added +440 -0)
+	Files:	src/main/print-papers.c (1.1) (added +432 -0)
 
 	file print-papers.c was initially added on branch reorg-20021020-branch.
 
@@ -27378,7 +31947,7 @@ Name: gimp-print-4_3_6
 
 2002-10-07	<rlk@sourceforge.net>
 
-	Files:	po/ja.po (1.1) (added +16149 -0)
+	Files:	po/ja.po (1.1) (added +16383 -0)
 
 	file ja.po was initially added on branch gimp-print-4_2_branch.
 
@@ -28504,7 +33073,7 @@ Name: gimp-print-4_3_1
 
 2002-06-01	<rlk@sourceforge.net>
 
-	Files:	po/de.po (1.1) (added +15522 -0)
+	Files:	po/de.po (1.1) (added +16211 -0)
 
 	file de.po was initially added on branch gimp-print-4_2_branch.
 
@@ -28593,7 +33162,7 @@ Name: gimp-print-4_3_1
 
 2002-05-11	<rlk@sourceforge.net>
 
-	Files:	po/pt.po (1.1) (added +16223 -0)
+	Files:	po/pt.po (1.1) (added +16872 -0)
 
 	file pt.po was initially added on branch gimp-print-4_2_branch.
 
@@ -28690,7 +33259,7 @@ Name: gimp-print-4_3_1
 
 2002-04-28	<rlk@sourceforge.net>
 
-	Files:	po/es.po (1.1) (added +16264 -0)
+	Files:	po/es.po (1.1) (added +16913 -0)
 
 	Spanish translation
 
@@ -29423,7 +33992,7 @@ Name: gimp-print-4_3_0
 
 	Files:	acconfig.h (1.17) (removed)
 		autogen.sh (1.4) (+1 -1)
-		configure.ac (1.1) (added +1122 -0)
+		configure.ac (1.1) (added +1131 -0)
 		configure.in.in (1.121) (removed)
 		debian/rules (1.35) (+2 -2)
 		doc/README.maintaining (1.12) (+16 -22)
@@ -29590,7 +34159,7 @@ Name: gimp-print-4_3_0
 
 2002-03-16	<rlk@sourceforge.net>
 
-	Files:	po/nl.po (1.1) (added +14756 -0)
+	Files:	po/nl.po (1.1) (added +15227 -0)
 
 	file nl.po was initially added on branch gimp-print-4_2_branch.
 
@@ -29823,7 +34392,7 @@ Name: gimp-print-4_3_0
 
 2002-02-16	<rlk@sourceforge.net>
 
-	Files:	po/el.po (1.1) (added +15846 -0)
+	Files:	po/el.po (1.1) (added +16490 -0)
 
 	file el.po was initially added on branch gimp-print-4_2_branch.
 
@@ -29923,7 +34492,7 @@ Name: gimp-print-4_3_0
 
 2002-02-14	<rlk@sourceforge.net>
 
-	Files:	po/sk.po (1.1) (added +16208 -0)
+	Files:	po/sk.po (1.1) (added +16857 -0)
 
 	file sk.po was initially added on branch gimp-print-4_2_branch.
 
@@ -30299,7 +34868,7 @@ Name: gimp-print-4_3_0
 		m4/gettext.m4 (1.1) (added +417 -0)
 		m4/gimp.m4 (1.1) (added +211 -0)
 		m4/lcmessage.m4 (1.1) (added +30 -0)
-		m4/libtool.m4 (1.1) (added +7356 -0)
+		m4/libtool.m4 (1.1) (added +7831 -0)
 		m4/progtest.m4 (1.1) (added +92 -0)
 		scripts/autogen.sh (1.17) (+12 -0)
 		scripts/gettext.m4 (1.2) (removed)
@@ -30543,7 +35112,7 @@ Name: gimp-print-4_3_0
 		doc/appendices.texi (1.5) (removed)
 		doc/copying.texi (1.2) (removed)
 		doc/developer/.cvsignore (1.1) (added +22 -0)
-		doc/developer/Makefile.am (1.1) (added +193 -0)
+		doc/developer/Makefile.am (1.1) (added +197 -0)
 		doc/developer/copying.texi (1.1) (added)
 		doc/developer/dither.texi (1.1) (added)
 		doc/developer/escp2.texi (1.1) (added)
@@ -31016,7 +35585,7 @@ Name: gimp-print-4_1_99-rc1
 2001-11-08	<rlk@sourceforge.net>
 
 	Files:	configure.in.in (1.94) (+2 -2)
-		po/pl.po (1.1) (added +15471 -0)
+		po/pl.po (1.1) (added +16115 -0)
 
 	Add Polish translation
 
@@ -31566,7 +36135,7 @@ Name: gimp-print-4_1_99-b4
 2001-10-21	<rlk@sourceforge.net>
 
 	Files:	configure.in.in (1.87) (+2 -2)
-		po/da.po (1.1) (added +14538 -0)
+		po/da.po (1.1) (added +15231 -0)
 		po/en_GB.po (1.65) (+2 -2)
 		po/fr.po (1.8) (+1 -1)
 		po/no.po (1.8) (+1 -1)
@@ -31865,7 +36434,7 @@ Name: gimp-print-4_1_99-b4
 
 	Files:	configure.in.in (1.84) (+3 -3)
 		po/en_GB.po (1.57) (+335 -348)
-		po/fr.po (1.1) (added +15679 -0)
+		po/fr.po (1.1) (added +16362 -0)
 		po/no.po (1.1) (added)
 		po/sv.po (1.10) (+161 -554)
 		src/cups/Makefile.am (1.37) (+2 -2)
@@ -32566,7 +37135,7 @@ Name: gimp-print-4_1_99-b3
 
 	Files:	NEWS.4.2 (1.5) (+33 -24)
 		configure.in.in (1.76) (+2 -2)
-		po/sv.po (1.1) (added +16458 -0)
+		po/sv.po (1.1) (added +17140 -0)
 		src/foomatic/foomatic-printermap (1.13) (+1 -0)
 		src/ghost/gdevstp.c (1.13) (+70 -33)
 		src/main/print-escp2.c (1.121) (+168 -6)
@@ -33658,7 +38227,7 @@ Name: gimp-print-4_1_99-a3
 		src/testpattern/testpattern.c (1.1) (added +1219 -0)
 		src/testpattern/testpattern.h (1.1) (added +113 -0)
 		src/testpattern/testpattern.sample (1.1) (added +171 -0)
-		src/testpattern/testpatternl.l (1.1) (added +130 -0)
+		src/testpattern/testpatternl.l (1.1) (added +132 -0)
 		src/testpattern/testpatterny.y (1.1) (added +666 -0)
 		test/Makefile.am (1.24) (+4 -14)
 		test/testpattern.c (1.9) (removed)
@@ -35766,7 +40335,7 @@ Name: gimp-print-4_1_7
 	Files:	Makefile.am (1.94) (+2 -2)
 		configure.in.in (1.34) (+8 -7)
 		doc/.cvsignore (1.1) (added +9 -0)
-		doc/Makefile.am (1.1) (added +92 -0)
+		doc/Makefile.am (1.1) (added +96 -0)
 		doc/gimpprint.texi (1.1) (added)
 		doc/gpl.texi (1.1) (added)
 		src/foomatic/.cvsignore (1.2) (+2 -0)
@@ -36363,7 +40932,7 @@ Name: gimp-print-4_1_6
 		src/Makefile.am (1.2) (+2 -2)
 		src/foomatic/.cvsignore (1.1) (added +13 -0)
 		src/foomatic/Makefile.am (1.1) (added +122 -0)
-		src/foomatic/foomatic-generator.in (1.1) (added +1813 -0)
+		src/foomatic/foomatic-generator.in (1.1) (added +1832 -0)
 		src/foomatic/foomatic-printermap (1.1) (added)
 		src/foomatic/foomatic-templates/Brightness.xml (1.1) (added)
 		src/foomatic/foomatic-templates/Contrast.xml (1.1) (added)
@@ -36384,7 +40953,7 @@ Name: gimp-print-4_1_6
 		src/foomatic/foomatic-templates/Saturation.xml (1.1) (added)
 		src/foomatic/foomatic-templates/Yellow.xml (1.1) (added)
 		src/foomatic/foomatic-templates/stp.xml (1.1) (added)
-		src/foomatic/printer_options.c (1.1) (added +319 -0)
+		src/foomatic/printer_options.c (1.1) (added +320 -0)
 		test/Makefile.am (1.13) (+2 -6)
 		test/printer_options.c (1.7) (removed)
 
@@ -37138,7 +41707,7 @@ Name: gimp-print-4_1_4b
 		autogen.sh (1.3) (+1 -1)
 		configure.in.in (1.19) (+28 -13)
 		debian/rules (1.3) (+8 -3)
-		doc/README.maintaining (1.1) (added +564 -0)
+		doc/README.maintaining (1.1) (added +565 -0)
 		src/cups/Makefile.am (1.18) (+2 -2)
 		src/cups/genppd.c (1.8) (+6 -2)
 		src/cups/rastertoprinter.c (1.9) (+6 -2)
@@ -37658,7 +42227,7 @@ Name: gimp-print-4_1_4
 2001-02-08	<rleigh@sourceforge.net>
 
 	Files:	configure.in.in (1.5) (+2 -2)
-		po/en_GB.po (1.1) (added +15136 -0)
+		po/en_GB.po (1.1) (added +15827 -0)
 		po/en_TEST.po (1.1) (added)
 
 	Add en_GB and en_TEST translations
@@ -38360,7 +42929,7 @@ Name: print-4_1_3
 		Ghost/debian-patch-stp (1.2) (removed)
 		Ghost/devs.mak.addon-5.10 (1.8) (removed)
 		Ghost/gdevstp.c (1.52) (removed)
-		po/POTFILES.in (1.1) (added +80 -0)
+		po/POTFILES.in (1.1) (added +81 -0)
 		src/ghost/COPYING (1.1) (added)
 		src/ghost/ChangeLog (1.1) (added)
 		src/ghost/Makefile.am (1.2) (+1 -3)
@@ -38410,11 +42979,11 @@ Name: print-4_1_3
 		src/cups/commands/PrintSelfTestPage.cmd (1.1) (added +6 -0)
 		src/cups/commands/ReportLevels.cmd (1.1) (added +6 -0)
 		src/cups/commands/SetAlignment.cmd (1.1) (added +7 -0)
-		src/cups/commandtocanon.c (1.1) (added +196 -0)
-		src/cups/commandtoepson.c (1.1) (added +233 -0)
+		src/cups/commandtocanon.c (1.1) (added +197 -0)
+		src/cups/commandtoepson.c (1.1) (added +234 -0)
 		src/cups/epson.c (1.1) (added)
-		src/cups/genppd.c (1.1) (added +2567 -0)
-		src/cups/rastertoprinter.c (1.1) (added +1449 -0)
+		src/cups/genppd.c (1.1) (added +2574 -0)
+		src/cups/rastertoprinter.c (1.1) (added +1708 -0)
 
 	Moved cups/* under src/cups
 
@@ -38508,15 +43077,15 @@ Name: print-4_1_3
 		quickmatrix257.h (1.5) (removed)
 		ran.367.179.h (1.4) (removed)
 		ran.509.131.h (1.4) (removed)
-		src/main/print-canon.c (1.1) (added +2702 -0)
+		src/main/print-canon.c (1.1) (added +5666 -0)
 		src/main/print-color.c (1.1) (added +1775 -0)
 		src/main/print-dither.c (1.1) (added)
-		src/main/print-escp2.c (1.1) (added +4569 -0)
-		src/main/print-lexmark.c (1.1) (added +3025 -0)
+		src/main/print-escp2.c (1.1) (added +4575 -0)
+		src/main/print-lexmark.c (1.1) (added +3027 -0)
 		src/main/print-pcl.c (1.1) (added +3085 -0)
 		src/main/print-ps.c (1.1) (added +1380 -0)
 		src/main/print-util.c (1.1) (added +668 -0)
-		src/main/print-weave.c (1.1) (added +2006 -0)
+		src/main/print-weave.c (1.1) (added +2007 -0)
 		src/main/printers.xml (1.1) (added)
 		src/main/quickmatrix257.h (1.1) (added)
 		src/main/ran.367.179.h (1.1) (added)
@@ -38552,7 +43121,7 @@ Name: print-4_1_3
 	Files:	escputil.1.in (1.2) (removed)
 		escputil.c (1.27) (removed)
 		man/escputil.1.in (1.1) (added +128 -0)
-		src/escputil/escputil.c (1.1) (added +2198 -0)
+		src/escputil/escputil.c (1.1) (added +2220 -0)
 
 	Moved escputil to src/escputil and man
 
@@ -38596,12 +43165,12 @@ Name: print-4_1_3
 		man/Makefile.am (1.1) (added +58 -0)
 		po/ChangeLog (1.1) (added +3 -0)
 		src/Makefile.am (1.1) (added +38 -0)
-		src/cups/Makefile.am (1.1) (added +265 -0)
+		src/cups/Makefile.am (1.1) (added +267 -0)
 		src/escputil/Makefile.am (1.1) (added +38 -0)
 		src/ghost/Makefile.am (1.1) (added +41 -0)
 		src/gimp/Makefile.am (1.1) (added)
 		src/include/Makefile.am (1.1) (added)
-		src/main/Makefile.am (1.1) (added +170 -0)
+		src/main/Makefile.am (1.1) (added +171 -0)
 		src/printdef/Makefile.am (1.1) (added)
 		test/Makefile.am (1.1) (added +70 -0)
 
@@ -46605,7 +51174,7 @@ Name: print-3_1_6
 
 2000-02-03	<sharkey@sourceforge.net>
 
-	Files:	configure.in (1.1) (added +1122 -0)
+	Files:	configure.in (1.1) (added +1131 -0)
 
 	This is my first attempt at a configuration input file for autoconf.  It's
 	got some cheesy inelegant bits, but, it seems to work for me.  I'll try
@@ -46616,14 +51185,14 @@ Name: print-3_1_6
 
 2000-02-03	<sharkey@sourceforge.net>
 
-	Files:	AUTHORS (1.1) (added +124 -0)
+	Files:	AUTHORS (1.1) (added +131 -0)
 		COPYING (1.1) (added +340 -0)
-		ChangeLog (1.1) (added +47653 -0)
+		ChangeLog (1.1) (added +52229 -0)
 		INSTALL (1.1) (added +365 -0)
 		Makefile (1.12) (+196 -240)
 		Makefile.am (1.3) (+11 -5)
 		Makefile.in (1.2) (+174 -189)
-		NEWS (1.1) (added +2118 -0)
+		NEWS (1.1) (added +2462 -0)
 
 	These files are required documentation files for applications using
 	autoconf for configuration.  The current versions of these files
@@ -47254,7 +51823,7 @@ Name: print-3_1_6
 
 1999-11-14	<rlk@sourceforge.net>
 
-	Files:	README (1.1) (added +821 -0)
+	Files:	README (1.1) (added +826 -0)
 		print-escp2.c (1.26) (+32 -12)
 		print-util.c (1.28) (+59 -41)
 		print.c (1.23) (+5 -2)
@@ -47653,7 +52222,7 @@ Name: print-3_1_6
 
 1999-09-12	<rlk@sourceforge.net>
 
-	Files:	Makefile (1.1) (added +1023 -0)
+	Files:	Makefile (1.1) (added +1027 -0)
 		print-escp2.c (1.2) (+259 -24)
 		print-pcl.c (1.2) (+3 -2)
 		print-ps.c (1.2) (+3 -2)
@@ -47666,7 +52235,7 @@ Name: print-3_1_6
 1999-09-12	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.1) (added +214 -0)
-		Makefile.in (1.1) (added +1023 -0)
+		Makefile.in (1.1) (added +1027 -0)
 		print-escp2.c (1.1) (added)
 		print-pcl.c (1.1) (added)
 		print-ps.c (1.1) (added)
diff --git a/Makefile.in b/Makefile.in
index ed51818..1aca75a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,6 +142,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -218,6 +219,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -238,6 +240,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -261,6 +265,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -307,7 +312,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/NEWS b/NEWS
index bd5b200..82e0e96 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
-Welcome to Gutenprint 5.2.7, a stable release of Gutenprint 5.2.  This
+Welcome to Gutenprint 5.2.8, a stable release of Gutenprint 5.2.  This
 release has bug fixes, support for some new printers, and a few new
-features over 5.2.5.  Please read these release notes carefully.
+features over 5.2.7.  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
-others.  Gutenprint currently supports over 1500 printer models.
+others.  Gutenprint currently supports over 1600 printer models.
 These drivers provide high quality printing for UNIX, Linux, and
 Macintosh OS X (10.3 and above) systems.  Gutenprint includes CUPS and
 Foomatic drivers, and an enhanced Print plug-in for GIMP that replaces
@@ -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.7
         * Changes from 5.2.6
         * Changes from 5.2.5
         * Changes from 5.2.4
@@ -251,6 +252,349 @@ device.  We have determined that the data is in fact written by the
 
 III) MAJOR CHANGES FROM PREVIOUS RELEASES
 
+* Changes from 5.2.7
+
+  1) The Canon driver has been significantly overhauled for this
+     release, and output (and in some cases functionality) may be
+     significantly different from previous releases.  We expect to
+     perform further work in future releases.  Specific changes
+     include:
+
+     * All known combinations of offered modes now work in CUPS.
+       Previously, certain combinations would fail to print, with
+       error messages about invalid combinations of printing options.
+
+     * The following Canon printer models were completely redefined or
+       had major changes carried out in the supported modes:
+
+	 Canon   BJC 3000    (EXPERIMENTAL)
+	 Canon   BJC S300    (EXPERIMENTAL)
+	 Canon   BJC S500    (EXPERIMENTAL)
+	 Canon   BJC S600    (EXPERIMENTAL)
+	 Canon   BJC S800    (EXPERIMENTAL)
+	 Canon PIXMA i80     (EXPERIMENTAL)
+	 Canon PIXMA i560    (EXPERIMENTAL)
+	 Canon PIXMA i850    (EXPERIMENTAL) *1
+	 Canon PIXMA i860    (EXPERIMENTAL) *1
+	 Canon PIXMA i865    (EXPERIMENTAL) *1
+	 Canon PIXMA iP2000  (EXPERIMENTAL)
+	 Canon PIXMA iP4100  (EXPERIMENTAL)
+	 Canon PIXMA iP5000  (EXPERIMENTAL)
+	 Canon PIXMA iP6210D (EXPERIMENTAL)
+	 Canon PIXMA iP6220D (EXPERIMENTAL)
+	 Canon PIXMA iP6310D (EXPERIMENTAL)
+	 Canon PIXMA MP600
+	 Canon PIXMA MP750
+	 Canon PIXMA MP760
+	 Canon PIXMA MP770
+	 Canon PIXMA MP780
+	 Canon PIXMA MP790
+	 Canon PIXMA MP970
+
+	 *1: for compatibility, the original printers are named with
+	  "old" appended. These old printers will be deprecated in a
+	  future release.
+
+     * Support for the following Canon printers was greatly improved, or
+       tested:
+
+	 Canon PIXMA MP700
+	 Canon PIXMA MP710
+	 Canon PIXMA MP730
+	 Canon PIXMA MP740
+	 Canon PIXMA MP950
+	 Canon PIXMA MP960
+	 Canon PIXMA MX340
+	 Canon PIXMA MX350
+	 Canon PIXMA iP4000
+	 Canon PIXMA MG5100
+
+     * The following PIXMA models have PIXUS aliases for reasons of
+       compatibility. In future, a complete compatibility is planned, for
+       which it will need to be determined whether all PIXMA models have
+       PIXUS counterparts, and vice versa.
+
+	 Canon PIXUS iP2700
+	 Canon PIXUS iP3100
+	 Canon PIXUS iP4100
+
+     * CD printing support for the following Canon printers was added:
+
+	 Canon PIXMA i560
+	 Canon PIXMA i860
+	 Canon PIXMA i865
+	 Canon PIXMA iP4600
+	 Canon PIXMA iP4700
+	 Canon PIXMA iP4800
+	 Canon PIXMA iP4900
+	 Canon PIXMA MP980
+	 Canon PIXMA MP990
+	 Canon PIXMA MG5200
+	 Canon PIXMA MG5300
+	 Canon PIXMA MG6100
+	 Canon PIXMA MG6200
+	 Canon PIXMA MG8100
+	 Canon PIXMA MG8200
+
+     * The following Canon printer models were either not added, or
+       removed, as they cannot currently be supported, even
+       experimentally, owing to an as-yet unknown command format or
+       other issues:
+
+	 Canon PIXMA 320i
+	 Canon PIXMA i250
+	 Canon PIXMA i320
+	 Canon PIXMA i350
+	 Canon PIXMA iP1000
+	 Canon PIXMA iP1200
+	 Canon PIXMA iP1300
+	 Canon PIXMA iP1500
+	 Canon PIXMA iP1600
+	 Canon PIXMA iP1700
+	 Canon PIXMA iP1800
+	 Canon PIXMA iP1900
+	 Canon PIXMA iP2200
+	 Canon PIXMA iP2500
+	 Canon PIXMA iP2600
+	 Canon PIXMA MP5
+	 Canon PIXMA MP10
+	 Canon PIXMA MP55
+	 Canon PIXMA MP110
+	 Canon PIXMA MP130
+	 Canon PIXMA PRO-1 *1
+	 Canon SELPHY CP600 *2
+	 Canon SELPHY CP720 *2
+	 Canon SELPHY CP780 *2
+	 Canon SELPHY CP800 *2
+	 Canon SELPHY ES1 *2
+	 Canon SELPHY ES2 *2
+	 Canon SELPHY ES3 *2
+	 Canon SELPHY ES20 *2
+	 Canon SELPHY ES30 *2
+	 Canon SELPHY ES40 *2
+
+	 *1: protocol is supported but inks used are not yet supported
+	 *2: requires special communication protocol
+
+     * The following printers do not currently offer a grayscale
+       printing mode.  If you wish to print grayscale, you should
+       select the Desaturated color correction method.
+
+         Canon BJC-2000
+	 Canon BJC-5500
+	 Canon BJC-6000
+	 Canon BJC-6200
+	 Canon BJC-6500
+	 Canon BJC-7000
+	 Canon BJC-7100
+	 Canon BJC-8200
+	 Canon BJC-8500
+	 Canon SELPHY DS700
+	 Canon SELPHY DS810
+	 Canon PIXMA mini220
+	 Canon PIXMA mini320
+	 Canon PIXMA iP6000D
+	 Canon PIXMA iP6100D
+	 Canon PIXMA iP6210D
+	 Canon PIXMA iP6600D
+	 Canon PIXMA Pro9000
+	 Canon PIXMA Pro9000mk2
+	 Canon PIXMA Pro9500
+	 Canon PIXMA Pro9500mk2
+	 Canon 900PD
+
+     * Some Canon BJC series printers using photo cartridge have
+       printing modes added that will select this cartridge (BJC 3000,
+       4300, 4550, S400).
+
+     * Canon Japan printers of the *i series (e.g., 50i) have been
+       matched with non-Japan i* series (e.g., i70) printers, and
+       support for inkjet Hagaki and plain Hagaki added to the non-Japan
+       models where equivalent Japan models exist.
+
+     * Printer modes for most printer models are now determined by the
+       media, based on information from the corresponding Windows
+       driver. If an incompatible mode is selected by the user, a
+       suitable mode is substituted, based on the other active
+       parameters and quality setting. Modes are also substituted
+       based on cartridge selection and duplex selection. Inktype is
+       then automatically adjusted.
+
+       Since the printer itself converts the data sent to the printer
+       into the actual inks used, the format of the data sent to the
+       printer is rather strict, and the relationship between this
+       data and the actual inks is often unknown.
+
+     * Added support for 8-bit inks to Canon backend, and modes using
+       them.
+
+     * Adjusted margins and page sizes of Canon printers.
+
+     * Added borderless functionality to most Canon printers (except S
+       series and BJC series). Borderless uses photo modes, and should
+       therefore be usable for all photo media. For plain media and
+       Hagaki or Envelope media, there is currently no mode substitution
+       to use photo colors only in place of the normal modes, and
+       therefore borderless may work incorrectly or not at all. It is
+       therefore recommended to use borderless only for photo media
+       until further development.
+
+  2) New printers supported in this release:
+
+     Note that support for all printers marked "EXPERIMENTAL"
+     (untested) or "PRELIMINARY" (minimally tested but untuned) is
+     subject to change without notice.  Printers not marked
+     "EXPERIMENTAL" generally will not change between releases, but
+     notice will be given and if possible back compatibility will be
+     provided.
+
+     - Canon inkjet printers:
+
+       Canon   BJC 4550    (EXPERIMENTAL)
+       Canon   BJC S330    (EXPERIMENTAL)
+       Canon   BJC S520    (EXPERIMENTAL)
+       Canon   BJC S530D   (EXPERIMENTAL)
+       Canon   BJC S630    (EXPERIMENTAL)
+       Canon   BJC S750    (EXPERIMENTAL)
+       Canon   BJC S820    (EXPERIMENTAL)
+       Canon   BJC S830D   (EXPERIMENTAL)
+       Canon   BJC S900    (EXPERIMENTAL)
+       Canon   BJC S9000   (EXPERIMENTAL)
+       Canon PIXMA mini220 (EXPERIMENTAL)
+       Canon PIXMA mini320 (EXPERIMENTAL)
+       Canon PIXMA mini360 (EXPERIMENTAL)
+       Canon PIXMA DS700   (EXPERIMENTAL)
+       Canon PIXMA DS810   (EXPERIMENTAL)
+       Canon PIXMA 50i     (EXPERIMENTAL)
+       Canon PIXMA 80i     (EXPERIMENTAL)
+       Canon PIXMA 450i    (EXPERIMENTAL)
+       Canon PIXMA 455i    (EXPERIMENTAL)
+       Canon PIXMA 470PD   (EXPERIMENTAL)
+       Canon PIXMA 475PD   (EXPERIMENTAL)
+       Canon PIXMA 550i    (EXPERIMENTAL)
+       Canon PIXMA 560i    (EXPERIMENTAL)
+       Canon PIXMA 850i    (EXPERIMENTAL)
+       Canon PIXMA 860i    (EXPERIMENTAL)
+       Canon PIXMA 865R    (EXPERIMENTAL)
+       Canon PIXMA 900PD   (EXPERIMENTAL)
+       Canon PIXMA 950i    (EXPERIMENTAL)
+       Canon PIXMA 960i    (EXPERIMENTAL)
+       Canon PIXMA 990i    (EXPERIMENTAL)
+       Canon PIXMA 6100i   (EXPERIMENTAL)
+       Canon PIXMA 6500i   (EXPERIMENTAL)
+       Canon PIXMA 9100i   (EXPERIMENTAL)
+       Canon PIXMA 9900i   (EXPERIMENTAL)
+       Canon PIXMA i70     (EXPERIMENTAL)
+       Canon PIXMA i450    (EXPERIMENTAL)
+       Canon PIXMA i450X   (EXPERIMENTAL)
+       Canon PIXMA i455    (EXPERIMENTAL)
+       Canon PIXMA i455X   (EXPERIMENTAL)
+       Canon PIXMA i470D   (EXPERIMENTAL)
+       Canon PIXMA i475D   (EXPERIMENTAL)
+       Canon PIXMA i550    (EXPERIMENTAL)
+       Canon PIXMA i550X   (EXPERIMENTAL)
+       Canon PIXMA i560X   (EXPERIMENTAL)
+       Canon PIXMA i900D   (EXPERIMENTAL)
+       Canon PIXMA i905D   (EXPERIMENTAL)
+       Canon PIXMA i950    (EXPERIMENTAL)
+       Canon PIXMA i960    (EXPERIMENTAL)
+       Canon PIXMA i965    (EXPERIMENTAL)
+       Canon PIXMA i990    (EXPERIMENTAL)
+       Canon PIXMA i6100   (EXPERIMENTAL)
+       Canon PIXMA i6500   (EXPERIMENTAL)
+       Canon PIXMA i9100   (EXPERIMENTAL)
+       Canon PIXMA i9900   (EXPERIMENTAL)
+       Canon PIXMA i9950   (EXPERIMENTAL)
+       Canon PIXMA iP90    (EXPERIMENTAL)
+       Canon PIXMA iP90v   (EXPERIMENTAL)
+       Canon PIXMA iP100   (EXPERIMENTAL)
+       Canon PIXMA iP3600  (EXPERIMENTAL)
+       Canon PIXMA iP3500  (EXPERIMENTAL)
+       Canon PIXMA iP3300  (EXPERIMENTAL)
+       Canon PIXMA iP4900  (EXPERIMENTAL)
+       Canon PIXMA iP6210D (EXPERIMENTAL)
+       Canon PIXMA iP6220D (EXPERIMENTAL)
+       Canon PIXMA iP6310D (EXPERIMENTAL)
+       Canon PIXMA iP6320D (EXPERIMENTAL)
+       Canon PIXMA iP7100  (EXPERIMENTAL)
+       Canon PIXMA iP7500  (EXPERIMENTAL)
+       Canon PIXMA iP8100  (EXPERIMENTAL)
+       Canon PIXMA iP8600  (EXPERIMENTAL)
+       Canon PIXMA iP9910  (EXPERIMENTAL)
+       Canon PIXMA MP140   (EXPERIMENTAL)
+       Canon PIXMA MP190   (EXPERIMENTAL)
+       Canon PIXMA MP210   (EXPERIMENTAL)
+       Canon PIXMA MP240   (EXPERIMENTAL)
+       Canon PIXMA MP260   (EXPERIMENTAL)
+       Canon PIXMA MP375R
+       Canon PIXMA MP470   (EXPERIMENTAL)
+       Canon PIXMA MP490   (EXPERIMENTAL)
+       Canon PIXMA MP530   (EXPERIMENTAL)
+       Canon PIXMA MP900   (EXPERIMENTAL)
+       Canon PIXMA MX320   (EXPERIMENTAL)
+       Canon PIXMA MX370   (EXPERIMENTAL)
+       Canon PIXMA MX430   (EXPERIMENTAL)
+       Canon PIXMA MX510   (EXPERIMENTAL)
+       Canon PIXMA MX710   (EXPERIMENTAL)
+       Canon PIXMA MX890   (EXPERIMENTAL)
+       Canon PIXMA MG2100  (EXPERIMENTAL)
+       Canon PIXMA MG3100  (EXPERIMENTAL)
+       Canon PIXMA MG4100  (EXPERIMENTAL)
+       Canon PIXMA MG5300  (EXPERIMENTAL)
+       Canon PIXMA MG6200  (EXPERIMENTAL)
+       Canon PIXMA MG8200  (EXPERIMENTAL)
+       Canon PIXMA E500    (EXPERIMENTAL)
+       Canon PIXMA E600    (EXPERIMENTAL)
+
+     - Epson inkjet printers:
+
+       EPSON ME Office 940FW
+       EPSON PX 204
+       EPSON PX 504A
+       EPSON Stylus CX3900
+       EPSON Stylus NX420
+       EPSON Stylus NX530
+       EPSON Stylus NX635
+       EPSON Stylus SX420
+       EPSON Stylus TX420
+       EPSON Stylus Office BX535WD
+       EPSON Stylus Office BX630FW
+       EPSON Stylus Office BX635FWD
+       EPSON Stylus Office TX620FWD
+       EPSON Stylus Photo RX650
+       EPSON Stylus SX535WD
+       EPSON WorkForce 545
+       EPSON WorkForce 630
+       EPSON WorkForce 645
+
+     - Epson wide carriage inkjet printers:
+
+       EPSON Stylus Pro 7900 (Partial -- no orange/green inks)
+       EPSON Stylus Pro 9900 (Partial -- no orange/green inks)
+
+       These printers function as 8 color photo printers using CMYK
+       inks, similar to the 7890/9890.  They have not been tuned.  At
+       present, we do not have a schedule for adding support for the
+       green and orange inks.
+
+  3) A problem whereby printing did not work at all on some Linux
+     distributions has been fixed (3299815 CUPS PPD broken on Linux).
+
+  4) A crash with the EPSON Stylus Photo R3000 has been fixed.
+
+  5) Printing on the Epson Stylus NX200, SX200, and SX205 is believed
+     to be corrected.
+
+  6) A build problem with libgutenprintui2 and testpattern on certain
+     platforms has been fixed.
+
+  7) Chinese (Mandarin), Galician, and Ukrainian translations have
+     been added.
+
+  8) (API) Added function stp_vars_copy_from() to override settings in
+     one settings object with those in another.
+
+
 * Changes from 5.2.6
 
   1) New printers supported in this release:
@@ -356,7 +700,7 @@ III) MAJOR CHANGES FROM PREVIOUS RELEASES
 
   2) Corrected color matching profile used for Mac OS X 10.5.x.
      sRGB will now be used instead of Generic RGB.  Users with work-
-     flows dependant on the previously used Generic RGB can select
+     flows dependent on the previously used Generic RGB can select
      this color profile in the print window by using ColorSync to
      choose the profile rather than using VendorMatching.
 
@@ -675,7 +1019,7 @@ III) MAJOR CHANGES FROM PREVIOUS RELEASES
    6) Make the QualityEnhancement option (available in the Epson
       driver for certain printers) function correctly.
 
-   7) Alow Epson printers using Claria inks to select quadtone or
+   7) Allow Epson printers using Claria inks to select quadtone or
       hextone output.
 
    9) Corrected escputil status output for Epson Artisan and TX/SX
@@ -696,7 +1040,7 @@ III) MAJOR CHANGES FROM PREVIOUS RELEASES
    1) New printers supported in this release:
 
       Canon PIXMA iX4000
-      Canon SELPHY CP-520
+      Canon SELPHY CP520
       EPSON Stylus Photo R2880
       EPSON Stylus DX4000
 
diff --git a/README b/README
index 36a09d8..ce4f43b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.2.7!  Please read these notes carefully.
+Welcome to Gutenprint 5.2.8!  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.7!  Please read these notes carefully.
 
 I) INTRODUCTION
 
-    This is Gutenprint version 5.2.7, a stable release of Gutenprint
+    This is Gutenprint version 5.2.8, 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
@@ -72,6 +72,10 @@ II) INSTALLATION
     administrative actions, we recommend that you not attempt to
     install this package from source.
 
+    If you are building Gutenprint from the CVS repository, you need
+    to take some additional steps.  Please read doc/README.maintaining
+    for instructions on how to build from CVS.
+
     Before beginning, please read the release notes carefully for any
     updates.
 
@@ -120,7 +124,7 @@ A) OVERVIEW
 	gimp-print-devel@lists.sourceforge.net
 
 	================================================================
-	  Release: gutenprint 5.2.7 generated on 02 Mar 2011
+	  Release: gutenprint 5.2.8 generated on 04 Jun 2012
 
 	  Features:
 	    Build CUPS:                                 yes, installing in /usr
@@ -140,10 +144,11 @@ A) OVERVIEW
 
 	  Installation summary:
 	    Installation prefix:                        /usr/local
+	    Exec prefix:                                ${prefix}
 	    Data directory:                             /usr/local/share/gutenprint
-	    Library directory:                          /usr/local/lib/gutenprint
+	    Library directory:                          ${exec_prefix}/lib64/gutenprint
 	    XML data directory:                         /usr/local/share/gutenprint/5.2/xml
-	    Module directory:                           /usr/local/lib/gutenprint/5.2/modules
+	    Module directory:                           ${exec_prefix}/lib64/gutenprint/5.2/modules
 	    Install sample images:                      yes
 
 	  General configuration:
@@ -156,7 +161,7 @@ A) OVERVIEW
 	    Generate debugging symbols:                 no
 	    Use modules:                                static
 	    Use readline libraries:                     yes, extra arguments: -lncurses
-	    uname -a output:                            Linux dsl092-065-009 2.6.27.45-0.1-default #1 SMP 2010-02-22 16:49:47 +0100 x86_64 x86_64 x86_64 GNU/Linux
+	    uname -a output:                            Linux dsl092-065-009 3.1.10-1.9-default #1 SMP Thu Apr 5 18:48:38 UTC 2012 (4a97ec8) x86_64 x86_64 x86_64 GNU/Linux
 	================================================================
 
     The CUPS, GIMP, Foomatic, and Ghostscript components require that
@@ -229,7 +234,7 @@ C) CUPS
     directory" (other ".h" files may also be missing, depending upon
     the missing packages):
 
-	make[3]: Entering directory `/opt/gutenprint/gutenprint-5.2.7/src/cups'
+	make[3]: Entering directory `/opt/gutenprint/gutenprint-5.2.8/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
@@ -242,11 +247,11 @@ C) CUPS
 	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.7/src/cups'
+	make[3]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8/src/cups'
 	make[2]: *** [all-recursive] Error 1
-	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.7/src'
+	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8/src'
 	make[1]: *** [all-recursive] Error 1
-	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.7'
+	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8'
 	make: *** [all] Error 2
 
     Installing the CUPS driver for Gutenprint 5.2 will not interfere
@@ -596,7 +601,7 @@ E) GIMP
     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.7/src/gimp2'
+	make[3]: Entering directory `/opt/gutenprint/gutenprint-5.2.8/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
@@ -609,11 +614,11 @@ E) GIMP
 	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.7/src/gimp2'
+	make[3]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8/src/gimp2'
 	make[2]: *** [all-recursive] Error 1
-	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.7/src'
+	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8/src'
 	make[1]: *** [all-recursive] Error 1
-	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.7'
+	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.8'
 	make: *** [all] Error 2
 
     Normally, the Gutenprint configure script detects which version,
@@ -683,8 +688,8 @@ A) PRINTER INSTALLATION
     driver, so you may find more than one PPD file for your printer.
     Gutenprint PPD files are described as
 
-    Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0
-    Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.0 Simplified
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.8
+    Epson Stylus Photo R300 - CUPS+Gutenprint v5.2.8 Simplified
     Epson Stylus Photo R300 Foomatic/gutenprint-ijs.5.2
     Epson Stylus Photo R300 Foomatic/gutenprint-ijs-simplified.5.2
 
@@ -724,7 +729,7 @@ A) PRINTER INSTALLATION
     identify printers using Gutenprint PPD files by the name of the
     PPD file, which will be something like:
 
-		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.2.2(en)
+		    EPSON Stylus Photo EX - CUPS+Gutenprint v5.2.8(en)
 
     Linux users please note: If you are using CUPS 1.1.11 or higher,
     and you have a USB-connected printer, you must have a printer
diff --git a/aclocal.m4 b/aclocal.m4
index 44552de..c12de3a 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,13 +13,14 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 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'.])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -47,7 +48,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -60,7 +64,6 @@ if test -n "$PKG_CONFIG"; then
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
-		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -69,21 +72,20 @@ fi[]dnl
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
@@ -136,6 +138,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
@@ -145,7 +148,7 @@ if test $pkg_failed = yes; then
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+	m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -153,25 +156,24 @@ $$1_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])[]dnl
+        ])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+	$3
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
diff --git a/configure b/configure
index 4a4b361..249d642 100755
--- a/configure
+++ b/configure
@@ -1,14 +1,14 @@
 #! /bin/sh
-# From configure.ac Revision: 1.224 .
+# From configure.ac Revision: 1.233 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for gutenprint 5.2.7.
+# Generated by GNU Autoconf 2.68 for gutenprint 5.2.8.
 #
 # 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, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -109,6 +109,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -191,6 +192,14 @@ test x\$exitcode = x0 || exit 1"
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
@@ -234,11 +243,18 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -337,7 +353,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -377,19 +393,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -546,161 +562,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 # Sed expression to map a string onto a valid variable name.
 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$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
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -719,8 +588,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.2.7'
-PACKAGE_STRING='gutenprint 5.2.7'
+PACKAGE_VERSION='5.2.8'
+PACKAGE_STRING='gutenprint 5.2.8'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -811,6 +680,8 @@ INSTALL_SAMPLES_FALSE
 INSTALL_SAMPLES_TRUE
 BUILD_GIMP2_AS_GUTENPRINT_FALSE
 BUILD_GIMP2_AS_GUTENPRINT_TRUE
+BUILD_DOC_FALSE
+BUILD_DOC_TRUE
 BUILD_GIMP2_FALSE
 BUILD_GIMP2_TRUE
 BUILD_LIBGUTENPRINTUI2_FALSE
@@ -868,6 +739,8 @@ GIMP2_LIBS
 GIMP2_CFLAGS
 GTK2_LIBS
 GTK2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 GIMPTOOL2_CHECK
 IJS_CONFIG
@@ -901,9 +774,11 @@ OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
 RANLIB
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
 LN_S
 NM
@@ -1020,6 +895,7 @@ with_pic
 enable_fast_install
 enable_dependency_tracking
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 enable_maintainer_mode
 with_cups
@@ -1049,6 +925,7 @@ enable_libgutenprintui2
 enable_samples
 enable_escputil
 enable_test
+with_doc
 enable_testpattern
 enable_user_install
 with_cups_nickname
@@ -1064,6 +941,8 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 GTK2_CFLAGS
 GTK2_LIBS
 GIMP2_CFLAGS
@@ -1132,8 +1011,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1178,7 +1058,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1204,7 +1084,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1408,7 +1288,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1424,7 +1304,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1454,8 +1334,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1463,7 +1343,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1473,7 +1353,7 @@ Try \`$0 --help' for more information."
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1481,13 +1361,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1510,7 +1390,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1524,8 +1404,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $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
+    $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
   fi
@@ -1540,9 +1420,9 @@ 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 .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1581,11 +1461,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1611,7 +1491,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.7 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.2.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1625,7 +1505,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1681,7 +1561,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.2.7:";;
+     short | recursive ) echo "Configuration of gutenprint 5.2.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1736,6 +1616,8 @@ Optional Packages:
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
   --with-cups=PREFIX      whether to build CUPS driver (default PREFIX=/usr)
                           [(automatic)]
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
@@ -1755,6 +1637,7 @@ Optional Packages:
                           name GIMP 2.x Print plugin gutenprint (requires GIMP
                           2.2; normally used with GIMP 2.4 or above)
                           [(automatic)]
+  --with-doc              build Gutenprint documentation [yes]
   --with-cups-nickname="nickname suffix"
                           Suffix to add to PPD NickName, default=" - CUPS+Gutenprint v"
   --with-archflags="..."  additional options for CFLAGS and LDFLAGS
@@ -1769,13 +1652,18 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
   GTK2_LIBS   linker flags for GTK2, overriding pkg-config
   GIMP2_CFLAGS
               C compiler flags for GIMP2, overriding pkg-config
   GIMP2_LIBS  linker flags for GIMP2, overriding pkg-config
-  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
-              the first program found out of: `bison -y', `byacc', `yacc'.
+  YACC        The `Yet Another Compiler Compiler' implementation to use.
+              Defaults to the first program found out of: `bison -y', `byacc',
+              `yacc'.
   YFLAGS      The list of arguments that will be passed by default to $YACC.
               This script will default YFLAGS to the empty string to avoid a
               default value of `-d' given by some make applications.
@@ -1846,10 +1734,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.2.7
-generated by GNU Autoconf 2.65
+gutenprint configure 5.2.8
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1910,7 +1798,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1956,7 +1844,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1970,7 +1858,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1988,7 +1876,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -2013,7 +1901,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2024,7 +1912,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -2066,7 +1954,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2079,7 +1967,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2134,7 +2022,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2146,10 +2034,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2185,7 +2073,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2208,17 +2096,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ----------------------------------------------------- ##
+( $as_echo "## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
-## ----------------------------------------------------- ##
-_ASBOX
+## ----------------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2227,7 +2113,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2240,7 +2126,7 @@ ac_fn_c_check_type ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2281,15 +2167,15 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 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.7, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by gutenprint $as_me 5.2.8, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2399,11 +2285,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2437,11 +2321,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2454,11 +2336,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2472,11 +2352,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2531,7 +2409,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2546,7 +2429,11 @@ do
     { $as_echo "$as_me:${as_lineno-$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"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2623,7 +2510,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2641,16 +2528,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_aux_dir=
 for ac_dir in scripts "$srcdir"/scripts; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in scripts \"$srcdir\"/scripts" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2667,12 +2560,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=7
+GUTENPRINT_MICRO_VERSION=8
 GUTENPRINT_EXTRA_VERSION=
-GUTENPRINT_CURRENT_INTERFACE=2
-GUTENPRINT_INTERFACE_AGE=8
+GUTENPRINT_CURRENT_INTERFACE=3
+GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.2.7
+GUTENPRINT_VERSION=5.2.8
 GUTENPRINTUI2_CURRENT_INTERFACE=1
 GUTENPRINTUI2_INTERFACE_AGE=0
 GUTENPRINTUI2_BINARY_AGE=0
@@ -2723,7 +2616,7 @@ am__api_version='1.11'
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2810,11 +2703,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2836,7 +2729,7 @@ 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".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2846,7 +2739,7 @@ then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2900,7 +2793,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2940,7 +2833,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2993,7 +2886,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$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 :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3044,7 +2937,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3084,7 +2977,7 @@ done
 $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 :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3092,7 +2985,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3126,7 +3019,7 @@ 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
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -3142,7 +3035,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.2.7'
+ VERSION='5.2.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3250,7 +3143,7 @@ do
 done
 rm -rf conftest.dir
 
-if test "${am_cv_prog_tar_ustar+set}" = set; then :
+if ${am_cv_prog_tar_ustar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
@@ -3278,7 +3171,7 @@ GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
 ac_config_headers="$ac_config_headers config.h"
 
 
-ALL_LINGUAS="cs da de el en_GB es fi fr hu it ja nb nl pl pt ru sk sl sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fi fr gl hu it ja nb nl pl pt ru sk sl sv uk zh_CN zh_TW"
 
 
 enable_dlopen=yes
@@ -3327,8 +3220,8 @@ esac
 
 
 
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4'
+macro_revision='1.3293'
 
 
 
@@ -3346,27 +3239,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $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 &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3384,14 +3277,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $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` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3399,7 +3292,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3415,6 +3308,75 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
+# Backslashify 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'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3487,7 +3449,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3527,7 +3489,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3580,7 +3542,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3620,7 +3582,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3679,7 +3641,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3723,7 +3685,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3777,8 +3739,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3892,9 +3854,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3936,8 +3897,8 @@ done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3994,9 +3955,9 @@ $as_echo "$ac_try_echo"; } >&5
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -4007,7 +3968,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4047,8 +4008,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4058,7 +4019,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4095,7 +4056,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4173,7 +4134,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4272,7 +4233,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4397,7 +4358,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4452,7 +4413,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -4479,7 +4440,7 @@ Xsed="$SED -e 1s/^X//"
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4528,7 +4489,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4542,7 +4503,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4594,7 +4555,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4609,7 +4570,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -4661,7 +4622,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -4740,7 +4701,7 @@ else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -4777,10 +4738,10 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -4807,7 +4768,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -4860,14 +4821,17 @@ 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"
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
   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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -4905,13 +4869,13 @@ fi
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  for ac_prog in dumpbin "link -dump"
 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:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -4960,6 +4924,15 @@ esac
   fi
 fi
 
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -4974,18 +4947,18 @@ test -z "$NM" && NM=nm
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_nm_interface+:} false; 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:4982: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4985: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4988: output\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5009,7 +4982,7 @@ fi
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -5042,6 +5015,11 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    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.
@@ -5106,8 +5084,8 @@ else
       # 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 &&
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -5149,8 +5127,8 @@ $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,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -5199,9 +5177,83 @@ esac
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -5215,6 +5267,11 @@ case $reload_flag in
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -5237,7 +5294,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -5277,7 +5334,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -5336,7 +5393,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_deplibs_check_method+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5378,16 +5435,18 @@ 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
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+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'
@@ -5417,6 +5476,10 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -5425,11 +5488,11 @@ hpux10.20* | hpux11*)
     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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? 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_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
@@ -5451,7 +5514,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5532,6 +5595,21 @@ esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 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
@@ -5547,12 +5625,166 @@ 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
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$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
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -5565,7 +5797,7 @@ do
   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"
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5585,14 +5817,18 @@ $as_echo "no" >&6; }
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$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
+  for ac_prog in ar
+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:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -5605,7 +5841,7 @@ do
   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"
+    ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5624,6 +5860,10 @@ else
 $as_echo "no" >&6; }
 fi
 
+
+  test -n "$ac_ct_AR" && break
+done
+
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -5635,18 +5875,74 @@ 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
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
 
 
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
 
 
 
@@ -5657,7 +5953,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -5697,7 +5993,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -5756,7 +6052,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5796,7 +6092,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5867,6 +6163,18 @@ if test -n "$RANLIB"; then
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
 
 
 
@@ -5913,7 +6221,7 @@ compiler=$CC
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5974,8 +6282,8 @@ esac
 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'"
+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=
@@ -6011,6 +6319,7 @@ for ac_symprfx in "" "_"; do
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -6036,8 +6345,8 @@ _LT_EOF
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$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
+    if { { eval echo "\"\$as_me\":${as_lineno-$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:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -6052,6 +6361,18 @@ _LT_EOF
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -6063,7 +6384,7 @@ _LT_EOF
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -6089,8 +6410,8 @@ static const void *lt_preloaded_setup() {
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -6100,8 +6421,8 @@ _LT_EOF
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -6138,6 +6459,20 @@ else
 $as_echo "ok" >&6; }
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
 
 
 
@@ -6157,6 +6492,40 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
 
 
 
@@ -6191,7 +6560,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6194 "configure"' > conftest.$ac_ext
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6285,7 +6654,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_cc_needs_belf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -6353,6 +6722,123 @@ esac
 
 need_locks="$enable_libtool_lock"
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$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
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
 
   case $host_os in
     rhapsody* | darwin*)
@@ -6361,7 +6847,7 @@ need_locks="$enable_libtool_lock"
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -6401,7 +6887,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -6453,7 +6939,7 @@ fi
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -6493,7 +6979,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -6545,7 +7031,7 @@ fi
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -6585,7 +7071,7 @@ if test -z "$ac_cv_prog_LIPO"; then
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -6637,7 +7123,7 @@ fi
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -6677,7 +7163,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -6729,7 +7215,7 @@ fi
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -6769,7 +7255,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -6844,7 +7330,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -6873,7 +7359,7 @@ fi
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -6903,6 +7389,38 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -6930,7 +7448,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -6950,7 +7468,7 @@ if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -6980,7 +7498,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6996,11 +7514,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -7039,7 +7557,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -7055,18 +7573,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -7078,7 +7596,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7195,8 +7713,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7210,7 +7727,7 @@ for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -7221,6 +7738,8 @@ done
 
 
 
+
+
 # Set options
 
 
@@ -7341,6 +7860,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -7362,7 +7882,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -7390,19 +7910,6 @@ _ACEOF
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -7415,23 +7922,6 @@ aix3*)
   ;;
 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
@@ -7460,7 +7950,7 @@ 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 "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -7470,7 +7960,7 @@ file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -7536,7 +8026,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -7669,11 +8159,16 @@ if test -n "$compiler"; then
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -7689,15 +8184,15 @@ 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:7692: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7696: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -7726,8 +8221,6 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$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,'
@@ -7775,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     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
@@ -7817,6 +8316,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -7858,7 +8364,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -7879,7 +8385,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -7891,25 +8403,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
+	*Sun\ F* | *Sun*Fortran*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_wl=''
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	*Sun\ C*)
+	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
+	  lt_prog_compiler_wl='-Wl,'
 	  ;;
 	esac
 	;;
@@ -7941,7 +8453,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -7998,13 +8510,17 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -8012,7 +8528,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -8028,15 +8544,15 @@ 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:8031: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8035: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -8065,13 +8581,18 @@ fi
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -8084,7 +8605,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 "$_lt_linker_boilerplate" | $SED '/^$/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
@@ -8114,7 +8635,7 @@ fi
 
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -8133,16 +8654,16 @@ 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:8136: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8140: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -8169,7 +8690,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -8188,16 +8709,16 @@ 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:8191: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8195: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $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 "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -8310,7 +8831,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   esac
 
   ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -8328,6 +8875,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [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 ...
@@ -8343,11 +8891,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, 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.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -8383,10 +8932,12 @@ _LT_EOF
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       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'
@@ -8404,6 +8955,11 @@ _LT_EOF
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -8419,7 +8975,7 @@ _LT_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* | tpf* | k*bsd*-gnu)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -8429,15 +8985,16 @@ _LT_EOF
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	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'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -8448,13 +9005,17 @@ _LT_EOF
 	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)
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -8470,17 +9031,17 @@ _LT_EOF
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # 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'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_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'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -8494,8 +9055,8 @@ _LT_EOF
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	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'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -8513,8 +9074,8 @@ _LT_EOF
 
 _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'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -8560,8 +9121,8 @@ _LT_EOF
 
     *)
       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'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -8601,8 +9162,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
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	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'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (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'
 	fi
@@ -8689,7 +9252,13 @@ _LT_EOF
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8702,25 +9271,32 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; 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
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_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 "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+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 "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${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='${wl}-R $libdir:/usr/lib:/lib'
@@ -8729,7 +9305,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8742,30 +9324,42 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; 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
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_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 "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
 	 hardcode_libdir_flag_spec='${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=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$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'
@@ -8797,20 +9391,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=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='$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'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# 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='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=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='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -8820,7 +9457,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -8828,7 +9469,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     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}"
@@ -8871,7 +9512,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -8879,7 +9520,7 @@ 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 $pic_flag ${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'
       fi
@@ -8894,8 +9535,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
@@ -8913,16 +9554,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${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'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -8934,7 +9575,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   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 "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
@@ -8962,26 +9642,39 @@ 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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; 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'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	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'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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'
@@ -9043,17 +9736,17 @@ rm -f core conftest.err conftest.$ac_objext \
       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'
+      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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	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'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -9063,13 +9756,13 @@ rm -f core conftest.err conftest.$ac_objext \
     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 "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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='$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_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-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; 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'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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='-rpath $libdir'
@@ -9082,9 +9775,9 @@ rm -f core conftest.err conftest.$ac_objext \
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared $pic_flag ${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'
+	  $CC -shared $pic_flag ${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"*)
@@ -9272,44 +9965,50 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$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 ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$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=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -9480,16 +10179,23 @@ if test "$GCC" = yes; then
     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
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # 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
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # 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=
@@ -9502,7 +10208,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;
@@ -9522,7 +10228,13 @@ 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`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -9610,7 +10322,7 @@ amigaos*)
   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'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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
   ;;
@@ -9641,8 +10353,9 @@ cygwin* | mingw* | pw32* | cegcc*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -9663,36 +10376,83 @@ cygwin* | mingw* | pw32* | cegcc*)
     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"
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     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
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        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
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # 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'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -9779,6 +10539,19 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  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=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  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.
@@ -9821,8 +10594,10 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
@@ -9880,7 +10655,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9889,12 +10664,17 @@ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9907,13 +10687,17 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -9922,7 +10706,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
   # 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;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -10225,6 +11009,11 @@ fi
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
@@ -10297,7 +11086,7 @@ else
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10331,7 +11120,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -10345,12 +11134,12 @@ fi
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10384,16 +11173,16 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10427,12 +11216,12 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10466,12 +11255,12 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10505,7 +11294,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -10546,7 +11335,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -10555,7 +11344,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10558 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10596,7 +11385,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10605,7 +11400,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -10642,7 +11441,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$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 :
+if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -10651,7 +11450,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10654 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10692,7 +11491,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10701,7 +11506,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -10911,6 +11720,7 @@ fi
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   MAINTAINER_MODE="true"
   BUILD_TEST="yes"
+  BUILD_DOC="yes"
 
 $as_echo "#define HAVE_MAINTAINER_MODE /**/" >>confdefs.h
 
@@ -10936,7 +11746,7 @@ _ACEOF
 set dummy cups-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
+if ${ac_cv_path_CUPS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CUPS_CONFIG in
@@ -10997,7 +11807,7 @@ $as_echo "yes (using specified prefix)" >&6; }
        else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-         as_fn_error "${withval}: no such directory for --with-cups" "$LINENO" 5
+         as_fn_error $? "${withval}: no such directory for --with-cups" "$LINENO" 5
        fi ;;
 
 	    esac
@@ -11067,7 +11877,7 @@ rm -f conf$$.file
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -11108,7 +11918,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -11190,7 +12000,7 @@ rm -f conf$$.file
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -11268,7 +12078,7 @@ rm -f conf$$.file
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -11387,7 +12197,7 @@ else
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -11421,10 +12231,10 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -11444,7 +12254,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
 
                                                 { $as_echo "$as_me:${as_lineno-$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 :
+if ${acl_cv_rpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11914,7 +12724,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -11948,7 +12758,7 @@ $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
   fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
 $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
@@ -12024,7 +12834,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 
         { $as_echo "$as_me:${as_lineno-$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 :
+if eval \${$gt_func_gnugettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12087,7 +12897,7 @@ $as_echo "$ac_res" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12555,7 +13365,7 @@ fi
 
           { $as_echo "$as_me:${as_lineno-$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 :
+if eval \${$gt_func_gnugettext_libintl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -12753,7 +13563,7 @@ $as_echo "${USE_NLS_OSX}" >&6; } ;;
 $as_echo "${USE_NLS_OSX}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-nls-macosx" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-nls-macosx" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12800,7 +13610,7 @@ $as_echo "${BUILD_CUPS_PPDS}" >&6; } ;;
 $as_echo "${BUILD_CUPS_PPDS}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-cups-ppds" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-cups-ppds" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12829,7 +13639,7 @@ $as_echo "${BUILD_CUPS_1_2}" >&6; } ;;
 $as_echo "${BUILD_CUPS_1_2}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-cups-1_2-enhancements" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-cups-1_2-enhancements" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12862,7 +13672,7 @@ $as_echo "${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
 $as_echo "${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-translated-cups-ppds" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-translated-cups-ppds" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12897,7 +13707,7 @@ $as_echo "${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
 $as_echo "${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-globalized-cups-ppds" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-globalized-cups-ppds" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12926,7 +13736,7 @@ $as_echo "yes" >&6; } ;;
 $as_echo "no" >&6; } ;;
     only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; { $as_echo "$as_me:${as_lineno-$LINENO}: result: only" >&5
 $as_echo "only" >&6; } ;;
-    *) as_fn_error "${enableval}: not a valid option ('yes', 'no', or 'only')" "$LINENO" 5 ;;
+    *) as_fn_error $? "${enableval}: not a valid option ('yes', 'no', or 'only')" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12955,7 +13765,7 @@ $as_echo "${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
 $as_echo "${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-cups-ppds-at-top-level" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-cups-ppds-at-top-level" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -12984,7 +13794,7 @@ $as_echo "${USE_LEVEL3_PS}" >&6; } ;;
 $as_echo "${USE_LEVEL3_PS}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-cups-level3-ppds" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-cups-level3-ppds" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13014,7 +13824,7 @@ $as_echo "${STATIC_GENPPD}" >&6; } ;;
 $as_echo "${STATIC_GENPPD}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-static-genppd" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-static-genppd" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13034,7 +13844,7 @@ fi
 set dummy foomatic-configure; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FOOMATIC_CONFIGURE+set}" = set; then :
+if ${ac_cv_path_FOOMATIC_CONFIGURE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_CONFIGURE in
@@ -13089,7 +13899,7 @@ $as_echo "${BUILD_FOOMATIC}" >&6; } ;;
 $as_echo "${BUILD_FOOMATIC}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${withval} for --with-foomatic" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${withval} for --with-foomatic" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13110,7 +13920,7 @@ fi
 set dummy foomatic-ppdfile; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FOOMATIC_PPDFILE+set}" = set; then :
+if ${ac_cv_path_FOOMATIC_PPDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_PPDFILE in
@@ -13165,7 +13975,7 @@ $as_echo "${BUILD_FOOMATIC_3}" >&6; } ;;
 $as_echo "${BUILD_FOOMATIC_3}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${withval} for --with-foomatic3" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${withval} for --with-foomatic3" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13185,7 +13995,7 @@ fi
 set dummy ijs-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_IJS_CONFIG+set}" = set; then :
+if ${ac_cv_path_IJS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $IJS_CONFIG in
@@ -13241,7 +14051,7 @@ $as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;;
 $as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${withval} for --with-ghostscript" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${withval} for --with-ghostscript" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13275,7 +14085,7 @@ $as_echo "ltdl" >&6; } ;;
 $as_echo "dlopen" >&6; } ;;
     static) WITH_MODULES="static";  { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
 $as_echo "static" >&6; } ;;
-    *) as_fn_error "${withval}: not a valid module loader" "$LINENO" 5 ;;
+    *) as_fn_error $? "${withval}: not a valid module loader" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13304,7 +14114,7 @@ if test x$enable_static = xyes; then
   elif test $WITH_MODULES = static; then
     :
   else
-    as_fn_error "--disable-static must be used with --with-modules" "$LINENO" 5
+    as_fn_error $? "--disable-static must be used with --with-modules" "$LINENO" 5
   fi
 fi
 
@@ -13321,7 +14131,7 @@ $as_echo "${ENABLE_DEBUG}" >&6; } ;;
 $as_echo "${ENABLE_DEBUG}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13350,7 +14160,7 @@ $as_echo "${ENABLE_PROFILE}" >&6; } ;;
 $as_echo "${ENABLE_PROFILE}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-profile" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-profile" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13407,7 +14217,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GIMPTOOL2_CHECK+set}" = set; then :
+if ${ac_cv_path_GIMPTOOL2_CHECK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GIMPTOOL2_CHECK in
@@ -13468,13 +14278,17 @@ fi
 
 
 
+
+
+
+
 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
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -13517,7 +14331,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -13580,7 +14394,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
 pkg_failed=no
@@ -13623,6 +14436,8 @@ fi
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13637,11 +14452,11 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                HAVE_GTK2=no
+	HAVE_GTK2=no
 	           BUILD_LIBGUTENPRINTUI2=no
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	HAVE_GTK2=no
 	           BUILD_LIBGUTENPRINTUI2=no
 else
@@ -13696,6 +14511,8 @@ fi
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -13710,10 +14527,10 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIMP2_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                BUILD_GIMP2=no
+	BUILD_GIMP2=no
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	BUILD_GIMP2=no
 else
 	GIMP2_CFLAGS=$pkg_cv_GIMP2_CFLAGS
@@ -13738,7 +14555,7 @@ $as_echo "${BUILD_GIMP2}" >&6; } ;;
 $as_echo "${BUILD_GIMP2}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${withval} for --with-gimp2" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${withval} for --with-gimp2" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13768,7 +14585,7 @@ $as_echo "${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
 $as_echo "${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${withval} for --with-gimp2-as-gutenprint" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${withval} for --with-gimp2-as-gutenprint" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13797,7 +14614,7 @@ $as_echo "${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
 $as_echo "${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-libgutenprintui2" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-libgutenprintui2" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13826,7 +14643,7 @@ $as_echo "${INSTALL_SAMPLES}" >&6; } ;;
 $as_echo "${INSTALL_SAMPLES}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-samples" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-samples" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13855,7 +14672,7 @@ $as_echo "${BUILD_ESCPUTIL}" >&6; } ;;
 $as_echo "${BUILD_ESCPUTIL}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-escputil" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-escputil" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13884,7 +14701,7 @@ $as_echo "${BUILD_TEST}" >&6; } ;;
 $as_echo "${BUILD_TEST}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-test" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-test" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13900,6 +14717,36 @@ if test -z "${BUILD_TEST}" ; then
 fi
 
 
+# create custom command-line --with option
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Gutenprint documentation" >&5
+$as_echo_n "checking whether to build Gutenprint documentation... " >&6; }
+
+# Check whether --with-doc was given.
+if test "${with_doc+set}" = set; then :
+  withval=$with_doc; case "${withval}" in
+
+                yes) BUILD_DOC="yes" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_DOC}" >&5
+$as_echo "${BUILD_DOC}" >&6; } ;;
+                no) BUILD_DOC="no" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_DOC}" >&5
+$as_echo "${BUILD_DOC}" >&6; } ;;
+                *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   as_fn_error $? "bad value ${withval} for --with-doc" "$LINENO" 5 ;;
+
+	    esac
+else
+  if test -z "${BUILD_DOC}" ; then
+               BUILD_DOC="yes"
+             fi
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${BUILD_DOC}" >&5
+$as_echo "${BUILD_DOC}" >&6; } ;
+fi
+
+if test -z "${BUILD_DOC}" ; then
+  BUILD_DOC="yes"
+fi
+
+
 if test "$BUILD_TEST" = "yes" ; then
   BUILD_TESTPATTERN="yes"
 else
@@ -13919,7 +14766,7 @@ $as_echo "${BUILD_TESTPATTERN}" >&6; } ;;
 $as_echo "${BUILD_TESTPATTERN}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-testpattern" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-testpattern" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -13948,7 +14795,7 @@ $as_echo "${USER_INSTALL}" >&6; } ;;
 $as_echo "${USER_INSTALL}" >&6; } ;;
                 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
 $as_echo "unknown" >&6; }
-                   as_fn_error "bad value ${enableval} for --enable-user-install" "$LINENO" 5 ;;
+                   as_fn_error $? "bad value ${enableval} for --enable-user-install" "$LINENO" 5 ;;
 
 	    esac
 else
@@ -14001,7 +14848,7 @@ fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -14076,7 +14923,7 @@ $as_echo "$LIBICONV" >&6; }
 
         { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_cposix_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14110,7 +14957,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_cposix_strerror" = xyes; then :
   LIBS="$LIBS -lcposix"
 fi
 
@@ -14122,7 +14969,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -14168,7 +15015,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14208,7 +15055,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -14261,7 +15108,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14301,7 +15148,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14360,7 +15207,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14404,7 +15251,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -14458,8 +15305,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -14488,7 +15335,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14525,7 +15372,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -14603,7 +15450,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -14702,7 +15549,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -14835,7 +15682,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14875,7 +15722,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -14928,7 +15775,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -14968,7 +15815,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -15027,7 +15874,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -15071,7 +15918,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -15125,8 +15972,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -15155,7 +16002,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15192,7 +16039,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -15270,7 +16117,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -15369,7 +16216,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -15504,7 +16351,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
 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 :
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15639,7 +16486,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LEX+set}" = set; then :
+if ${ac_cv_prog_LEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
@@ -15709,7 +16556,7 @@ $as_echo "$ac_try_echo"; } >&5
   test $ac_status = 0; }
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_lex_root+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15718,7 +16565,7 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+  as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
@@ -15728,7 +16575,7 @@ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 if test -z "${LEXLIB+set}"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
 $as_echo_n "checking lex library... " >&6; }
-if test "${ac_cv_lib_lex+set}" = set; then :
+if ${ac_cv_lib_lex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15758,7 +16605,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
@@ -15769,7 +16616,8 @@ ac_save_LIBS=$LIBS
 LIBS="$LEXLIB $ac_save_LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#define YYTEXT_POINTER 1
+
+  #define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
@@ -15799,7 +16647,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then :
+if ${ac_cv_prog_YACC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
@@ -15840,7 +16688,7 @@ test -n "$YACC" || YACC="yacc"
 set dummy test; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TEST+set}" = set; then :
+if ${ac_cv_path_TEST+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $TEST in
@@ -15880,7 +16728,7 @@ fi
 set dummy true; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TRUE+set}" = set; then :
+if ${ac_cv_path_TRUE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $TRUE in
@@ -15920,7 +16768,7 @@ fi
 set dummy find; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FIND+set}" = set; then :
+if ${ac_cv_path_FIND+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FIND in
@@ -15960,7 +16808,7 @@ fi
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -16000,7 +16848,7 @@ fi
 set dummy glib-mkenums; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then :
+if ${ac_cv_path_GLIB_MKENUMS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GLIB_MKENUMS in
@@ -16040,7 +16888,7 @@ fi
 set dummy convert; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CONVERT+set}" = set; then :
+if ${ac_cv_path_CONVERT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CONVERT in
@@ -16086,7 +16934,7 @@ fi
 set dummy texi2html; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TEXI2HTML+set}" = set; then :
+if ${ac_cv_path_TEXI2HTML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $TEXI2HTML in
@@ -16132,7 +16980,7 @@ fi
 set dummy dvips; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DVIPS+set}" = set; then :
+if ${ac_cv_path_DVIPS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DVIPS in
@@ -16178,7 +17026,7 @@ fi
 set dummy db2pdf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DB2PDF+set}" = set; then :
+if ${ac_cv_path_DB2PDF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DB2PDF in
@@ -16226,7 +17074,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DVIPDF+set}" = set; then :
+if ${ac_cv_path_DVIPDF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DVIPDF in
@@ -16275,7 +17123,7 @@ fi
 set dummy db2ps; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DB2PS+set}" = set; then :
+if ${ac_cv_path_DB2PS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DB2PS in
@@ -16321,7 +17169,7 @@ fi
 set dummy db2html; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DB2HTML+set}" = set; then :
+if ${ac_cv_path_DB2HTML+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DB2HTML in
@@ -16367,7 +17215,7 @@ fi
 set dummy doxygen; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DOXYGEN+set}" = set; then :
+if ${ac_cv_path_DOXYGEN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DOXYGEN in
@@ -16415,7 +17263,7 @@ if test x${BUILD_CUPS} = xyes; then
 set dummy dialog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DIALOG+set}" = set; then :
+if ${ac_cv_path_DIALOG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DIALOG in
@@ -16460,7 +17308,7 @@ if test x${BUILD_FOOMATIC} = xyes ; then
 set dummy foomatic-kitload; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FOOMATIC_KITLOAD+set}" = set; then :
+if ${ac_cv_path_FOOMATIC_KITLOAD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_KITLOAD in
@@ -16504,7 +17352,7 @@ fi
 
 if test x${BUILD_GHOSTSCRIPT} = xyes ; then
   if test -z "$IJS_CONFIG" ; then
-    as_fn_error "Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" "$LINENO" 5;
+    as_fn_error $? "Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" "$LINENO" 5;
   fi
   IJS_CFLAGS=`$IJS_CONFIG --cflags`
   IJS_LIBS=`$IJS_CONFIG --libs`
@@ -16865,7 +17713,7 @@ if test "$USE_READLINE" = yes ; then
     unset ac_cv_lib_readline_readline
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16899,7 +17747,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -16914,7 +17762,7 @@ fi
       unset ac_cv_lib_readline_readline
       { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16948,7 +17796,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -16963,7 +17811,7 @@ fi
 	unset ac_cv_lib_readline_readline
 	{ $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16997,7 +17845,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -17012,7 +17860,7 @@ fi
 	  unset ac_cv_lib_readline_readline
 	  { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17046,7 +17894,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -17066,7 +17914,7 @@ fi
     unset ac_cv_lib_readline_readline
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17100,7 +17948,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -17123,7 +17971,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_ltdl_lt_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17157,14 +18005,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_ltdl_lt_dlopen" = xyes; then :
   LTDL_LIBS="-lltdl"
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17198,14 +18046,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   DLOPEN_LIBS="-ldl"
 fi
 
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17239,7 +18087,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
              gutenprint_libdeps="${gutenprint_libdeps} -lm"
 fi
@@ -17247,7 +18095,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17281,14 +18129,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   CUPS_LIBS="${CUPS_LIBS} -lm"
 fi
 
 if test x${BUILD_CUPS} = xyes ; then
   { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_z_gzgets+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17322,7 +18170,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_z_gzgets" = xyes; then :
   HAVE_LIBZ=true
 else
   HAVE_LIBZ=false
@@ -17338,7 +18186,7 @@ $as_echo "#define HAVE_LIBZ /**/" >>confdefs.h
 set dummy cups-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
+if ${ac_cv_path_CUPS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CUPS_CONFIG in
@@ -17382,7 +18230,7 @@ fi
     LIBS="$LIBS ${CUPS_LIBS}"
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_socket_socket+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17416,7 +18264,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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$ac_cv_lib_socket_socket" = xyes; then :
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lsocket"
       LIBS="$LIBS -lsocket"
@@ -17425,7 +18273,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17459,7 +18307,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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$ac_cv_lib_nsl_gethostbyaddr" = xyes; then :
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lnsl"
       LIBS="$LIBS -lnsl"
@@ -17468,7 +18316,7 @@ fi
 
 
             ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then :
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
 
       SSL="no"
 
@@ -17479,7 +18327,7 @@ if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then :
       do
 	  { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_ssl_SSL_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17513,7 +18361,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
   CUPS_LIBS="${CUPS_LIBS} -lssl $libcrypto"
 	       SSL="yes"
 fi
@@ -17529,7 +18377,7 @@ fi
 
         { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_cups_cupsPrintFiles+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17563,16 +18411,16 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_cups_cupsPrintFiles" = xyes; then :
   CUPS_LIBS="${CUPS_LIBS} -lcups"
 else
   LIBS="$LIBS -lcups"
-      as_fn_error "Cannot find CUPS libraries (libcups)" "$LINENO" 5
+      as_fn_error $? "Cannot find CUPS libraries (libcups)" "$LINENO" 5
 fi
 
     { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_lib_cupsimage_cupsRasterOpen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17606,10 +18454,10 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$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 :
+if test "x$ac_cv_lib_cupsimage_cupsRasterOpen" = xyes; then :
   CUPS_LIBS="${CUPS_LIBS} -lcupsimage"
 else
-  as_fn_error "Cannot find CUPS libraries (libcupsimage)" "$LINENO" 5
+  as_fn_error $? "Cannot find CUPS libraries (libcupsimage)" "$LINENO" 5
 fi
 
         LIBS="$SAVELIBS"
@@ -17632,7 +18480,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17745,7 +18593,7 @@ fi
 for ac_header in getopt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = x""yes; then :
+if test "x$ac_cv_header_getopt_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_H 1
 _ACEOF
@@ -17755,7 +18603,7 @@ fi
 done
 
 ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
-if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
   HAVE_READLINE_READLINE_H=true
 else
   HAVE_READLINE_READLINE_H=false
@@ -17773,7 +18621,7 @@ fi
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -17785,7 +18633,7 @@ done
 for ac_header in fcntl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = x""yes; then :
+if test "x$ac_cv_header_fcntl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FCNTL_H 1
 _ACEOF
@@ -17797,7 +18645,7 @@ done
 for ac_header in limits.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-if test "x$ac_cv_header_limits_h" = x""yes; then :
+if test "x$ac_cv_header_limits_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIMITS_H 1
 _ACEOF
@@ -17809,7 +18657,7 @@ done
 for ac_header in locale.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -17821,7 +18669,7 @@ done
 for ac_header in ltdl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
-if test "x$ac_cv_header_ltdl_h" = x""yes; then :
+if test "x$ac_cv_header_ltdl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LTDL_H 1
 _ACEOF
@@ -17834,8 +18682,7 @@ for ac_header in stdarg.h stdlib.h string.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17848,8 +18695,7 @@ for ac_header in sys/time.h sys/types.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -17861,7 +18707,7 @@ done
 for ac_header in time.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_time_h" = x""yes; then :
+if test "x$ac_cv_header_time_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_TIME_H 1
 _ACEOF
@@ -17873,7 +18719,7 @@ done
 for ac_header in unistd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = x""yes; then :
+if test "x$ac_cv_header_unistd_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNISTD_H 1
 _ACEOF
@@ -17885,7 +18731,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17965,7 +18811,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -18006,7 +18852,7 @@ _ACEOF
 esac
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
@@ -18017,7 +18863,7 @@ _ACEOF
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -18029,7 +18875,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18065,8 +18911,7 @@ for ac_func in nanosleep poll usleep
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18077,7 +18922,7 @@ done
 for ac_func in getopt_long
 do :
   ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
-if test "x$ac_cv_func_getopt_long" = x""yes; then :
+if test "x$ac_cv_func_getopt_long" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_LONG 1
 _ACEOF
@@ -18088,7 +18933,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$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 :
+if ${ac_cv_search_finite+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -18122,11 +18967,11 @@ for ac_lib in '' m; do
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_finite+set}" = set; then :
+  if ${ac_cv_search_finite+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_finite+set}" = set; then :
+if ${ac_cv_search_finite+:} false; then :
 
 else
   ac_cv_search_finite=no
@@ -18293,6 +19138,15 @@ else
 fi
 
 
+ if test x${BUILD_DOC} = xyes; then
+  BUILD_DOC_TRUE=
+  BUILD_DOC_FALSE='#'
+else
+  BUILD_DOC_TRUE='#'
+  BUILD_DOC_FALSE=
+fi
+
+
  if test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes; then
   BUILD_GIMP2_AS_GUTENPRINT_TRUE=
   BUILD_GIMP2_AS_GUTENPRINT_FALSE='#'
@@ -18494,7 +19348,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="01 May 2011"
+RELEASE_DATE="07 Jun 2012"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -18710,10 +19564,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -18729,6 +19594,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 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$//'
@@ -18752,111 +19618,115 @@ else
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then
-  as_fn_error "conditional \"USE_NLS\" was never defined.
+  as_fn_error $? "conditional \"USE_NLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_FOOMATIC_TRUE}" && test -z "${BUILD_FOOMATIC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_FOOMATIC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_FOOMATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_FOOMATIC_3_TRUE}" && test -z "${BUILD_FOOMATIC_3_FALSE}"; then
-  as_fn_error "conditional \"BUILD_FOOMATIC_3\" was never defined.
+  as_fn_error $? "conditional \"BUILD_FOOMATIC_3\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_GHOSTSCRIPT_TRUE}" && test -z "${BUILD_GHOSTSCRIPT_FALSE}"; then
-  as_fn_error "conditional \"BUILD_GHOSTSCRIPT\" was never defined.
+  as_fn_error $? "conditional \"BUILD_GHOSTSCRIPT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_CUPS_TRUE}" && test -z "${BUILD_CUPS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_CUPS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_CUPS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_CUPS_1_2_TRUE}" && test -z "${BUILD_CUPS_1_2_FALSE}"; then
-  as_fn_error "conditional \"BUILD_CUPS_1_2\" was never defined.
+  as_fn_error $? "conditional \"BUILD_CUPS_1_2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_CUPS_PPDS_TRUE}" && test -z "${BUILD_CUPS_PPDS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_CUPS_PPDS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CUPS_PPDS_AT_TOP_LEVEL_TRUE}" && test -z "${CUPS_PPDS_AT_TOP_LEVEL_FALSE}"; then
-  as_fn_error "conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
+  as_fn_error $? "conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_TRANSLATED_CUPS_PPDS_TRUE}" && test -z "${BUILD_TRANSLATED_CUPS_PPDS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_GLOBALIZED_CUPS_PPDS_TRUE}" && test -z "${BUILD_GLOBALIZED_CUPS_PPDS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_TRUE}" && test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_FALSE}"; then
-  as_fn_error "conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
+  as_fn_error $? "conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_LEVEL3_PS_TRUE}" && test -z "${USE_LEVEL3_PS_FALSE}"; then
-  as_fn_error "conditional \"USE_LEVEL3_PS\" was never defined.
+  as_fn_error $? "conditional \"USE_LEVEL3_PS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_ESCPUTIL_TRUE}" && test -z "${BUILD_ESCPUTIL_FALSE}"; then
-  as_fn_error "conditional \"BUILD_ESCPUTIL\" was never defined.
+  as_fn_error $? "conditional \"BUILD_ESCPUTIL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_TEST_TRUE}" && test -z "${BUILD_TEST_FALSE}"; then
-  as_fn_error "conditional \"BUILD_TEST\" was never defined.
+  as_fn_error $? "conditional \"BUILD_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_TESTPATTERN_TRUE}" && test -z "${BUILD_TESTPATTERN_FALSE}"; then
-  as_fn_error "conditional \"BUILD_TESTPATTERN\" was never defined.
+  as_fn_error $? "conditional \"BUILD_TESTPATTERN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_LIBGUTENPRINTUI2_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI2_FALSE}"; then
-  as_fn_error "conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
+  as_fn_error $? "conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_GIMP2_TRUE}" && test -z "${BUILD_GIMP2_FALSE}"; then
-  as_fn_error "conditional \"BUILD_GIMP2\" was never defined.
+  as_fn_error $? "conditional \"BUILD_GIMP2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILD_DOC_TRUE}" && test -z "${BUILD_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_GIMP2_AS_GUTENPRINT_TRUE}" && test -z "${BUILD_GIMP2_AS_GUTENPRINT_FALSE}"; then
-  as_fn_error "conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+  as_fn_error $? "conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_SAMPLES_TRUE}" && test -z "${INSTALL_SAMPLES_FALSE}"; then
-  as_fn_error "conditional \"INSTALL_SAMPLES\" was never defined.
+  as_fn_error $? "conditional \"INSTALL_SAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_USER_GUIDE_TRUE}" && test -z "${INSTALL_USER_GUIDE_FALSE}"; then
-  as_fn_error "conditional \"INSTALL_USER_GUIDE\" was never defined.
+  as_fn_error $? "conditional \"INSTALL_USER_GUIDE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_MODULES_TRUE}" && test -z "${BUILD_MODULES_FALSE}"; then
-  as_fn_error "conditional \"BUILD_MODULES\" was never defined.
+  as_fn_error $? "conditional \"BUILD_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_GENPPD_STATIC_TRUE}" && test -z "${BUILD_GENPPD_STATIC_FALSE}"; then
-  as_fn_error "conditional \"BUILD_GENPPD_STATIC\" was never defined.
+  as_fn_error $? "conditional \"BUILD_GENPPD_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
@@ -18864,7 +19734,7 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
 LTALLOCA=`echo "$ALLOCA" | sed 's/\.o/.lo/g'`
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -18965,6 +19835,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -19010,19 +19881,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -19218,7 +20089,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -19271,8 +20142,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.7, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by gutenprint $as_me 5.2.8, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -19337,11 +20208,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gutenprint config.status 5.2.7
-configured by $0, generated by GNU Autoconf 2.65,
+gutenprint config.status 5.2.8
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -19359,11 +20230,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -19385,6 +20261,7 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -19397,7 +20274,7 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -19406,7 +20283,7 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -19460,131 +20337,153 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 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"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -19597,8 +20496,13 @@ reload_flag \
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -19608,14 +20512,14 @@ 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 \
+nm_file_list_spec \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -19631,7 +20535,6 @@ 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 \
@@ -19639,12 +20542,13 @@ variables_saved_for_relink \
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19666,14 +20570,15 @@ module_cmds \
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19681,12 +20586,6 @@ sys_lib_dlsearch_path_spec; do
     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'
@@ -19775,7 +20674,7 @@ do
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -19798,9 +20697,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -19808,12 +20708,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -19830,12 +20731,12 @@ if test "x$ac_cr" = x; then
 fi
 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'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -19844,18 +20745,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   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
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19863,7 +20764,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -19911,7 +20812,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -19943,21 +20844,29 @@ 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_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -19969,7 +20878,7 @@ fi # test -n "$CONFIG_FILES"
 # 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 ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -19981,11 +20890,11 @@ _ACEOF
 # 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
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -20070,7 +20979,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -20083,7 +20992,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -20102,7 +21011,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -20111,7 +21020,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -20137,8 +21046,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -20274,23 +21183,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 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"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $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;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -20299,21 +21209,21 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$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" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -20470,10 +21380,12 @@ $as_echo X"$file" |
 
 # `$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.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -20521,6 +21433,12 @@ pic_mode=$pic_mode
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -20570,9 +21488,11 @@ 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
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -20580,13 +21500,30 @@ 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".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -20595,6 +21532,9 @@ RANLIB=$lt_RANLIB
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -20613,14 +21553,14 @@ 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
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -20628,6 +21568,9 @@ MAGIC_CMD=$MAGIC_CMD
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -20684,6 +21627,9 @@ library_names_spec=$lt_library_names_spec
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -20723,6 +21669,10 @@ striplib=$lt_striplib
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -20735,12 +21685,12 @@ 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
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -20827,9 +21777,6 @@ 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
 
@@ -20845,6 +21792,9 @@ include_expsyms=$lt_include_expsyms
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -20877,212 +21827,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
   # 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" ||
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+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}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -21218,7 +22125,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -21239,7 +22146,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
@@ -21307,6 +22214,7 @@ echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
 echo
 echo "  Installation summary:"
 echo "    Installation prefix:                        $prefix"
+echo "    Exec prefix:                                $exec_prefix"
 echo "    Data directory:                             $PACKAGE_DATA_DIR"
 echo "    Library directory:                          $PACKAGE_LIB_DIR"
 echo "    XML data directory:                         $PKGXMLDATADIR"
diff --git a/configure.ac b/configure.ac
index dc1c51f..0dc3241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.224 2011/05/02 01:20:49 rlk Exp $
+dnl $Id: configure.ac,v 1.233 2012/06/05 01:51:22 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],     [7])
+pushdef([GUTENPRINT_MICRO_VERSION],     [8])
 pushdef([GUTENPRINT_EXTRA_VERSION],     [])
-pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
-pushdef([GUTENPRINT_INTERFACE_AGE],     [8])
+pushdef([GUTENPRINT_CURRENT_INTERFACE], [3])
+pushdef([GUTENPRINT_INTERFACE_AGE],     [0])
 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.224 $)
+AC_REVISION($Revision: 1.233 $)
 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 fi fr hu it ja nb nl pl pt ru sk sl sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fi fr gl hu it ja nb nl pl pt ru sk sl sv uk zh_CN zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
 dnl Set up libtool scripts.
@@ -161,6 +161,7 @@ AM_MAINTAINER_MODE
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   MAINTAINER_MODE="true"
   BUILD_TEST="yes"
+  BUILD_DOC="yes"
   AC_DEFINE(HAVE_MAINTAINER_MODE,, [Define if maintainer-mode is to be used.])
 fi
 
@@ -453,6 +454,11 @@ STP_ARG_ENABLE([test],
                [BUILD_TEST],
                [yes])
 
+STP_ARG_WITH([doc],
+	     [build Gutenprint documentation],
+	     [BUILD_DOC],
+	     [yes])
+
 if test "$BUILD_TEST" = "yes" ; then
   BUILD_TESTPATTERN="yes"
 else
@@ -814,6 +820,8 @@ AM_CONDITIONAL(BUILD_LIBGUTENPRINTUI2, test x${BUILD_LIBGUTENPRINTUI2} = xyes)
 
 AM_CONDITIONAL(BUILD_GIMP2, test x${BUILD_GIMP2} = xyes)
 
+AM_CONDITIONAL(BUILD_DOC, test x${BUILD_DOC} = xyes)
+
 AM_CONDITIONAL(BUILD_GIMP2_AS_GUTENPRINT, test x${BUILD_GIMP2_AS_GUTENPRINT} = xyes)
 
 AM_CONDITIONAL(INSTALL_SAMPLES, test x${INSTALL_SAMPLES} = xyes)
@@ -1074,6 +1082,7 @@ echo "    Build testpattern generator:                $BUILD_TESTPATTERN"
 echo
 echo "  Installation summary:"
 echo "    Installation prefix:                        $prefix"
+echo "    Exec prefix:                                $exec_prefix"
 echo "    Data directory:                             $PACKAGE_DATA_DIR"
 echo "    Library directory:                          $PACKAGE_LIB_DIR"
 echo "    XML data directory:                         $PKGXMLDATADIR"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1449665..62bf76e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.49 2006/07/30 23:24:38 rleigh Exp $
+## $Id: Makefile.am,v 1.50 2012/05/26 19:09:01 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -31,10 +31,14 @@ docdir = $(datadir)/$(PACKAGE)/doc
 ## Rules
 
 if MAINTAINER_MODE
+if BUILD_DOC
 all-local: gutenprint-stamp gutenprintui2-stamp
 else
 all-local:
 endif
+else
+all-local:
+endif
 
 # Rerun doxygen whenever autogen is run
 gutenprintui2: gutenprintui2-stamp
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 655d3e2..f96234c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -129,6 +129,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -205,6 +206,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -225,6 +227,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -248,6 +252,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -294,7 +299,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -693,7 +697,8 @@ $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	cd $(top_builddir)/src/gutenprintui2; \
 	$(MAKE)
 
-@MAINTAINER_MODE_TRUE@all-local: gutenprint-stamp gutenprintui2-stamp
+@BUILD_DOC_TRUE@@MAINTAINER_MODE_TRUE@all-local: gutenprint-stamp gutenprintui2-stamp
+@BUILD_DOC_FALSE@@MAINTAINER_MODE_TRUE@all-local:
 @MAINTAINER_MODE_FALSE@all-local:
 
 # Rerun doxygen whenever autogen is run
diff --git a/doc/README.maintaining b/doc/README.maintaining
index 8cfae28..9ea5e54 100644
--- a/doc/README.maintaining
+++ b/doc/README.maintaining
@@ -49,7 +49,7 @@ something that you would like covering, please let me know!
 
  -- Roger Leigh <rleigh@debian.org>
 
- $Id: README.maintaining,v 1.27 2008/07/29 01:52:09 rlk Exp $
+ $Id: README.maintaining,v 1.28 2011/06/12 23:03:20 rlk Exp $
 
 
 1. Setting up the autotools
@@ -76,7 +76,8 @@ vii.  flex/lex (for building the GIMP plugin and the test pattern generator)
 viii. bison/yacc (for building the GIMP plugin and the test pattern generator)
 ix.   doxygen (for building documentation)
 x.    DocBook processors (db2html, db2pdf) (for building documentation)
-xi.   DocBook-toys (for building documentation
+xi.   DocBook-toys (called docbook-utils on some systems) (for building
+      documentation)
 
 These packages are in addition to the packages normally required to
 build Gutenprint, as described in the README at top level.
diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
index 61f9a2c..766f38f 100644
--- a/doc/developer/Makefile.am
+++ b/doc/developer/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.22 2008/02/27 12:28:06 rlk Exp $
+## $Id: Makefile.am,v 1.23 2012/05/26 19:09:01 rlk Exp $
 ## Copyright (C) 2001 Andy Stewart and Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -50,10 +50,14 @@ MAINT_MODE = false
 endif
 
 if MAINTAINER_MODE
+if BUILD_DOC
 ALL_LOCAL_TARGETS = docs
+endif
 else
+if BUILD_DOC
 ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
 endif
+endif
 
 all-local: $(ALL_LOCAL_TARGETS)
 
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index aee4916..4b4e5a4 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -88,6 +88,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -164,6 +165,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -184,6 +186,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -207,6 +211,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -253,7 +258,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -288,8 +292,8 @@ STANDARD_TARGETS = html
 DISTHOOKDIRS = $(HTMLDIR)
 @MAINTAINER_MODE_FALSE@MAINT_MODE = false
 @MAINTAINER_MODE_TRUE@MAINT_MODE = true
-@MAINTAINER_MODE_FALSE@ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
-@MAINTAINER_MODE_TRUE@ALL_LOCAL_TARGETS = docs
+@BUILD_DOC_TRUE@@MAINTAINER_MODE_FALSE@ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
+@BUILD_DOC_TRUE@@MAINTAINER_MODE_TRUE@ALL_LOCAL_TARGETS = docs
 CLEAN_MANUALS = \
 	$(RM) -f gutenprint.pdf gutenprint.ps;	\
 	$(RM) -rf *html-stamp $(HTMLDIR)
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index 6c965d3..93d1e11 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
diff --git a/doc/gutenprint-users-manual.odt b/doc/gutenprint-users-manual.odt
index 6a949f2..3dbbc70 100644
--- a/doc/gutenprint-users-manual.odt
+++ b/doc/gutenprint-users-manual.odt
diff --git a/doc/gutenprint-users-manual.pdf b/doc/gutenprint-users-manual.pdf
index 0382c3f..e86ec7c 100644
--- a/doc/gutenprint-users-manual.pdf
+++ b/doc/gutenprint-users-manual.pdf
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index a856dbc..f15ca59 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1' standalone='yes' ?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
 <tagfile>
   <compound kind="file">
     <name>array.h</name>
@@ -124,6 +124,13 @@
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_fold_8bit</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>a4aa21720b86de29d9834cb3ee782491a</anchor>
+      <arglist>(const unsigned char *line, int single_length, unsigned char *outbuf)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_split</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
       <anchor>a8509200fc0bff8d1f5928f04bf1edd2b</anchor>
@@ -3890,6 +3897,13 @@
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
+      <type>void</type>
+      <name>stp_copy_vars_from</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gadb632ed2afb82e30c6f1583a69d4a8ce</anchor>
+      <arglist>(stp_vars_t *to, const stp_vars_t *from)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -7712,6 +7726,13 @@
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
+      <type>void</type>
+      <name>stp_copy_vars_from</name>
+      <anchorfile>group__vars.html</anchorfile>
+      <anchor>gadb632ed2afb82e30c6f1583a69d4a8ce</anchor>
+      <arglist>(stp_vars_t *to, const stp_vars_t *from)</arglist>
+    </member>
+    <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
@@ -9818,4 +9839,40 @@
       <arglist></arglist>
     </member>
   </compound>
+  <compound kind="dir">
+    <name>include/gutenprint/</name>
+    <path>/home/rlk/sandbox/print-5.1/include/gutenprint/</path>
+    <filename>dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html</filename>
+    <file>array.h</file>
+    <file>bit-ops.h</file>
+    <file>channel.h</file>
+    <file>color.h</file>
+    <file>curve-cache.h</file>
+    <file>curve.h</file>
+    <file>dither.h</file>
+    <file>gutenprint-intl-internal.h</file>
+    <file>gutenprint-intl.h</file>
+    <file>gutenprint-module.h</file>
+    <file>gutenprint-version.h</file>
+    <file>gutenprint.h</file>
+    <file>image.h</file>
+    <file>list.h</file>
+    <file>module.h</file>
+    <file>mxml.h</file>
+    <file>paper.h</file>
+    <file>path.h</file>
+    <file>printers.h</file>
+    <file>sequence.h</file>
+    <file>string-list.h</file>
+    <file>util.h</file>
+    <file>vars.h</file>
+    <file>weave.h</file>
+    <file>xml.h</file>
+  </compound>
+  <compound kind="dir">
+    <name>include/</name>
+    <path>/home/rlk/sandbox/print-5.1/include/</path>
+    <filename>dir_d44c64559bbebec7f509842c48db8b23.html</filename>
+    <dir>include/gutenprint/</dir>
+  </compound>
 </tagfile>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index b990c42..9d1444b 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Data Structures</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,50 +42,55 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Data Structures</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here are the data structures with brief descriptions:</div><table>
-  <tr><td class="indexkey"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__color.html">stp_color</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td><td class="indexvalue">Point (x,y) for piecewise curve </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td><td class="indexvalue">Double_bound (range) parameter </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__family.html">stp_family</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__image.html">stp_image</a></td><td class="indexvalue">The image type is an abstract data type for interfacing with the image creation program </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td><td class="indexvalue">Int_bound (range) parameter </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__module.html">stp_module</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__module__version.html">stp_module_version</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td><td class="indexvalue">The papersize data type </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td><td class="indexvalue">String parameter </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td><td class="indexvalue">Parameter description </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__pass__t.html">stp_pass_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td><td class="indexvalue">Raw parameter </td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__shade.html">stp_shade</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
+<div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
+<table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structdither__matrix__impl.html" target="_self">dither_matrix_impl</a></td><td class="desc"></td></tr>
+<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__cached__curve__t.html" target="_self">stp_cached_curve_t</a></td><td class="desc"></td></tr>
+<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__color.html" target="_self">stp_color</a></td><td class="desc"></td></tr>
+<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__colorfuncs__t.html" target="_self">stp_colorfuncs_t</a></td><td class="desc"></td></tr>
+<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__curve__point__t.html" target="_self">stp_curve_point_t</a></td><td class="desc">Point (x,y) for piecewise curve</td></tr>
+<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__dither__matrix__generic.html" target="_self">stp_dither_matrix_generic</a></td><td class="desc"></td></tr>
+<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__dither__matrix__normal.html" target="_self">stp_dither_matrix_normal</a></td><td class="desc"></td></tr>
+<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__dither__matrix__short.html" target="_self">stp_dither_matrix_short</a></td><td class="desc"></td></tr>
+<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__dotsize.html" target="_self">stp_dotsize</a></td><td class="desc"></td></tr>
+<tr id="row_9_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__double__bound__t.html" target="_self">stp_double_bound_t</a></td><td class="desc">Double_bound (range) parameter</td></tr>
+<tr id="row_10_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__family.html" target="_self">stp_family</a></td><td class="desc"></td></tr>
+<tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__image.html" target="_self">stp_image</a></td><td class="desc">The image type is an abstract data type for interfacing with the image creation program</td></tr>
+<tr id="row_12_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__int__bound__t.html" target="_self">stp_int_bound_t</a></td><td class="desc">Int_bound (range) parameter</td></tr>
+<tr id="row_13_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__lineactive__t.html" target="_self">stp_lineactive_t</a></td><td class="desc"></td></tr>
+<tr id="row_14_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__linebounds__t.html" target="_self">stp_linebounds_t</a></td><td class="desc"></td></tr>
+<tr id="row_15_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__linebufs__t.html" target="_self">stp_linebufs_t</a></td><td class="desc"></td></tr>
+<tr id="row_16_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__linecount__t.html" target="_self">stp_linecount_t</a></td><td class="desc"></td></tr>
+<tr id="row_17_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__lineoff__t.html" target="_self">stp_lineoff_t</a></td><td class="desc"></td></tr>
+<tr id="row_18_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__module.html" target="_self">stp_module</a></td><td class="desc"></td></tr>
+<tr id="row_19_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__module__version.html" target="_self">stp_module_version</a></td><td class="desc"></td></tr>
+<tr id="row_20_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__mxml__attr__s.html" target="_self">stp_mxml_attr_s</a></td><td class="desc"></td></tr>
+<tr id="row_21_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__mxml__node__s.html" target="_self">stp_mxml_node_s</a></td><td class="desc"></td></tr>
+<tr id="row_22_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__mxml__text__s.html" target="_self">stp_mxml_text_s</a></td><td class="desc"></td></tr>
+<tr id="row_23_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__mxml__value__s.html" target="_self">stp_mxml_value_s</a></td><td class="desc"></td></tr>
+<tr id="row_24_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="unionstp__mxml__value__u.html" target="_self">stp_mxml_value_u</a></td><td class="desc"></td></tr>
+<tr id="row_25_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__papersize__t.html" target="_self">stp_papersize_t</a></td><td class="desc">The papersize data type</td></tr>
+<tr id="row_26_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__param__string__t.html" target="_self">stp_param_string_t</a></td><td class="desc">String parameter</td></tr>
+<tr id="row_27_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__parameter__t.html" target="_self">stp_parameter_t</a></td><td class="desc">Parameter description</td></tr>
+<tr id="row_28_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__pass__t.html" target="_self">stp_pass_t</a></td><td class="desc"></td></tr>
+<tr id="row_29_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__printfuncs__t.html" target="_self">stp_printfuncs_t</a></td><td class="desc"></td></tr>
+<tr id="row_30_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__raw__t.html" target="_self">stp_raw_t</a></td><td class="desc">Raw parameter</td></tr>
+<tr id="row_31_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__shade.html" target="_self">stp_shade</a></td><td class="desc"></td></tr>
+<tr id="row_32_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstp__weave__t.html" target="_self">stp_weave_t</a></td><td class="desc"></td></tr>
 </table>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 38eac56..c438e85 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/array.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,54 +41,62 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/array.h File Reference</div>  </div>
-</div>
+<div class="title">array.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Array functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_array&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga26a474575a39c1c36ad520b95aa813b0"><td class="memItemLeft" align="right" valign="top">typedef struct stp_array&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
+<tr class="memdesc:ga26a474575a39c1c36ad520b95aa813b0"><td class="mdescLeft">&#160;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#gad0b50228ca40df79196197f9c21f4b56"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#gae6fb91b246ef5abd388927cb9674503e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#gafe61db801ab3b0326646178e536dd161"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#gae0d44ee80048189d244b16f231c54b80"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#gad6b95b2efd500007b098594826f4467f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e"></a><br/></td></tr>
+<tr class="memitem:gaa3d385d3e2f248b1c1ac88d5f103e9a2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr class="memdesc:gaa3d385d3e2f248b1c1ac88d5f103e9a2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a><br/></td></tr>
+<tr class="memitem:gaafb2573df35220ef9be3f6ba4b8c871b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gaafb2573df35220ef9be3f6ba4b8c871b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b"></a><br/></td></tr>
+<tr class="memitem:gaaa9bf798890e01b4bbce8cda45615021"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
+<tr class="memdesc:gaaa9bf798890e01b4bbce8cda45615021"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021"></a><br/></td></tr>
+<tr class="memitem:gad0b50228ca40df79196197f9c21f4b56"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gad0b50228ca40df79196197f9c21f4b56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#gad0b50228ca40df79196197f9c21f4b56"></a><br/></td></tr>
+<tr class="memitem:gae6fb91b246ef5abd388927cb9674503e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr class="memdesc:gae6fb91b246ef5abd388927cb9674503e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#gae6fb91b246ef5abd388927cb9674503e"></a><br/></td></tr>
+<tr class="memitem:gafe61db801ab3b0326646178e536dd161"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr class="memdesc:gafe61db801ab3b0326646178e536dd161"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#gafe61db801ab3b0326646178e536dd161"></a><br/></td></tr>
+<tr class="memitem:gaea0493f5bec9c5c185679adfde3edc9a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr class="memdesc:gaea0493f5bec9c5c185679adfde3edc9a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a"></a><br/></td></tr>
+<tr class="memitem:gae0d44ee80048189d244b16f231c54b80"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr class="memdesc:gae0d44ee80048189d244b16f231c54b80"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#gae0d44ee80048189d244b16f231c54b80"></a><br/></td></tr>
+<tr class="memitem:gad6b95b2efd500007b098594826f4467f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr class="memdesc:gad6b95b2efd500007b098594826f4467f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#gad6b95b2efd500007b098594826f4467f"></a><br/></td></tr>
+<tr class="memitem:ga9078af984a5e1ec80a6068bdb51c9a6d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr class="memdesc:ga9078af984a5e1ec80a6068bdb51c9a6d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d"></a><br/></td></tr>
+<tr class="memitem:gae05ba5cfe8c03e2435348d6c5488d87e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gae05ba5cfe8c03e2435348d6c5488d87e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Array functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bc_s.png b/doc/gutenprint/html/bc_s.png
index e401862..25e3beb 100644
--- a/doc/gutenprint/html/bc_s.png
+++ b/doc/gutenprint/html/bc_s.png
diff --git a/doc/gutenprint/html/bdwn.png b/doc/gutenprint/html/bdwn.png
new file mode 100644
index 0000000..940a0b9
--- /dev/null
+++ b/doc/gutenprint/html/bdwn.png
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 8bcdc66..b7ba897 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/bit-ops.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,49 +41,55 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/bit-ops.h File Reference</div>  </div>
-</div>
+<div class="title">bit-ops.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Bit operations.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#a1a36a9f23f967528df8fffbd71b5e96c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a0ee5e547d025f7113f275dbb4614230c">stp_fold_3bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#a0ee5e547d025f7113f275dbb4614230c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#afe47834318158a214ca693f1433996f1">stp_fold_3bit_323</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#afe47834318158a214ca693f1433996f1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a62ac3ec2651afff5fbe6c63544a13c66">stp_fold_4bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#a62ac3ec2651afff5fbe6c63544a13c66"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a8509200fc0bff8d1f5928f04bf1edd2b">stp_split</a> (int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#a8509200fc0bff8d1f5928f04bf1edd2b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a260a00a6551c9e27e56ea1fab9444d80">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated -- use stp_split.  <a href="#a260a00a6551c9e27e56ea1fab9444d80"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6d93a70fcc820df08fcf8d380b9743f5">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">&#160;</td><td class="mdescRight">Deprecated -- use stp_split.  <a href="#a6d93a70fcc820df08fcf8d380b9743f5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6512fc112307407fa2f30468b80ef69d">stp_unpack</a> (int height, int bits, int n, const unsigned char *in, unsigned char **outs)</td></tr>
-<tr><td class="mdescLeft">&#160;</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="#a6512fc112307407fa2f30468b80ef69d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#ae04e96586931b37257f4547eca77b116">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#ae04e96586931b37257f4547eca77b116"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#ac5bb5a178b5c6275e7e7c2f6b5064342">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">&#160;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#ac5bb5a178b5c6275e7e7c2f6b5064342"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a958196e6b7349e883a450e52cae83d93">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">&#160;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#a958196e6b7349e883a450e52cae83d93"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a8ddfbe4f60566d4111b4c4d88a956d1b">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">&#160;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#a8ddfbe4f60566d4111b4c4d88a956d1b"></a><br/></td></tr>
+<tr class="memitem:a1a36a9f23f967528df8fffbd71b5e96c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
+<tr class="memdesc:a1a36a9f23f967528df8fffbd71b5e96c"><td class="mdescLeft">&#160;</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="#a1a36a9f23f967528df8fffbd71b5e96c"></a><br/></td></tr>
+<tr class="memitem:a0ee5e547d025f7113f275dbb4614230c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a0ee5e547d025f7113f275dbb4614230c">stp_fold_3bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
+<tr class="memdesc:a0ee5e547d025f7113f275dbb4614230c"><td class="mdescLeft">&#160;</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="#a0ee5e547d025f7113f275dbb4614230c"></a><br/></td></tr>
+<tr class="memitem:afe47834318158a214ca693f1433996f1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#afe47834318158a214ca693f1433996f1">stp_fold_3bit_323</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
+<tr class="memdesc:afe47834318158a214ca693f1433996f1"><td class="mdescLeft">&#160;</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="#afe47834318158a214ca693f1433996f1"></a><br/></td></tr>
+<tr class="memitem:a62ac3ec2651afff5fbe6c63544a13c66"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a62ac3ec2651afff5fbe6c63544a13c66">stp_fold_4bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
+<tr class="memdesc:a62ac3ec2651afff5fbe6c63544a13c66"><td class="mdescLeft">&#160;</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="#a62ac3ec2651afff5fbe6c63544a13c66"></a><br/></td></tr>
+<tr class="memitem:a4aa21720b86de29d9834cb3ee782491a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a4aa21720b86de29d9834cb3ee782491a">stp_fold_8bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
+<tr class="memdesc:a4aa21720b86de29d9834cb3ee782491a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Interleave a buffer consisting of eight bit strings of length single_length into one string of packed eight-bit ints.  <a href="#a4aa21720b86de29d9834cb3ee782491a"></a><br/></td></tr>
+<tr class="memitem:a8509200fc0bff8d1f5928f04bf1edd2b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a8509200fc0bff8d1f5928f04bf1edd2b">stp_split</a> (int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)</td></tr>
+<tr class="memdesc:a8509200fc0bff8d1f5928f04bf1edd2b"><td class="mdescLeft">&#160;</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="#a8509200fc0bff8d1f5928f04bf1edd2b"></a><br/></td></tr>
+<tr class="memitem:a260a00a6551c9e27e56ea1fab9444d80"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a260a00a6551c9e27e56ea1fab9444d80">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
+<tr class="memdesc:a260a00a6551c9e27e56ea1fab9444d80"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_split.  <a href="#a260a00a6551c9e27e56ea1fab9444d80"></a><br/></td></tr>
+<tr class="memitem:a6d93a70fcc820df08fcf8d380b9743f5"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6d93a70fcc820df08fcf8d380b9743f5">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 class="memdesc:a6d93a70fcc820df08fcf8d380b9743f5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_split.  <a href="#a6d93a70fcc820df08fcf8d380b9743f5"></a><br/></td></tr>
+<tr class="memitem:a6512fc112307407fa2f30468b80ef69d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6512fc112307407fa2f30468b80ef69d">stp_unpack</a> (int height, int bits, int n, const unsigned char *in, unsigned char **outs)</td></tr>
+<tr class="memdesc:a6512fc112307407fa2f30468b80ef69d"><td class="mdescLeft">&#160;</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="#a6512fc112307407fa2f30468b80ef69d"></a><br/></td></tr>
+<tr class="memitem:ae04e96586931b37257f4547eca77b116"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#ae04e96586931b37257f4547eca77b116">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
+<tr class="memdesc:ae04e96586931b37257f4547eca77b116"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_unpack.  <a href="#ae04e96586931b37257f4547eca77b116"></a><br/></td></tr>
+<tr class="memitem:ac5bb5a178b5c6275e7e7c2f6b5064342"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#ac5bb5a178b5c6275e7e7c2f6b5064342">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 class="memdesc:ac5bb5a178b5c6275e7e7c2f6b5064342"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_unpack.  <a href="#ac5bb5a178b5c6275e7e7c2f6b5064342"></a><br/></td></tr>
+<tr class="memitem:a958196e6b7349e883a450e52cae83d93"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a958196e6b7349e883a450e52cae83d93">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 class="memdesc:a958196e6b7349e883a450e52cae83d93"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_unpack.  <a href="#a958196e6b7349e883a450e52cae83d93"></a><br/></td></tr>
+<tr class="memitem:a8ddfbe4f60566d4111b4c4d88a956d1b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a8ddfbe4f60566d4111b4c4d88a956d1b">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 class="memdesc:a8ddfbe4f60566d4111b4c4d88a956d1b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Deprecated &ndash; use stp_unpack.  <a href="#a8ddfbe4f60566d4111b4c4d88a956d1b"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Bit operations. </p>
 </div><hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a1a36a9f23f967528df8fffbd71b5e96c"></a><!-- doxytag: member="bit&#45;ops.h::stp_fold" ref="a1a36a9f23f967528df8fffbd71b5e96c" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<a class="anchor" id="a1a36a9f23f967528df8fffbd71b5e96c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -105,11 +117,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">line</td><td>the input bit string </td></tr>
     <tr><td class="paramname">single_length</td><td>the length (in bytes) of the input </td></tr>
@@ -120,7 +131,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a0ee5e547d025f7113f275dbb4614230c"></a><!-- doxytag: member="bit&#45;ops.h::stp_fold_3bit" ref="a0ee5e547d025f7113f275dbb4614230c" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<a class="anchor" id="a0ee5e547d025f7113f275dbb4614230c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -148,11 +159,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">line</td><td>the input bit string </td></tr>
     <tr><td class="paramname">single_length</td><td>the length (in bytes) of the input </td></tr>
@@ -163,7 +173,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="afe47834318158a214ca693f1433996f1"></a><!-- doxytag: member="bit&#45;ops.h::stp_fold_3bit_323" ref="afe47834318158a214ca693f1433996f1" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<a class="anchor" id="afe47834318158a214ca693f1433996f1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -191,11 +201,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">line</td><td>the input bit string </td></tr>
     <tr><td class="paramname">single_length</td><td>the length (in bytes) of the input </td></tr>
@@ -206,7 +215,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a62ac3ec2651afff5fbe6c63544a13c66"></a><!-- doxytag: member="bit&#45;ops.h::stp_fold_4bit" ref="a62ac3ec2651afff5fbe6c63544a13c66" args="(const unsigned char *line, int single_length, unsigned char *outbuf)" -->
+<a class="anchor" id="a62ac3ec2651afff5fbe6c63544a13c66"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -234,11 +243,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">line</td><td>the input bit string </td></tr>
     <tr><td class="paramname">single_length</td><td>the length (in bytes) of the input </td></tr>
@@ -249,7 +257,49 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a8509200fc0bff8d1f5928f04bf1edd2b"></a><!-- doxytag: member="bit&#45;ops.h::stp_split" ref="a8509200fc0bff8d1f5928f04bf1edd2b" args="(int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)" -->
+<a class="anchor" id="a4aa21720b86de29d9834cb3ee782491a"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_fold_8bit </td>
+          <td>(</td>
+          <td class="paramtype">const unsigned char *&#160;</td>
+          <td class="paramname"><em>line</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&#160;</td>
+          <td class="paramname"><em>single_length</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char *&#160;</td>
+          <td class="paramname"><em>outbuf</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Interleave a buffer consisting of eight bit strings of length single_length into one string of packed eight-bit ints. </p>
+<dl class="params"><dt>Parameters:</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">line</td><td>the input bit string </td></tr>
+    <tr><td class="paramname">single_length</td><td>the length (in bytes) of the input </td></tr>
+    <tr><td class="paramname">outbuf</td><td>the output. </td></tr>
+  </table>
+  </dd>
+</dl>
+
+</div>
+</div>
+<a class="anchor" id="a8509200fc0bff8d1f5928f04bf1edd2b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -295,12 +345,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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>
 <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><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">height</td><td>the number of integers in the input divided by 8 </td></tr>
     <tr><td class="paramname">bits</td><td>the bit depth (1 or 2) </td></tr>
@@ -314,7 +363,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a260a00a6551c9e27e56ea1fab9444d80"></a><!-- doxytag: member="bit&#45;ops.h::stp_split_2" ref="a260a00a6551c9e27e56ea1fab9444d80" args="(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)" -->
+<a class="anchor" id="a260a00a6551c9e27e56ea1fab9444d80"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -354,14 +403,13 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_split. </p>
+<p>Deprecated &ndash; use stp_split. </p>
 
 </div>
 </div>
-<a class="anchor" id="a6d93a70fcc820df08fcf8d380b9743f5"></a><!-- doxytag: member="bit&#45;ops.h::stp_split_4" ref="a6d93a70fcc820df08fcf8d380b9743f5" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" -->
+<a class="anchor" id="a6d93a70fcc820df08fcf8d380b9743f5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -413,14 +461,13 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_split. </p>
+<p>Deprecated &ndash; use stp_split. </p>
 
 </div>
 </div>
-<a class="anchor" id="a6512fc112307407fa2f30468b80ef69d"></a><!-- doxytag: member="bit&#45;ops.h::stp_unpack" ref="a6512fc112307407fa2f30468b80ef69d" args="(int height, int bits, int n, const unsigned char *in, unsigned char **outs)" -->
+<a class="anchor" id="a6512fc112307407fa2f30468b80ef69d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -460,12 +507,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</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>
 <p>The input is round robined into the outputs. Each output is 1/n as long as the input.</p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">height</td><td>the number of integers in the input divided by 8 </td></tr>
     <tr><td class="paramname">bits</td><td>the bit depth (1 or 2) </td></tr>
@@ -478,7 +524,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a8ddfbe4f60566d4111b4c4d88a956d1b"></a><!-- doxytag: member="bit&#45;ops.h::stp_unpack_16" ref="a8ddfbe4f60566d4111b4c4d88a956d1b" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)" -->
+<a class="anchor" id="a8ddfbe4f60566d4111b4c4d88a956d1b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -602,14 +648,13 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_unpack. </p>
+<p>Deprecated &ndash; use stp_unpack. </p>
 
 </div>
 </div>
-<a class="anchor" id="ae04e96586931b37257f4547eca77b116"></a><!-- doxytag: member="bit&#45;ops.h::stp_unpack_2" ref="ae04e96586931b37257f4547eca77b116" args="(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)" -->
+<a class="anchor" id="ae04e96586931b37257f4547eca77b116"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -649,14 +694,13 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_unpack. </p>
+<p>Deprecated &ndash; use stp_unpack. </p>
 
 </div>
 </div>
-<a class="anchor" id="ac5bb5a178b5c6275e7e7c2f6b5064342"></a><!-- doxytag: member="bit&#45;ops.h::stp_unpack_4" ref="ac5bb5a178b5c6275e7e7c2f6b5064342" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" -->
+<a class="anchor" id="ac5bb5a178b5c6275e7e7c2f6b5064342"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -708,14 +752,13 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_unpack. </p>
+<p>Deprecated &ndash; use stp_unpack. </p>
 
 </div>
 </div>
-<a class="anchor" id="a958196e6b7349e883a450e52cae83d93"></a><!-- doxytag: member="bit&#45;ops.h::stp_unpack_8" ref="a958196e6b7349e883a450e52cae83d93" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)" -->
+<a class="anchor" id="a958196e6b7349e883a450e52cae83d93"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -791,16 +834,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
-<p>Deprecated -- use stp_unpack. </p>
+<p>Deprecated &ndash; use stp_unpack. </p>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index d9b66fb..1d0e4cd 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/channel.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,49 +41,53 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/channel.h File Reference</div>  </div>
-</div>
+<div class="title">channel.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Channel functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a90026b1db4586b08df148db41a676b50">stp_channel_reset</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ab4b4591b1709146874c0218bc0591255">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#af03151796a167ec708b5412a31ddced5">stp_channel_add</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a748f1fc90c60e70016998953b1adcde2">stp_channel_get_value</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ae7bd4572fb2ac86694555d0b827a2db9">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a43188fd2c70d894e1e050277c1e4da35">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a68afca52a3f3c0c72c1ff0329ef245c7">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#afe8ad41148d568cb1d662064ec721ac1">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a59a4810ca297444fb16a5a1a1db319ed">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#af903f5318c045567f6aa3b6f1496b5ba">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a1c1101b3f21368b26241a0db2877364e">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a8a3cf94dfe1461bd0c8fb7464d5c99a6">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ab09858181233a7777b2d49ca50a327c6">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a7771fa6878d414b4cd3b08743aadc3fc">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a774df9fbabb8fcd9241976cc50c9501d">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9231b8d3be7ec55dc657da2e6a5c406e">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9e2107aa3cc118db2b6540f939064fed">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a36feed643e8768ff93308980203a92be">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4f0863196d55416aa58ea9815eb33312">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ac5c6578307d574f53c8f9110053fe9c5">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4559ad54f7de2403438baab1c97789f7">stp_channel_convert</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ac73acbaeb300c75912529c5064ea507a">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a3ad58abee1208b328da69e49d230a54f">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a90026b1db4586b08df148db41a676b50"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a90026b1db4586b08df148db41a676b50">stp_channel_reset</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ab4b4591b1709146874c0218bc0591255"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ab4b4591b1709146874c0218bc0591255">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
+<tr class="memitem:af03151796a167ec708b5412a31ddced5"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#af03151796a167ec708b5412a31ddced5">stp_channel_add</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
+<tr class="memitem:a748f1fc90c60e70016998953b1adcde2"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a748f1fc90c60e70016998953b1adcde2">stp_channel_get_value</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr class="memitem:ae7bd4572fb2ac86694555d0b827a2db9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ae7bd4572fb2ac86694555d0b827a2db9">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr class="memitem:a43188fd2c70d894e1e050277c1e4da35"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a43188fd2c70d894e1e050277c1e4da35">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr class="memitem:a68afca52a3f3c0c72c1ff0329ef245c7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a68afca52a3f3c0c72c1ff0329ef245c7">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
+<tr class="memitem:afe8ad41148d568cb1d662064ec721ac1"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#afe8ad41148d568cb1d662064ec721ac1">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a59a4810ca297444fb16a5a1a1db319ed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a59a4810ca297444fb16a5a1a1db319ed">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr class="memitem:af903f5318c045567f6aa3b6f1496b5ba"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#af903f5318c045567f6aa3b6f1496b5ba">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr class="memitem:a1c1101b3f21368b26241a0db2877364e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a1c1101b3f21368b26241a0db2877364e">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
+<tr class="memitem:a8a3cf94dfe1461bd0c8fb7464d5c99a6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a8a3cf94dfe1461bd0c8fb7464d5c99a6">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ab09858181233a7777b2d49ca50a327c6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ab09858181233a7777b2d49ca50a327c6">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
+<tr class="memitem:a7771fa6878d414b4cd3b08743aadc3fc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a7771fa6878d414b4cd3b08743aadc3fc">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a774df9fbabb8fcd9241976cc50c9501d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a774df9fbabb8fcd9241976cc50c9501d">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
+<tr class="memitem:a9231b8d3be7ec55dc657da2e6a5c406e"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9231b8d3be7ec55dc657da2e6a5c406e">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a9e2107aa3cc118db2b6540f939064fed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9e2107aa3cc118db2b6540f939064fed">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memitem:a36feed643e8768ff93308980203a92be"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a36feed643e8768ff93308980203a92be">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int channel)</td></tr>
+<tr class="memitem:a4f0863196d55416aa58ea9815eb33312"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4f0863196d55416aa58ea9815eb33312">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memitem:ac5c6578307d574f53c8f9110053fe9c5"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ac5c6578307d574f53c8f9110053fe9c5">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a35b64c052b8dcfd4f1576b10d999e022"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a35b64c052b8dcfd4f1576b10d999e022">stp_channel_initialize</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int input_channel_count)</td></tr>
+<tr class="memitem:a4559ad54f7de2403438baab1c97789f7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4559ad54f7de2403438baab1c97789f7">stp_channel_convert</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
+<tr class="memitem:ac73acbaeb300c75912529c5064ea507a"><td class="memItemLeft" align="right" valign="top">unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#ac73acbaeb300c75912529c5064ea507a">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a3ad58abee1208b328da69e49d230a54f"><td class="memItemLeft" align="right" valign="top">unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a3ad58abee1208b328da69e49d230a54f">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Channel functions. </p>
 </div><hr/><h2>Function Documentation</h2>
-<a class="anchor" id="af03151796a167ec708b5412a31ddced5"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="af03151796a167ec708b5412a31ddced5" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" -->
+<a class="anchor" id="af03151796a167ec708b5412a31ddced5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -111,12 +121,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4559ad54f7de2403438baab1c97789f7"></a><!-- doxytag: member="channel.h::stp_channel_convert" ref="a4559ad54f7de2403438baab1c97789f7" args="(const stp_vars_t *v, unsigned *zero_mask)" -->
+<a class="anchor" id="a4559ad54f7de2403438baab1c97789f7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -138,12 +147,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8a3cf94dfe1461bd0c8fb7464d5c99a6"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="a8a3cf94dfe1461bd0c8fb7464d5c99a6" args="(stp_vars_t *v)" -->
+<a class="anchor" id="a8a3cf94dfe1461bd0c8fb7464d5c99a6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -155,12 +163,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a36feed643e8768ff93308980203a92be"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="a36feed643e8768ff93308980203a92be" args="(stp_vars_t *v, int channel)" -->
+<a class="anchor" id="a36feed643e8768ff93308980203a92be"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -182,12 +189,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af903f5318c045567f6aa3b6f1496b5ba"></a><!-- doxytag: member="channel.h::stp_channel_get_cutoff_adjustment" ref="af903f5318c045567f6aa3b6f1496b5ba" args="(stp_vars_t *v, int color, int subchannel)" -->
+<a class="anchor" id="af903f5318c045567f6aa3b6f1496b5ba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -215,12 +221,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a43188fd2c70d894e1e050277c1e4da35"></a><!-- doxytag: member="channel.h::stp_channel_get_density_adjustment" ref="a43188fd2c70d894e1e050277c1e4da35" args="(stp_vars_t *v, int color, int subchannel)" -->
+<a class="anchor" id="a43188fd2c70d894e1e050277c1e4da35"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -248,12 +253,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac5c6578307d574f53c8f9110053fe9c5"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="ac5c6578307d574f53c8f9110053fe9c5" args="(stp_vars_t *v)" -->
+<a class="anchor" id="ac5c6578307d574f53c8f9110053fe9c5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -265,12 +269,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7771fa6878d414b4cd3b08743aadc3fc"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a7771fa6878d414b4cd3b08743aadc3fc" args="(stp_vars_t *v)" -->
+<a class="anchor" id="a7771fa6878d414b4cd3b08743aadc3fc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -282,12 +285,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9231b8d3be7ec55dc657da2e6a5c406e"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="a9231b8d3be7ec55dc657da2e6a5c406e" args="(stp_vars_t *v)" -->
+<a class="anchor" id="a9231b8d3be7ec55dc657da2e6a5c406e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -299,12 +301,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afe8ad41148d568cb1d662064ec721ac1"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="afe8ad41148d568cb1d662064ec721ac1" args="(stp_vars_t *v)" -->
+<a class="anchor" id="afe8ad41148d568cb1d662064ec721ac1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -316,12 +317,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac73acbaeb300c75912529c5064ea507a"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="ac73acbaeb300c75912529c5064ea507a" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ac73acbaeb300c75912529c5064ea507a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -333,12 +333,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3ad58abee1208b328da69e49d230a54f"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="a3ad58abee1208b328da69e49d230a54f" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="a3ad58abee1208b328da69e49d230a54f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -350,12 +349,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a748f1fc90c60e70016998953b1adcde2"></a><!-- doxytag: member="channel.h::stp_channel_get_value" ref="a748f1fc90c60e70016998953b1adcde2" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" -->
+<a class="anchor" id="a748f1fc90c60e70016998953b1adcde2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -383,12 +381,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a35b64c052b8dcfd4f1576b10d999e022"></a><!-- doxytag: member="channel.h::stp_channel_initialize" ref="a35b64c052b8dcfd4f1576b10d999e022" args="(stp_vars_t *v, stp_image_t *image, int input_channel_count)" -->
+<a class="anchor" id="a35b64c052b8dcfd4f1576b10d999e022"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -401,7 +398,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>, </td>
         </tr>
         <tr>
@@ -416,12 +413,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a90026b1db4586b08df148db41a676b50"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="a90026b1db4586b08df148db41a676b50" args="(stp_vars_t *v)" -->
+<a class="anchor" id="a90026b1db4586b08df148db41a676b50"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -433,12 +429,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab4b4591b1709146874c0218bc0591255"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="ab4b4591b1709146874c0218bc0591255" args="(stp_vars_t *v, int channel)" -->
+<a class="anchor" id="ab4b4591b1709146874c0218bc0591255"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -460,12 +455,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1c1101b3f21368b26241a0db2877364e"></a><!-- doxytag: member="channel.h::stp_channel_set_black_channel" ref="a1c1101b3f21368b26241a0db2877364e" args="(stp_vars_t *v, int channel)" -->
+<a class="anchor" id="a1c1101b3f21368b26241a0db2877364e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -487,12 +481,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9e2107aa3cc118db2b6540f939064fed"></a><!-- doxytag: member="channel.h::stp_channel_set_curve" ref="a9e2107aa3cc118db2b6540f939064fed" args="(stp_vars_t *v, int channel, const stp_curve_t *curve)" -->
+<a class="anchor" id="a9e2107aa3cc118db2b6540f939064fed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -520,12 +513,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a59a4810ca297444fb16a5a1a1db319ed"></a><!-- doxytag: member="channel.h::stp_channel_set_cutoff_adjustment" ref="a59a4810ca297444fb16a5a1a1db319ed" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" -->
+<a class="anchor" id="a59a4810ca297444fb16a5a1a1db319ed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -559,12 +551,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae7bd4572fb2ac86694555d0b827a2db9"></a><!-- doxytag: member="channel.h::stp_channel_set_density_adjustment" ref="ae7bd4572fb2ac86694555d0b827a2db9" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" -->
+<a class="anchor" id="ae7bd4572fb2ac86694555d0b827a2db9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -598,12 +589,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4f0863196d55416aa58ea9815eb33312"></a><!-- doxytag: member="channel.h::stp_channel_set_gcr_curve" ref="a4f0863196d55416aa58ea9815eb33312" args="(stp_vars_t *v, const stp_curve_t *curve)" -->
+<a class="anchor" id="a4f0863196d55416aa58ea9815eb33312"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -625,12 +615,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab09858181233a7777b2d49ca50a327c6"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_channel" ref="ab09858181233a7777b2d49ca50a327c6" args="(stp_vars_t *v, int channel)" -->
+<a class="anchor" id="ab09858181233a7777b2d49ca50a327c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -652,12 +641,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a774df9fbabb8fcd9241976cc50c9501d"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_limit" ref="a774df9fbabb8fcd9241976cc50c9501d" args="(stp_vars_t *v, double limit)" -->
+<a class="anchor" id="a774df9fbabb8fcd9241976cc50c9501d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -679,12 +667,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a68afca52a3f3c0c72c1ff0329ef245c7"></a><!-- doxytag: member="channel.h::stp_channel_set_ink_limit" ref="a68afca52a3f3c0c72c1ff0329ef245c7" args="(stp_vars_t *v, double limit)" -->
+<a class="anchor" id="a68afca52a3f3c0c72c1ff0329ef245c7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -706,14 +693,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 6f25448..ecbcc21 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Data Structure Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,20 +42,33 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Data Structure Index</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 <div class="qindex"><a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_S">S</a></div>
-<table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;D&#160;&#160;</div></td></tr></table>
-</td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&#160;&#160;&#160;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
-</td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__family.html">stp_family</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&#160;&#160;&#160;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__image.html">stp_image</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__module.html">stp_module</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&#160;&#160;&#160;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&#160;&#160;&#160;</td></tr></table><div class="qindex"><a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_S">S</a></div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+<table style="margin: 10px; white-space: nowrap;" align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
+<tr><td rowspan="2" valign="bottom"><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;D&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&#160;&#160;&#160;</td></tr>
+<tr><td rowspan="2" valign="bottom"><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__shade.html">stp_shade</a>&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&#160;&#160;&#160;</td><td></td></tr>
+<tr><td valign="top"><a class="el" href="structstp__color.html">stp_color</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__family.html">stp_family</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__module.html">stp_module</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&#160;&#160;&#160;</td><td></td></tr>
+<tr><td valign="top"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__image.html">stp_image</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__module__version.html">stp_module_version</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&#160;&#160;&#160;</td><td></td></tr>
+<tr><td></td><td></td><td></td><td></td><td></td></tr>
+</table>
+<div class="qindex"><a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_S">S</a></div>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/closed.png b/doc/gutenprint/html/closed.png
index b7d4bd9..98cc2c9 100644
--- a/doc/gutenprint/html/closed.png
+++ b/doc/gutenprint/html/closed.png
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 58663a9..c677fb6 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/color.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,52 +41,61 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/color.h File Reference</div>  </div>
-</div>
+<div class="title">color.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Color functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:gad1408f9835b72f266ec7c7e1e1202a74"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gaa282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga68ba525119da39ae854645ae649557d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#ga612389b45f09358f6bad0e376c91b057"></a><br/></td></tr>
+<tr class="memitem:ga23392fc53078d51fcd14d6d565d56423"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr class="memitem:ga0cf28c3c9638987df4b1740deadba0cb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr class="memitem:gaa282220724877a57738b047140835141"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gaa282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga83bc80c9fd84d741099bc20285a1b655"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:ga47d6a8163ef21a6e700b1371228b851d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *color)</td></tr>
+<tr class="memitem:ga2b62ec8e0afe1b6297bc71466f8a334c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *color)</td></tr>
+<tr class="memitem:ga68c13c36d723e5604507bf33fe629f8b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
+<tr class="memdesc:ga68c13c36d723e5604507bf33fe629f8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b"></a><br/></td></tr>
+<tr class="memitem:ga3b8f62108f3604480e7b89b253527f4a"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr class="memdesc:ga3b8f62108f3604480e7b89b253527f4a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a"></a><br/></td></tr>
+<tr class="memitem:ga68ba525119da39ae854645ae649557d3"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:ga68ba525119da39ae854645ae649557d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga68ba525119da39ae854645ae649557d3"></a><br/></td></tr>
+<tr class="memitem:ga578f80b2bc3937df38ce7e803f5f472c"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr class="memitem:ga5a4a4da67cb5c3f1c0a2a9618e46ed50"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *c)</td></tr>
+<tr class="memdesc:ga5a4a4da67cb5c3f1c0a2a9618e46ed50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br/></td></tr>
+<tr class="memitem:ga612389b45f09358f6bad0e376c91b057"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *c)</td></tr>
+<tr class="memdesc:ga612389b45f09358f6bad0e376c91b057"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#ga612389b45f09358f6bad0e376c91b057"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Color functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index a2cb534..a0c5382 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/curve-cache.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,46 +41,52 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/curve-cache.h File Reference</div>  </div>
-</div>
+<div class="title">curve-cache.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Curve caching functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a4b278e86a2f914893307fb20cf218e7c">CURVE_CACHE_FAST_USHORT</a>(cache)&#160;&#160;&#160;((cache)-&gt;s_cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af79c26492d6e6fd726498df18cae11fe">CURVE_CACHE_FAST_DOUBLE</a>(cache)&#160;&#160;&#160;((cache)-&gt;d_cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a70b70d0328c61f17925402a4b1bb9a90">CURVE_CACHE_FAST_COUNT</a>(cache)&#160;&#160;&#160;((cache)-&gt;count)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a4b278e86a2f914893307fb20cf218e7c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a4b278e86a2f914893307fb20cf218e7c">CURVE_CACHE_FAST_USHORT</a>(cache)&#160;&#160;&#160;((cache)-&gt;s_cache)</td></tr>
+<tr class="memitem:af79c26492d6e6fd726498df18cae11fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af79c26492d6e6fd726498df18cae11fe">CURVE_CACHE_FAST_DOUBLE</a>(cache)&#160;&#160;&#160;((cache)-&gt;d_cache)</td></tr>
+<tr class="memitem:a70b70d0328c61f17925402a4b1bb9a90"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a70b70d0328c61f17925402a4b1bb9a90">CURVE_CACHE_FAST_COUNT</a>(cache)&#160;&#160;&#160;((cache)-&gt;count)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a80cb29d2d12707901ca9261df5f3cd1c">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af3e398d179e00c2e7d8b7c2e5dcbfd5c">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a26161d0b2b6c8b97e0de2dc12619cc6c">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8d9c7b9a9aca371b6d2e72dcfc367f88">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8469e7bd7d80cfb01fc470a42e6ac805">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#acd8bbfbdb0b60d079b6615cc4a19ee56">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#aaefb6ef535ba108e0fdba1db4b58bd34">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a204df5bd2ecc318cccf6e2541d8b4830">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a45415b5aa0600b60b65880803aea84b4">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af5642e9d4e265b8d16db6075e1309a20">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
+<tr class="memitem:a80cb29d2d12707901ca9261df5f3cd1c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a80cb29d2d12707901ca9261df5f3cd1c">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:af3e398d179e00c2e7d8b7c2e5dcbfd5c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af3e398d179e00c2e7d8b7c2e5dcbfd5c">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:a26161d0b2b6c8b97e0de2dc12619cc6c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a26161d0b2b6c8b97e0de2dc12619cc6c">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:a8d9c7b9a9aca371b6d2e72dcfc367f88"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8d9c7b9a9aca371b6d2e72dcfc367f88">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:a8469e7bd7d80cfb01fc470a42e6ac805"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8469e7bd7d80cfb01fc470a42e6ac805">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memitem:acd8bbfbdb0b60d079b6615cc4a19ee56"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#acd8bbfbdb0b60d079b6615cc4a19ee56">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memitem:aaefb6ef535ba108e0fdba1db4b58bd34"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#aaefb6ef535ba108e0fdba1db4b58bd34">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:a204df5bd2ecc318cccf6e2541d8b4830"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a204df5bd2ecc318cccf6e2541d8b4830">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:a45415b5aa0600b60b65880803aea84b4"><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a45415b5aa0600b60b65880803aea84b4">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr class="memitem:af5642e9d4e265b8d16db6075e1309a20"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#af5642e9d4e265b8d16db6075e1309a20">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Curve caching functions. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a70b70d0328c61f17925402a4b1bb9a90"></a><!-- doxytag: member="curve&#45;cache.h::CURVE_CACHE_FAST_COUNT" ref="a70b70d0328c61f17925402a4b1bb9a90" args="(cache)" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a70b70d0328c61f17925402a4b1bb9a90"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -86,12 +98,11 @@ Functions</h2></td></tr>
           <td>&#160;&#160;&#160;((cache)-&gt;count)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af79c26492d6e6fd726498df18cae11fe"></a><!-- doxytag: member="curve&#45;cache.h::CURVE_CACHE_FAST_DOUBLE" ref="af79c26492d6e6fd726498df18cae11fe" args="(cache)" -->
+<a class="anchor" id="af79c26492d6e6fd726498df18cae11fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -103,12 +114,11 @@ Functions</h2></td></tr>
           <td>&#160;&#160;&#160;((cache)-&gt;d_cache)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4b278e86a2f914893307fb20cf218e7c"></a><!-- doxytag: member="curve&#45;cache.h::CURVE_CACHE_FAST_USHORT" ref="a4b278e86a2f914893307fb20cf218e7c" args="(cache)" -->
+<a class="anchor" id="a4b278e86a2f914893307fb20cf218e7c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -120,13 +130,12 @@ Functions</h2></td></tr>
           <td>&#160;&#160;&#160;((cache)-&gt;s_cache)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="af5642e9d4e265b8d16db6075e1309a20"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_copy" ref="af5642e9d4e265b8d16db6075e1309a20" args="(stp_cached_curve_t *dest, const stp_cached_curve_t *src)" -->
+<a class="anchor" id="af5642e9d4e265b8d16db6075e1309a20"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -148,12 +157,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af3e398d179e00c2e7d8b7c2e5dcbfd5c"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_curve_data" ref="af3e398d179e00c2e7d8b7c2e5dcbfd5c" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="af3e398d179e00c2e7d8b7c2e5dcbfd5c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -165,12 +173,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8d9c7b9a9aca371b6d2e72dcfc367f88"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_curve_invalidate" ref="a8d9c7b9a9aca371b6d2e72dcfc367f88" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="a8d9c7b9a9aca371b6d2e72dcfc367f88"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -182,12 +189,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aaefb6ef535ba108e0fdba1db4b58bd34"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_get_count" ref="aaefb6ef535ba108e0fdba1db4b58bd34" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="aaefb6ef535ba108e0fdba1db4b58bd34"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -199,12 +205,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a26161d0b2b6c8b97e0de2dc12619cc6c"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_get_curve" ref="a26161d0b2b6c8b97e0de2dc12619cc6c" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="a26161d0b2b6c8b97e0de2dc12619cc6c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -216,12 +221,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a45415b5aa0600b60b65880803aea84b4"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_get_double_data" ref="a45415b5aa0600b60b65880803aea84b4" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="a45415b5aa0600b60b65880803aea84b4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -233,12 +237,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a204df5bd2ecc318cccf6e2541d8b4830"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_get_ushort_data" ref="a204df5bd2ecc318cccf6e2541d8b4830" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="a204df5bd2ecc318cccf6e2541d8b4830"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -250,12 +253,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8469e7bd7d80cfb01fc470a42e6ac805"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_set_curve" ref="a8469e7bd7d80cfb01fc470a42e6ac805" args="(stp_cached_curve_t *cache, stp_curve_t *curve)" -->
+<a class="anchor" id="a8469e7bd7d80cfb01fc470a42e6ac805"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -277,12 +279,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acd8bbfbdb0b60d079b6615cc4a19ee56"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_cache_set_curve_copy" ref="acd8bbfbdb0b60d079b6615cc4a19ee56" args="(stp_cached_curve_t *cache, const stp_curve_t *curve)" -->
+<a class="anchor" id="acd8bbfbdb0b60d079b6615cc4a19ee56"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -304,12 +305,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a80cb29d2d12707901ca9261df5f3cd1c"></a><!-- doxytag: member="curve&#45;cache.h::stp_curve_free_curve_cache" ref="a80cb29d2d12707901ca9261df5f3cd1c" args="(stp_cached_curve_t *cache)" -->
+<a class="anchor" id="a80cb29d2d12707901ca9261df5f3cd1c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -321,14 +321,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 6f5e9ab..100f903 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/curve.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,7 +41,11 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -43,8 +53,8 @@
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/curve.h File Reference</div>  </div>
-</div>
+<div class="title">curve.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Curve functions.  
@@ -53,136 +63,142 @@
 <code>#include &lt;stdlib.h&gt;</code><br/>
 <code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_curve&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:ga375a2b23705fb0698ae1d823243c8524"><td class="memItemLeft" align="right" valign="top">typedef struct stp_curve&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
+<tr class="memdesc:ga375a2b23705fb0698ae1d823243c8524"><td class="mdescLeft">&#160;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
+<tr class="memitem:ga982f8191c84b049cc3ad3cee1558fc23"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
 <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23afb1ffdc3754f428d8e3a2124e014ff77">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
+<tr class="memdesc:ga982f8191c84b049cc3ad3cee1558fc23"><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">More...</a><br/></td></tr>
+<tr class="memitem:ga3ae3af552b490b0ca8b02e442ac9547a"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
 <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aac0361aebddfabfb263dc0205a61f6fbd">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
+<tr class="memdesc:ga3ae3af552b490b0ca8b02e442ac9547a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">More...</a><br/></td></tr>
+<tr class="memitem:ga7eddbee28cb1f3c76a19408b86ea142e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
 <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142ead3bd2cdb63498d5d22686e79e2c0ed95">STP_CURVE_COMPOSE_MULTIPLY</a>, 
 <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142ea8de151149fdfd4fcca78826e6352246a">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
+<tr class="memdesc:ga7eddbee28cb1f3c76a19408b86ea142e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">More...</a><br/></td></tr>
+<tr class="memitem:ga86d146e483ca1902f973d574f542b85f"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
 <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85faec9e6673edac9d34e3aad376fa711aa5">STP_CURVE_BOUNDS_CLIP</a>, 
 <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fad699d675d5df223055388cd83d0b362b">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memdesc:ga86d146e483ca1902f973d574f542b85f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a curve.  <a href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a curve.  <a href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73">stp_curve_create_reverse</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a curve.  <a href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3416157017287eae136fb928802be234">stp_curve_reverse</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a curve.  <a href="group__curve.html#ga3416157017287eae136fb928802be234"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#ga4294b85e848fe421496469e2406ef380"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#ga859020827897bac0f4671322ec027dc4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#ga766ff02b29b976372779f719076ad017"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#ga82890cef78f5861a88c5789c33693423"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gabd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#gabd7a39289471607311141c7fc3bbb415"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#ga723173297f5b67af937205c7d74ac353"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#ga31e76843f4d2f207701755b58766a670"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaa02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#gaa02125af6b9c192e34985851370391b8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gac12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#gac12af55cf0eb2f76db967886f8996313"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7"></a><br/></td></tr>
+<tr class="memitem:ga6b3640f0e25bd9d38e46bdc1b2ee58a4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr class="memdesc:ga6b3640f0e25bd9d38e46bdc1b2ee58a4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br/></td></tr>
+<tr class="memitem:ga972ed591394396e0c66e928a0695b3bf"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga972ed591394396e0c66e928a0695b3bf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a curve.  <a href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf"></a><br/></td></tr>
+<tr class="memitem:gacd7861bf1c9d61ac4ec87844a15ab9d3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
+<tr class="memdesc:gacd7861bf1c9d61ac4ec87844a15ab9d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a curve.  <a href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3"></a><br/></td></tr>
+<tr class="memitem:ga8c2aed234d3e4ddc4c239801be17bb73"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73">stp_curve_create_reverse</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga8c2aed234d3e4ddc4c239801be17bb73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a curve.  <a href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73"></a><br/></td></tr>
+<tr class="memitem:ga3416157017287eae136fb928802be234"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3416157017287eae136fb928802be234">stp_curve_reverse</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
+<tr class="memdesc:ga3416157017287eae136fb928802be234"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a curve.  <a href="group__curve.html#ga3416157017287eae136fb928802be234"></a><br/></td></tr>
+<tr class="memitem:ga4294b85e848fe421496469e2406ef380"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga4294b85e848fe421496469e2406ef380"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#ga4294b85e848fe421496469e2406ef380"></a><br/></td></tr>
+<tr class="memitem:gae32fb850963b8694d3739c0ed8475f75"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr class="memdesc:gae32fb850963b8694d3739c0ed8475f75"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75"></a><br/></td></tr>
+<tr class="memitem:ga63c3386fbfd75da9fe985673bf7b1ca3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr class="memdesc:ga63c3386fbfd75da9fe985673bf7b1ca3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3"></a><br/></td></tr>
+<tr class="memitem:ga859020827897bac0f4671322ec027dc4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga859020827897bac0f4671322ec027dc4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#ga859020827897bac0f4671322ec027dc4"></a><br/></td></tr>
+<tr class="memitem:ga29b022a3055afe0b48d1f2736ff2f4da"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga29b022a3055afe0b48d1f2736ff2f4da"><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da"></a><br/></td></tr>
+<tr class="memitem:gacb8e51731b9385556747744a0d4f43fb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr class="memitem:ga766ff02b29b976372779f719076ad017"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga766ff02b29b976372779f719076ad017"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#ga766ff02b29b976372779f719076ad017"></a><br/></td></tr>
+<tr class="memitem:ga82890cef78f5861a88c5789c33693423"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
+<tr class="memdesc:ga82890cef78f5861a88c5789c33693423"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#ga82890cef78f5861a88c5789c33693423"></a><br/></td></tr>
+<tr class="memitem:ga42c98a6a6d2512516738b6df9367510e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga42c98a6a6d2512516738b6df9367510e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e"></a><br/></td></tr>
+<tr class="memitem:ga81bceb4cb991cef1cda2298cf7bb9f15"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr class="memdesc:ga81bceb4cb991cef1cda2298cf7bb9f15"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15"></a><br/></td></tr>
+<tr class="memitem:gace09cab4e6ae3d55f75aacae3689e8e6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr class="memdesc:gace09cab4e6ae3d55f75aacae3689e8e6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6"></a><br/></td></tr>
+<tr class="memitem:gabd7a39289471607311141c7fc3bbb415"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gabd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr class="memdesc:gabd7a39289471607311141c7fc3bbb415"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#gabd7a39289471607311141c7fc3bbb415"></a><br/></td></tr>
+<tr class="memitem:gae6a435a21a5c4b5e582d42095a7b06fc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr class="memdesc:gae6a435a21a5c4b5e582d42095a7b06fc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc"></a><br/></td></tr>
+<tr class="memitem:ga723173297f5b67af937205c7d74ac353"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr class="memdesc:ga723173297f5b67af937205c7d74ac353"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#ga723173297f5b67af937205c7d74ac353"></a><br/></td></tr>
+<tr class="memitem:ga31e76843f4d2f207701755b58766a670"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr class="memdesc:ga31e76843f4d2f207701755b58766a670"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#ga31e76843f4d2f207701755b58766a670"></a><br/></td></tr>
+<tr class="memitem:ga3ee80f8e4f33691a78b3ad8c3fd7c34f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr class="memdesc:ga3ee80f8e4f33691a78b3ad8c3fd7c34f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br/></td></tr>
+<tr class="memitem:ga2fa5222aab07e85f215e389734b6dbea"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr class="memdesc:ga2fa5222aab07e85f215e389734b6dbea"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea"></a><br/></td></tr>
+<tr class="memitem:ga0af395eefa7bfe0d19acc1acbaeefe48"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr class="memdesc:ga0af395eefa7bfe0d19acc1acbaeefe48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48"></a><br/></td></tr>
+<tr class="memitem:ga5cbf7c4b6ad96ecb35fc06f46c0319f0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr class="memdesc:ga5cbf7c4b6ad96ecb35fc06f46c0319f0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br/></td></tr>
+<tr class="memitem:ga73dfcc4c95734449965227e21deb3037"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr class="memitem:gab2208f56694e47e4300d10e057f59ee8"><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gab2208f56694e47e4300d10e057f59ee8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8"></a><br/></td></tr>
+<tr class="memitem:ga79e0d6afa3573917c756af64b56a0d82"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga79e0d6afa3573917c756af64b56a0d82"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82"></a><br/></td></tr>
+<tr class="memitem:ga251f105cb5f2b126ea02b7908f717c18"><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga251f105cb5f2b126ea02b7908f717c18"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18"></a><br/></td></tr>
+<tr class="memitem:gaf59bd38c9dfc7beb08a283dc9e400bf2"><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gaf59bd38c9dfc7beb08a283dc9e400bf2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2"></a><br/></td></tr>
+<tr class="memitem:ga24a862eda4cdbb626f51aeb7d8ae9a50"><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga24a862eda4cdbb626f51aeb7d8ae9a50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50"></a><br/></td></tr>
+<tr class="memitem:ga6de80e81b64262e0051441f697ae4de4"><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga6de80e81b64262e0051441f697ae4de4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4"></a><br/></td></tr>
+<tr class="memitem:ga19b3160a57dc6959fe08c631c7206a8a"><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga19b3160a57dc6959fe08c631c7206a8a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a"></a><br/></td></tr>
+<tr class="memitem:ga87c5d1904efa58be8a21ab6b2c41d0b9"><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga87c5d1904efa58be8a21ab6b2c41d0b9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9"></a><br/></td></tr>
+<tr class="memitem:gaa02125af6b9c192e34985851370391b8"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaa02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gaa02125af6b9c192e34985851370391b8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#gaa02125af6b9c192e34985851370391b8"></a><br/></td></tr>
+<tr class="memitem:gade323594e84d4380c88ecf122a5a4da8"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gade323594e84d4380c88ecf122a5a4da8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8"></a><br/></td></tr>
+<tr class="memitem:gacb8a2b9b21f97f32faacb99a6125e152"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr class="memdesc:gacb8a2b9b21f97f32faacb99a6125e152"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152"></a><br/></td></tr>
+<tr class="memitem:ga0420a6cfa87aa96e5c9a56142aa0178d"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga0420a6cfa87aa96e5c9a56142aa0178d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d"></a><br/></td></tr>
+<tr class="memitem:ga2d3b8372bde3fce699a3b7bb3c9d8582"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr class="memdesc:ga2d3b8372bde3fce699a3b7bb3c9d8582"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582"></a><br/></td></tr>
+<tr class="memitem:ga569aae57147ed7681f23e0e60bd8af35"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr class="memdesc:ga569aae57147ed7681f23e0e60bd8af35"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35"></a><br/></td></tr>
+<tr class="memitem:gab33642ee6c49334f379a4dc185ecd355"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr class="memdesc:gab33642ee6c49334f379a4dc185ecd355"><td class="mdescLeft">&#160;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355"></a><br/></td></tr>
+<tr class="memitem:ga87298cf562468cbcf2c1f76a0ab80b62"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr class="memdesc:ga87298cf562468cbcf2c1f76a0ab80b62"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62"></a><br/></td></tr>
+<tr class="memitem:gaad611b3ddbd667ec204fa7b42f8d7546"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr class="memdesc:gaad611b3ddbd667ec204fa7b42f8d7546"><td class="mdescLeft">&#160;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546"></a><br/></td></tr>
+<tr class="memitem:gac12af55cf0eb2f76db967886f8996313"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gac12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gac12af55cf0eb2f76db967886f8996313"><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#gac12af55cf0eb2f76db967886f8996313"></a><br/></td></tr>
+<tr class="memitem:gaf2f0da590278ff74af1eccb0aa0c7169"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gaf2f0da590278ff74af1eccb0aa0c7169"><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169"></a><br/></td></tr>
+<tr class="memitem:ga478a24e44a3ce345f7207cf7ded12e37"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr class="memdesc:ga478a24e44a3ce345f7207cf7ded12e37"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37"></a><br/></td></tr>
+<tr class="memitem:gad96d7d1cda5f037f7d6a9b651ebbbb46"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr class="memdesc:gad96d7d1cda5f037f7d6a9b651ebbbb46"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46"></a><br/></td></tr>
+<tr class="memitem:gab8c0df217306a6e0597f058efbfaca82"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr class="memdesc:gab8c0df217306a6e0597f058efbfaca82"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82"></a><br/></td></tr>
+<tr class="memitem:ga55c83a9139fc1b06b90e983d7c1ceff7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr class="memdesc:ga55c83a9139fc1b06b90e983d7c1ceff7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Curve functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index b3a391e..2045815 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Deprecated List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,25 +35,24 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Deprecated List </div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock"><p><a class="anchor" id="_deprecated000001"></a> </p>
-<dl>
-<dt>Global <a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver) </dt>
-<dd>There should never be any need to use this function. </dd>
-</dl>
-<p><a class="anchor" id="_deprecated000002"></a> </p>
-<dl>
-<dt>Global <a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (stp_vars_t *user, const stp_vars_t *print) </dt>
+<div class="textblock"><dl class="reflist">
+<dt><a class="anchor" id="_deprecated000001"></a>Global <a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a>  (const char *driver)</dt>
+<dd>There should never be any need to use this function.  </dd>
+<dt><a class="anchor" id="_deprecated000002"></a>Global <a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a>  (stp_vars_t *user, const stp_vars_t *print)</dt>
 <dd>This is likely to go away. </dd>
 </dl>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html b/doc/gutenprint/html/dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html
new file mode 100644
index 0000000..9735217
--- /dev/null
+++ b/doc/gutenprint/html/dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<title>libgutenprint API Reference: include/gutenprint/ Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td style="padding-left: 0.5em;">
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
+</div>
+</div><!-- top -->
+<div class="header">
+  <div class="headertitle">
+<div class="title">gutenprint Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="files"></a>
+Files</h2></td></tr>
+<tr class="memitem:array_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="array_8h.html">array.h</a></td></tr>
+<tr class="memdesc:array_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Array functions. <br/></td></tr>
+<tr class="memitem:bit-ops_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html">bit-ops.h</a></td></tr>
+<tr class="memdesc:bit-ops_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Bit operations. <br/></td></tr>
+<tr class="memitem:channel_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html">channel.h</a></td></tr>
+<tr class="memdesc:channel_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Channel functions. <br/></td></tr>
+<tr class="memitem:color_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="color_8h.html">color.h</a></td></tr>
+<tr class="memdesc:color_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Color functions. <br/></td></tr>
+<tr class="memitem:curve-cache_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html">curve-cache.h</a></td></tr>
+<tr class="memdesc:curve-cache_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve caching functions. <br/></td></tr>
+<tr class="memitem:curve_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html">curve.h</a></td></tr>
+<tr class="memdesc:curve_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve functions. <br/></td></tr>
+<tr class="memitem:dither_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html">dither.h</a></td></tr>
+<tr class="memdesc:dither_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Dither functions. <br/></td></tr>
+<tr class="memitem:gutenprint-intl-internal_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td></tr>
+<tr class="memdesc:gutenprint-intl-internal_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Internationalisation functions. <br/></td></tr>
+<tr class="memitem:gutenprint-intl_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td></tr>
+<tr class="memdesc:gutenprint-intl_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Internationalisation functions. <br/></td></tr>
+<tr class="memitem:gutenprint-module_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td></tr>
+<tr class="memdesc:gutenprint-module_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Gutenprint module header. <br/></td></tr>
+<tr class="memitem:gutenprint-version_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td></tr>
+<tr class="memdesc:gutenprint-version_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Version functions. <br/></td></tr>
+<tr class="memitem:gutenprint_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint_8h.html">gutenprint.h</a></td></tr>
+<tr class="memdesc:gutenprint_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Gutenprint master header. <br/></td></tr>
+<tr class="memitem:image_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="image_8h.html">image.h</a></td></tr>
+<tr class="memdesc:image_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Image functions. <br/></td></tr>
+<tr class="memitem:list_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="list_8h.html">list.h</a></td></tr>
+<tr class="memdesc:list_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Generic list functions. <br/></td></tr>
+<tr class="memitem:module_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html">module.h</a></td></tr>
+<tr class="memdesc:module_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Module functions. <br/></td></tr>
+<tr class="memitem:mxml_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html">mxml.h</a></td></tr>
+<tr class="memdesc:mxml_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Mini-XML XML parsing functions. <br/></td></tr>
+<tr class="memitem:paper_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="paper_8h.html">paper.h</a></td></tr>
+<tr class="memdesc:paper_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper size functions. <br/></td></tr>
+<tr class="memitem:path_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html">path.h</a></td></tr>
+<tr class="memdesc:path_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Simple directory path functions. <br/></td></tr>
+<tr class="memitem:printers_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="printers_8h.html">printers.h</a></td></tr>
+<tr class="memdesc:printers_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Printer functions. <br/></td></tr>
+<tr class="memitem:sequence_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="sequence_8h.html">sequence.h</a></td></tr>
+<tr class="memdesc:sequence_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Sequence functions. <br/></td></tr>
+<tr class="memitem:string-list_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html">string-list.h</a></td></tr>
+<tr class="memdesc:string-list_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">String list functions. <br/></td></tr>
+<tr class="memitem:util_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="util_8h.html">util.h</a></td></tr>
+<tr class="memdesc:util_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Utility functions. <br/></td></tr>
+<tr class="memitem:vars_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="vars_8h.html">vars.h</a></td></tr>
+<tr class="memdesc:vars_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print job functions. <br/></td></tr>
+<tr class="memitem:weave_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html">weave.h</a></td></tr>
+<tr class="memdesc:weave_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">Softweave functions. <br/></td></tr>
+<tr class="memitem:xml_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html">xml.h</a></td></tr>
+<tr class="memdesc:xml_8h"><td class="mdescLeft">&#160;</td><td class="mdescRight">XML tree functions. <br/></td></tr>
+</table>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/gutenprint/html/dir_d44c64559bbebec7f509842c48db8b23.html
new file mode 100644
index 0000000..d2e281b
--- /dev/null
+++ b/doc/gutenprint/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<title>libgutenprint API Reference: include/ Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td style="padding-left: 0.5em;">
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
+      <li><a href="modules.html"><span>Modules</span></a></li>
+      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li>  </ul>
+</div>
+</div><!-- top -->
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="subdirs"></a>
+Directories</h2></td></tr>
+<tr class="memitem:dir_1aca62f7c2d1ca2bd7aa79274e259f3c"><td class="memItemLeft" align="right" valign="top">directory &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></td></tr>
+</table>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 7afc985..cf3d244 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/dither.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,85 +41,92 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/dither.h File Reference</div>  </div>
-</div>
+<div class="title">dither.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Dither functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html">stp_shade</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9da4fbd724d498250c7129ccbb88c9a3">STP_ECOLOR_K</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#afb855574a9dd1ce3c0ac8e353917cf40">STP_ECOLOR_C</a>&#160;&#160;&#160;1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a42c70bd6031d27d8ce2ab23133f7ed71">STP_ECOLOR_M</a>&#160;&#160;&#160;2</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aac7bfac809059b8c99338dfa9347cf85">STP_ECOLOR_Y</a>&#160;&#160;&#160;3</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#abda31f8e7a9e473057644a5fe4a2339b">STP_NCOLORS</a>&#160;&#160;&#160;(4)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html">stp_dotsize</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html">stp_shade</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a9da4fbd724d498250c7129ccbb88c9a3"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9da4fbd724d498250c7129ccbb88c9a3">STP_ECOLOR_K</a>&#160;&#160;&#160;0</td></tr>
+<tr class="memitem:afb855574a9dd1ce3c0ac8e353917cf40"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#afb855574a9dd1ce3c0ac8e353917cf40">STP_ECOLOR_C</a>&#160;&#160;&#160;1</td></tr>
+<tr class="memitem:a42c70bd6031d27d8ce2ab23133f7ed71"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a42c70bd6031d27d8ce2ab23133f7ed71">STP_ECOLOR_M</a>&#160;&#160;&#160;2</td></tr>
+<tr class="memitem:aac7bfac809059b8c99338dfa9347cf85"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aac7bfac809059b8c99338dfa9347cf85">STP_ECOLOR_Y</a>&#160;&#160;&#160;3</td></tr>
+<tr class="memitem:abda31f8e7a9e473057644a5fe4a2339b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#abda31f8e7a9e473057644a5fe4a2339b">STP_NCOLORS</a>&#160;&#160;&#160;(4)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<tr class="memitem:a9a2c54a4730e2c9bb25cf95f6cd3e597"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
 <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9a2c54a4730e2c9bb25cf95f6cd3e597">stp_dither_matrix_short_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<tr class="memitem:afebf0484e151cf3cce4ef0b9911d0022"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
 <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#afebf0484e151cf3cce4ef0b9911d0022">stp_dither_matrix_normal_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<tr class="memitem:a9f5f63d4f792df1d7becccf3fb5c8fdd"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
 <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:af823fed10cb9591c0e659033ec49f55f"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a></td></tr>
+<tr class="memitem:a7a74b9371fd47b48d961d2316e2126e4"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a></td></tr>
+<tr class="memitem:a5baefb325bf92b7ca10c2d057c04b835"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#adf8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a588103d2a828a6c5f51577a917b09cdf">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aad322d923e2d9c3141cc50863d627b25">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa6ca0a88b0bef517cc1909fb7074e8ac">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ac523d1ba539398308a7ea83f4188d6ae">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a27fa3e870e438b0c399472a908555630">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af1c4669d2bed56e2e1403a7d0f36f6ba">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a57aecb702251a2e18848b02109521aed">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa973f651768626a6eb7ab9ad4ce09b2c">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3155913bdc63c0545786fc427ca2396a">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6f4efd170562a43139f7d6a4b41ecaf3">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a560bcf46dfa233a01bdf6042e4680f54">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ab47439fc32e7f669f8cd6c41acdcf398">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int spread)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ac6a4aa7bda3af1ae03d87f243311ebba">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#afe180672fad52d306e737a333ea113fb">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#addc996112f61432ff66a10eb502d9a4d">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a4dd13ea23fe601571d864eabae4b0c40">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af5822743e380d0d51a397dcb3eb6247c">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5b8786ffa17dcc1604521b1d1cc5a3a5">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad70196f1a4510c43f3651bf1450be5fa">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a8866521ed5c139e2048e5548cc4fb43f">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a0a470a9c9daef26e90bdb890479a7f87">stp_dither</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a70a6b29366005ba76ee77e9f1aaae105">stp_dither_internal</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr class="memitem:a36691189c1f859d82675f32f5046e674"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a36691189c1f859d82675f32f5046e674">stp_dither_matrix_iterated_init</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
+<tr class="memitem:adf8bb5a54d552846dcf4d1534d612b65"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#adf8bb5a54d552846dcf4d1534d612b65">stp_dither_matrix_shear</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
+<tr class="memitem:a2c42ec7156263c024ea6f51ab3b17530"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a2c42ec7156263c024ea6f51ab3b17530">stp_dither_matrix_init</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
+<tr class="memitem:a588103d2a828a6c5f51577a917b09cdf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a588103d2a828a6c5f51577a917b09cdf">stp_dither_matrix_init_short</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
+<tr class="memitem:aad322d923e2d9c3141cc50863d627b25"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aad322d923e2d9c3141cc50863d627b25">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memitem:a53b7ba7fd141db6ef43c68a6f500bda2"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a53b7ba7fd141db6ef43c68a6f500bda2">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr class="memitem:a49ff7bd6b10cd34f9164b4414adbb87c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a49ff7bd6b10cd34f9164b4414adbb87c">stp_dither_matrix_destroy</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat)</td></tr>
+<tr class="memitem:ad0dfe2800ed318431a0a54c1ed7d383b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad0dfe2800ed318431a0a54c1ed7d383b">stp_dither_matrix_clone</a> (const <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *src, <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
+<tr class="memitem:a3ea3c72ff26afef246873edc0bc542d3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3ea3c72ff26afef246873edc0bc542d3">stp_dither_matrix_copy</a> (const <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *src, <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *dest)</td></tr>
+<tr class="memitem:aa62e8e672a125150074ea9bddb474423"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa62e8e672a125150074ea9bddb474423">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
+<tr class="memitem:aa6ca0a88b0bef517cc1909fb7074e8ac"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa6ca0a88b0bef517cc1909fb7074e8ac">stp_dither_matrix_set_row</a> (<a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
+<tr class="memitem:ac523d1ba539398308a7ea83f4188d6ae"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ac523d1ba539398308a7ea83f4188d6ae">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
+<tr class="memitem:a27fa3e870e438b0c399472a908555630"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a27fa3e870e438b0c399472a908555630">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:af1c4669d2bed56e2e1403a7d0f36f6ba"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af1c4669d2bed56e2e1403a7d0f36f6ba">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:a9835738585d6a9053eaeacdca25d0fe6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9835738585d6a9053eaeacdca25d0fe6">stp_dither_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
+<tr class="memitem:a57aecb702251a2e18848b02109521aed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a57aecb702251a2e18848b02109521aed">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
+<tr class="memitem:aa973f651768626a6eb7ab9ad4ce09b2c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aa973f651768626a6eb7ab9ad4ce09b2c">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="dither_8h.html#a9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
+<tr class="memitem:a3155913bdc63c0545786fc427ca2396a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3155913bdc63c0545786fc427ca2396a">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr class="memitem:a6f4efd170562a43139f7d6a4b41ecaf3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6f4efd170562a43139f7d6a4b41ecaf3">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double)</td></tr>
+<tr class="memitem:a560bcf46dfa233a01bdf6042e4680f54"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a560bcf46dfa233a01bdf6042e4680f54">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double)</td></tr>
+<tr class="memitem:ab47439fc32e7f669f8cd6c41acdcf398"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ab47439fc32e7f669f8cd6c41acdcf398">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int spread)</td></tr>
+<tr class="memitem:ac6a4aa7bda3af1ae03d87f243311ebba"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ac6a4aa7bda3af1ae03d87f243311ebba">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, double limit)</td></tr>
+<tr class="memitem:afe180672fad52d306e737a333ea113fb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#afe180672fad52d306e737a333ea113fb">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr class="memitem:addc996112f61432ff66a10eb502d9a4d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#addc996112f61432ff66a10eb502d9a4d">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr class="memitem:a4dd13ea23fe601571d864eabae4b0c40"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a4dd13ea23fe601571d864eabae4b0c40">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
+<tr class="memitem:af5822743e380d0d51a397dcb3eb6247c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#af5822743e380d0d51a397dcb3eb6247c">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="dither_8h.html#a5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
+<tr class="memitem:a5b8786ffa17dcc1604521b1d1cc5a3a5"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5b8786ffa17dcc1604521b1d1cc5a3a5">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
+<tr class="memitem:ad70196f1a4510c43f3651bf1450be5fa"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ad70196f1a4510c43f3651bf1450be5fa">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
+<tr class="memitem:a8866521ed5c139e2048e5548cc4fb43f"><td class="memItemLeft" align="right" valign="top">unsigned char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a8866521ed5c139e2048e5548cc4fb43f">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr class="memitem:a0a470a9c9daef26e90bdb890479a7f87"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a0a470a9c9daef26e90bdb890479a7f87">stp_dither</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr class="memitem:a70a6b29366005ba76ee77e9f1aaae105"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a70a6b29366005ba76ee77e9f1aaae105">stp_dither_internal</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Dither functions. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="afb855574a9dd1ce3c0ac8e353917cf40"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="afb855574a9dd1ce3c0ac8e353917cf40" args="" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="afb855574a9dd1ce3c0ac8e353917cf40"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -121,12 +134,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_ECOLOR_C&#160;&#160;&#160;1</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9da4fbd724d498250c7129ccbb88c9a3"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="a9da4fbd724d498250c7129ccbb88c9a3" args="" -->
+<a class="anchor" id="a9da4fbd724d498250c7129ccbb88c9a3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -134,12 +146,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_ECOLOR_K&#160;&#160;&#160;0</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a42c70bd6031d27d8ce2ab23133f7ed71"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="a42c70bd6031d27d8ce2ab23133f7ed71" args="" -->
+<a class="anchor" id="a42c70bd6031d27d8ce2ab23133f7ed71"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -147,12 +158,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_ECOLOR_M&#160;&#160;&#160;2</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aac7bfac809059b8c99338dfa9347cf85"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="aac7bfac809059b8c99338dfa9347cf85" args="" -->
+<a class="anchor" id="aac7bfac809059b8c99338dfa9347cf85"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -160,12 +170,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_ECOLOR_Y&#160;&#160;&#160;3</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="abda31f8e7a9e473057644a5fe4a2339b"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="abda31f8e7a9e473057644a5fe4a2339b" args="" -->
+<a class="anchor" id="abda31f8e7a9e473057644a5fe4a2339b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -173,92 +182,85 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_NCOLORS&#160;&#160;&#160;(4)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a9f5f63d4f792df1d7becccf3fb5c8fdd"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="a9f5f63d4f792df1d7becccf3fb5c8fdd" args="" -->
+<a class="anchor" id="a9f5f63d4f792df1d7becccf3fb5c8fdd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>  <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>  <a class="el" href="dither_8h.html#a9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af823fed10cb9591c0e659033ec49f55f"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="af823fed10cb9591c0e659033ec49f55f" args="" -->
+<a class="anchor" id="af823fed10cb9591c0e659033ec49f55f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>  <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>  <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afebf0484e151cf3cce4ef0b9911d0022"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="afebf0484e151cf3cce4ef0b9911d0022" args="" -->
+<a class="anchor" id="afebf0484e151cf3cce4ef0b9911d0022"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>  <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>  <a class="el" href="dither_8h.html#afebf0484e151cf3cce4ef0b9911d0022">stp_dither_matrix_normal_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9a2c54a4730e2c9bb25cf95f6cd3e597"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="a9a2c54a4730e2c9bb25cf95f6cd3e597" args="" -->
+<a class="anchor" id="a9a2c54a4730e2c9bb25cf95f6cd3e597"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>  <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>  <a class="el" href="dither_8h.html#a9a2c54a4730e2c9bb25cf95f6cd3e597">stp_dither_matrix_short_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7a74b9371fd47b48d961d2316e2126e4"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="a7a74b9371fd47b48d961d2316e2126e4" args="" -->
+<a class="anchor" id="a7a74b9371fd47b48d961d2316e2126e4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>  <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__dotsize.html">stp_dotsize</a>  <a class="el" href="dither_8h.html#a7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5baefb325bf92b7ca10c2d057c04b835"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="a5baefb325bf92b7ca10c2d057c04b835" args="" -->
+<a class="anchor" id="a5baefb325bf92b7ca10c2d057c04b835"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>  <a class="el" href="structstp__shade.html">stp_shade_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__shade.html">stp_shade</a>  <a class="el" href="dither_8h.html#a5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a0a470a9c9daef26e90bdb890479a7f87"></a><!-- doxytag: member="dither.h::stp_dither" ref="a0a470a9c9daef26e90bdb890479a7f87" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" -->
+<a class="anchor" id="a0a470a9c9daef26e90bdb890479a7f87"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -298,12 +300,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad70196f1a4510c43f3651bf1450be5fa"></a><!-- doxytag: member="dither.h::stp_dither_add_channel" ref="ad70196f1a4510c43f3651bf1450be5fa" args="(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)" -->
+<a class="anchor" id="ad70196f1a4510c43f3651bf1450be5fa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -337,12 +338,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af1c4669d2bed56e2e1403a7d0f36f6ba"></a><!-- doxytag: member="dither.h::stp_dither_describe_parameter" ref="af1c4669d2bed56e2e1403a7d0f36f6ba" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<a class="anchor" id="af1c4669d2bed56e2e1403a7d0f36f6ba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -370,12 +370,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8866521ed5c139e2048e5548cc4fb43f"></a><!-- doxytag: member="dither.h::stp_dither_get_channel" ref="a8866521ed5c139e2048e5548cc4fb43f" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" -->
+<a class="anchor" id="a8866521ed5c139e2048e5548cc4fb43f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -403,12 +402,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afe180672fad52d306e737a333ea113fb"></a><!-- doxytag: member="dither.h::stp_dither_get_first_position" ref="afe180672fad52d306e737a333ea113fb" args="(stp_vars_t *v, int color, int subchan)" -->
+<a class="anchor" id="afe180672fad52d306e737a333ea113fb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -436,12 +434,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="addc996112f61432ff66a10eb502d9a4d"></a><!-- doxytag: member="dither.h::stp_dither_get_last_position" ref="addc996112f61432ff66a10eb502d9a4d" args="(stp_vars_t *v, int color, int subchan)" -->
+<a class="anchor" id="addc996112f61432ff66a10eb502d9a4d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -469,12 +466,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9835738585d6a9053eaeacdca25d0fe6"></a><!-- doxytag: member="dither.h::stp_dither_init" ref="a9835738585d6a9053eaeacdca25d0fe6" args="(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)" -->
+<a class="anchor" id="a9835738585d6a9053eaeacdca25d0fe6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -487,7 +483,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>, </td>
         </tr>
         <tr>
@@ -514,12 +510,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a70a6b29366005ba76ee77e9f1aaae105"></a><!-- doxytag: member="dither.h::stp_dither_internal" ref="a70a6b29366005ba76ee77e9f1aaae105" args="(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)" -->
+<a class="anchor" id="a70a6b29366005ba76ee77e9f1aaae105"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -565,12 +560,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a27fa3e870e438b0c399472a908555630"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="a27fa3e870e438b0c399472a908555630" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="a27fa3e870e438b0c399472a908555630"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -582,25 +576,24 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad0dfe2800ed318431a0a54c1ed7d383b"></a><!-- doxytag: member="dither.h::stp_dither_matrix_clone" ref="ad0dfe2800ed318431a0a54c1ed7d383b" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)" -->
+<a class="anchor" id="ad0dfe2800ed318431a0a54c1ed7d383b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_clone </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>src</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>dest</em>, </td>
         </tr>
         <tr>
@@ -621,25 +614,24 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3ea3c72ff26afef246873edc0bc542d3"></a><!-- doxytag: member="dither.h::stp_dither_matrix_copy" ref="a3ea3c72ff26afef246873edc0bc542d3" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)" -->
+<a class="anchor" id="a3ea3c72ff26afef246873edc0bc542d3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_copy </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>src</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>dest</em>&#160;</td>
         </tr>
         <tr>
@@ -648,36 +640,34 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a49ff7bd6b10cd34f9164b4414adbb87c"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="a49ff7bd6b10cd34f9164b4414adbb87c" args="(stp_dither_matrix_impl_t *mat)" -->
+<a class="anchor" id="a49ff7bd6b10cd34f9164b4414adbb87c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_destroy </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2c42ec7156263c024ea6f51ab3b17530"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init" ref="a2c42ec7156263c024ea6f51ab3b17530" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)" -->
+<a class="anchor" id="a2c42ec7156263c024ea6f51ab3b17530"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_init </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -716,19 +706,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a53b7ba7fd141db6ef43c68a6f500bda2"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_from_dither_array" ref="a53b7ba7fd141db6ef43c68a6f500bda2" args="(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)" -->
+<a class="anchor" id="a53b7ba7fd141db6ef43c68a6f500bda2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_init_from_dither_array </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -749,19 +738,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a588103d2a828a6c5f51577a917b09cdf"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_short" ref="a588103d2a828a6c5f51577a917b09cdf" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)" -->
+<a class="anchor" id="a588103d2a828a6c5f51577a917b09cdf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_init_short </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -800,19 +788,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a36691189c1f859d82675f32f5046e674"></a><!-- doxytag: member="dither.h::stp_dither_matrix_iterated_init" ref="a36691189c1f859d82675f32f5046e674" args="(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)" -->
+<a class="anchor" id="a36691189c1f859d82675f32f5046e674"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_iterated_init </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -839,19 +826,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa62e8e672a125150074ea9bddb474423"></a><!-- doxytag: member="dither.h::stp_dither_matrix_scale_exponentially" ref="aa62e8e672a125150074ea9bddb474423" args="(stp_dither_matrix_impl_t *mat, double exponent)" -->
+<a class="anchor" id="aa62e8e672a125150074ea9bddb474423"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_scale_exponentially </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -866,19 +852,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa6ca0a88b0bef517cc1909fb7074e8ac"></a><!-- doxytag: member="dither.h::stp_dither_matrix_set_row" ref="aa6ca0a88b0bef517cc1909fb7074e8ac" args="(stp_dither_matrix_impl_t *mat, int y)" -->
+<a class="anchor" id="aa6ca0a88b0bef517cc1909fb7074e8ac"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_set_row </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -893,19 +878,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="adf8bb5a54d552846dcf4d1534d612b65"></a><!-- doxytag: member="dither.h::stp_dither_matrix_shear" ref="adf8bb5a54d552846dcf4d1534d612b65" args="(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)" -->
+<a class="anchor" id="adf8bb5a54d552846dcf4d1534d612b65"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_dither_matrix_shear </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="dither_8h.html#af823fed10cb9591c0e659033ec49f55f">stp_dither_matrix_impl_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -926,12 +910,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aad322d923e2d9c3141cc50863d627b25"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="aad322d923e2d9c3141cc50863d627b25" args="(const stp_array_t *array)" -->
+<a class="anchor" id="aad322d923e2d9c3141cc50863d627b25"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -943,12 +926,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac6a4aa7bda3af1ae03d87f243311ebba"></a><!-- doxytag: member="dither.h::stp_dither_set_adaptive_limit" ref="ac6a4aa7bda3af1ae03d87f243311ebba" args="(stp_vars_t *v, double limit)" -->
+<a class="anchor" id="ac6a4aa7bda3af1ae03d87f243311ebba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -970,12 +952,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab47439fc32e7f669f8cd6c41acdcf398"></a><!-- doxytag: member="dither.h::stp_dither_set_ink_spread" ref="ab47439fc32e7f669f8cd6c41acdcf398" args="(stp_vars_t *v, int spread)" -->
+<a class="anchor" id="ab47439fc32e7f669f8cd6c41acdcf398"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -997,12 +978,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5b8786ffa17dcc1604521b1d1cc5a3a5"></a><!-- doxytag: member="dither.h::stp_dither_set_inks" ref="a5b8786ffa17dcc1604521b1d1cc5a3a5" args="(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)" -->
+<a class="anchor" id="a5b8786ffa17dcc1604521b1d1cc5a3a5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1060,12 +1040,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af5822743e380d0d51a397dcb3eb6247c"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_full" ref="af5822743e380d0d51a397dcb3eb6247c" args="(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)" -->
+<a class="anchor" id="af5822743e380d0d51a397dcb3eb6247c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1090,7 +1069,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="structstp__shade.html">stp_shade_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="dither_8h.html#a5baefb325bf92b7ca10c2d057c04b835">stp_shade_t</a> *&#160;</td>
           <td class="paramname"><em>shades</em>, </td>
         </tr>
         <tr>
@@ -1111,12 +1090,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4dd13ea23fe601571d864eabae4b0c40"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_simple" ref="a4dd13ea23fe601571d864eabae4b0c40" args="(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)" -->
+<a class="anchor" id="a4dd13ea23fe601571d864eabae4b0c40"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1162,12 +1140,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a57aecb702251a2e18848b02109521aed"></a><!-- doxytag: member="dither.h::stp_dither_set_iterated_matrix" ref="a57aecb702251a2e18848b02109521aed" args="(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)" -->
+<a class="anchor" id="a57aecb702251a2e18848b02109521aed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1219,12 +1196,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa973f651768626a6eb7ab9ad4ce09b2c"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix" ref="aa973f651768626a6eb7ab9ad4ce09b2c" args="(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)" -->
+<a class="anchor" id="aa973f651768626a6eb7ab9ad4ce09b2c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1237,7 +1213,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="dither_8h.html#a9f5f63d4f792df1d7becccf3fb5c8fdd">stp_dither_matrix_generic_t</a> *&#160;</td>
           <td class="paramname"><em>mat</em>, </td>
         </tr>
         <tr>
@@ -1264,12 +1240,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3155913bdc63c0545786fc427ca2396a"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix_from_dither_array" ref="a3155913bdc63c0545786fc427ca2396a" args="(stp_vars_t *v, const stp_array_t *array, int transpose)" -->
+<a class="anchor" id="a3155913bdc63c0545786fc427ca2396a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1297,12 +1272,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a560bcf46dfa233a01bdf6042e4680f54"></a><!-- doxytag: member="dither.h::stp_dither_set_randomizer" ref="a560bcf46dfa233a01bdf6042e4680f54" args="(stp_vars_t *v, int color, double)" -->
+<a class="anchor" id="a560bcf46dfa233a01bdf6042e4680f54"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1330,12 +1304,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6f4efd170562a43139f7d6a4b41ecaf3"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="a6f4efd170562a43139f7d6a4b41ecaf3" args="(stp_vars_t *v, double)" -->
+<a class="anchor" id="a6f4efd170562a43139f7d6a4b41ecaf3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1357,12 +1330,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac523d1ba539398308a7ea83f4188d6ae"></a><!-- doxytag: member="dither.h::stp_find_standard_dither_array" ref="ac523d1ba539398308a7ea83f4188d6ae" args="(int x_aspect, int y_aspect)" -->
+<a class="anchor" id="ac523d1ba539398308a7ea83f4188d6ae"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1384,14 +1356,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index 74445fe..ceac83e 100644
--- a/doc/gutenprint/html/doxygen.css
+++ b/doc/gutenprint/html/doxygen.css
@@ -2,7 +2,8 @@
 
 body, table, div, p, dl {
 	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size: 12px;
+	font-size: 13px;
+	line-height: 1.3;
 }
 
 /* @group Heading Levels */
@@ -25,6 +26,19 @@ h3 {
 	font-size: 100%;
 }
 
+h1, h2, h3, h4, h5, h6 {
+	-webkit-transition: text-shadow 0.5s linear;
+	-moz-transition: text-shadow 0.5s linear;
+	-ms-transition: text-shadow 0.5s linear;
+	-o-transition: text-shadow 0.5s linear;
+	transition: text-shadow 0.5s linear;
+	margin-right: 15px;
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+	text-shadow: 0 0 15px cyan;
+}
+
 dt {
 	font-weight: bold;
 }
@@ -72,8 +86,6 @@ div.qindex, div.navtab{
 	background-color: #EBEFF6;
 	border: 1px solid #A3B4D7;
 	text-align: center;
-	margin: 2px;
-	padding: 2px;
 }
 
 div.qindex, div.navpath {
@@ -123,12 +135,12 @@ a.el {
 a.elRef {
 }
 
-a.code {
-	color: #4665A2;
+a.code, a.code:visited {
+	color: #4665A2; 
 }
 
-a.codeRef {
-	color: #4665A2;
+a.codeRef, a.codeRef:visited {
+	color: #4665A2; 
 }
 
 /* @end */
@@ -137,20 +149,56 @@ dl.el {
 	margin-left: -1cm;
 }
 
-.fragment {
+pre.fragment {
+        border: 1px solid #C4CFE5;
+        background-color: #FBFCFD;
+        padding: 4px 6px;
+        margin: 4px 8px 4px 2px;
+        overflow: auto;
+        word-wrap: break-word;
+        font-size:  9pt;
+        line-height: 125%;
+        font-family: monospace, fixed;
+        font-size: 105%;
+}
+
+div.fragment {
+        padding: 4px;
+        margin: 4px;
+	background-color: #FBFCFD;
+	border: 1px solid #C4CFE5;
+}
+
+div.line {
 	font-family: monospace, fixed;
-	font-size: 105%;
+        font-size: 13px;
+	min-height: 13px;
+	line-height: 1.0;
+	text-wrap: unrestricted;
+	white-space: -moz-pre-wrap; /* Moz */
+	white-space: -pre-wrap;     /* Opera 4-6 */
+	white-space: -o-pre-wrap;   /* Opera 7 */
+	white-space: pre-wrap;      /* CSS3  */
+	word-wrap: break-word;      /* IE 5.5+ */
+	text-indent: -53px;
+	padding-left: 53px;
+	padding-bottom: 0px;
+	margin: 0px;
 }
 
-pre.fragment {
-	border: 1px solid #C4CFE5;
-	background-color: #FBFCFD;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-	overflow: auto;
-	word-wrap: break-word;
-	font-size:  9pt;
-	line-height: 125%;
+span.lineno {
+	padding-right: 4px;
+	text-align: right;
+	border-right: 2px solid #0F0;
+	background-color: #E8E8E8;
+        white-space: pre;
+}
+span.lineno a {
+	background-color: #D8D8D8;
+}
+
+span.lineno a:hover {
+	background-color: #C8C8C8;
 }
 
 div.ah {
@@ -183,15 +231,15 @@ div.groupText {
 }
 
 body {
-	background: white;
+	background-color: white;
 	color: black;
         margin: 0;
 }
 
 div.contents {
 	margin-top: 10px;
-	margin-left: 10px;
-	margin-right: 5px;
+	margin-left: 12px;
+	margin-right: 8px;
 }
 
 td.indexkey {
@@ -200,6 +248,8 @@ td.indexkey {
 	border: 1px solid #C4CFE5;
 	margin: 2px 0px 2px 0;
 	padding: 2px 10px;
+        white-space: nowrap;
+        vertical-align: top;
 }
 
 td.indexvalue {
@@ -292,6 +342,13 @@ span.vhdllogic {
 	color: #ff0000 
 }
 
+blockquote {
+        background-color: #F7F8FB;
+        border-left: 2px solid #9CAFD4;
+        margin: 0 24px 0 4px;
+        padding: 0 12px 0 16px;
+}
+
 /* @end */
 
 /*
@@ -345,6 +402,24 @@ table.memberdecls {
 	padding: 0px;
 }
 
+.memberdecls td {
+	-webkit-transition-property: background-color, box-shadow;
+	-webkit-transition-duration: 0.5s;
+	-moz-transition-property: background-color, box-shadow;
+	-moz-transition-duration: 0.5s;
+	-ms-transition-property: background-color, box-shadow;
+	-ms-transition-duration: 0.5s;
+	-o-transition-property: background-color, box-shadow;
+	-o-transition-duration: 0.5s;
+	transition-property: background-color, box-shadow;
+	transition-duration: 0.5s;
+}
+
+.memberdecls td.glow {
+	background-color: cyan;
+	box-shadow: 0 0 15px cyan;
+}
+
 .mdescLeft, .mdescRight,
 .memItemLeft, .memItemRight,
 .memTemplItemLeft, .memTemplItemRight, .memTemplParams {
@@ -406,15 +481,27 @@ table.memberdecls {
 	padding: 0;
 	margin-bottom: 10px;
 	margin-right: 5px;
+        -webkit-transition: box-shadow 0.5s linear;
+        -moz-transition: box-shadow 0.5s linear;
+        -ms-transition: box-shadow 0.5s linear;
+        -o-transition: box-shadow 0.5s linear;
+        transition: box-shadow 0.5s linear;
+}
+
+.memitem.glow {
+         box-shadow: 0 0 15px cyan;
 }
 
 .memname {
-        white-space: nowrap;
         font-weight: bold;
         margin-left: 6px;
 }
 
-.memproto {
+.memname td {
+	vertical-align: bottom;
+}
+
+.memproto, dl.reflist dt {
         border-top: 1px solid #A8B8D9;
         border-left: 1px solid #A8B8D9;
         border-right: 1px solid #A8B8D9;
@@ -422,45 +509,55 @@ table.memberdecls {
         color: #253555;
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
         /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
         /* firefox specific markup */
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 8px;
-        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 4px;
+        -moz-border-radius-topleft: 4px;
         /* webkit specific markup */
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 8px;
-        -webkit-border-top-left-radius: 8px;
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
+        -webkit-border-top-right-radius: 4px;
+        -webkit-border-top-left-radius: 4px;
 
 }
 
-.memdoc {
+.memdoc, dl.reflist dd {
         border-bottom: 1px solid #A8B8D9;      
         border-left: 1px solid #A8B8D9;      
         border-right: 1px solid #A8B8D9; 
-        padding: 2px 5px;
+        padding: 6px 10px 2px 10px;
         background-color: #FBFCFD;
         border-top-width: 0;
+        background-image:url('nav_g.png');
+        background-repeat:repeat-x;
+        background-color: #FFFFFF;
         /* opera specific markup */
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         /* firefox specific markup */
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
+        -moz-border-radius-bottomleft: 4px;
+        -moz-border-radius-bottomright: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
         /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
+        -webkit-border-bottom-left-radius: 4px;
+        -webkit-border-bottom-right-radius: 4px;
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
+}
+
+dl.reflist dt {
+        padding: 5px;
+}
+
+dl.reflist dd {
+        margin: 0px 0px 10px 0px;
+        padding: 5px;
 }
 
 .paramkey {
@@ -480,7 +577,8 @@ table.memberdecls {
 }
 
 .params, .retval, .exception, .tparams {
-        border-spacing: 6px 2px;
+        margin-left: 0px;
+        padding-left: 0px;
 }       
 
 .params .paramname, .retval .paramname {
@@ -498,105 +596,110 @@ table.memberdecls {
         vertical-align: top;
 }
 
+table.mlabels {
+	border-spacing: 0px;
+}
 
-
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0px;
+td.mlabels-left {
+	width: 100%;
+	padding: 0px;
 }
 
-/* these are for tree view when used as main index */
+td.mlabels-right {
+	vertical-align: bottom;
+	padding: 0px;
+	white-space: nowrap;
+}
 
-.directory {
-	font-size: 9pt;
-	font-weight: bold;
-	margin: 5px;
+span.mlabels {
+        margin-left: 8px;
 }
 
-.directory h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+span.mlabel {
+        background-color: #728DC1;
+        border-top:1px solid #5373B4;
+        border-left:1px solid #5373B4;
+        border-right:1px solid #C4CFE5;
+        border-bottom:1px solid #C4CFE5;
+	text-shadow: none;
+        color: white;
+        margin-right: 4px;
+        padding: 2px 3px;
+        border-radius: 3px;
+        font-size: 7pt;
+	white-space: nowrap;
 }
 
-/*
-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;
-}
+/* @end */
 
-.directory p {
-	margin: 0px;
-	white-space: nowrap;
-}
+/* these are for tree view when not used as main index */
 
-.directory div {
-	display: none;
-	margin: 0px;
+div.directory {
+        margin: 10px 0px;
+        border-top: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
 }
 
-.directory img {
-	vertical-align: -30%;
+.directory table {
+        border-collapse:collapse;
 }
 
-/* these are for tree view when not used as main index */
-
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
+.directory td {
+        margin: 0px;
+        padding: 0px;
+	vertical-align: top;
 }
 
-.directory-alt h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+.directory td.entry {
+        white-space: nowrap;
+        padding-right: 6px;
 }
 
-.directory-alt > h3 {
-	margin-top: 0;
+.directory td.entry a {
+        outline:none;
 }
 
-.directory-alt p {
-	margin: 0px;
-	white-space: nowrap;
+.directory td.desc {
+        width: 100%;
+        padding-left: 6px;
+	padding-right: 6px;
+	border-left: 1px solid rgba(0,0,0,0.05);
 }
 
-.directory-alt div {
-	display: none;
-	margin: 0px;
+.directory tr.even {
+	padding-left: 6px;
+	background-color: #F7F8FB;
 }
 
-.directory-alt img {
+.directory img {
 	vertical-align: -30%;
 }
 
-/* @end */
+.directory .levels {
+        white-space: nowrap;
+        width: 100%;
+        text-align: right;
+        font-size: 9pt;
+}
+
+.directory .levels span {
+        cursor: pointer;
+        padding-left: 2px;
+        padding-right: 2px;
+	color: #3D578C;
+}
 
 div.dynheader {
         margin-top: 8px;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 
 address {
@@ -606,6 +709,8 @@ address {
 
 table.doxtable {
 	border-collapse:collapse;
+        margin-top: 4px;
+        margin-bottom: 4px;
 }
 
 table.doxtable td, table.doxtable th {
@@ -619,9 +724,60 @@ table.doxtable th {
 	font-size: 110%;
 	padding-bottom: 4px;
 	padding-top: 5px;
-	text-align:left;
 }
 
+table.fieldtable {
+        width: 100%;
+        margin-bottom: 10px;
+        border: 1px solid #A8B8D9;
+        border-spacing: 0px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        border-radius: 4px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+}
+
+.fieldtable td, .fieldtable th {
+        padding: 3px 7px 2px;
+}
+
+.fieldtable td.fieldtype, .fieldtable td.fieldname {
+        white-space: nowrap;
+        border-right: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        vertical-align: top;
+}
+
+.fieldtable td.fielddoc {
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
+}
+
+.fieldtable tr:last-child td {
+        border-bottom: none;
+}
+
+.fieldtable th {
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
+        font-size: 90%;
+        color: #253555;
+        padding-bottom: 4px;
+        padding-top: 5px;
+        text-align:left;
+        -moz-border-radius-topleft: 4px;
+        -moz-border-radius-topright: 4px;
+        -webkit-border-top-left-radius: 4px;
+        -webkit-border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+        border-bottom: 1px solid #A8B8D9;
+}
+
+
 .tabsearch {
 	top: 0px;
 	left: 10px;
@@ -701,6 +857,7 @@ div.summary a
 
 div.ingroups
 {
+	margin-left: 5px;
 	font-size: 8pt;
 	padding-left: 5px;
 	width: 50%;
@@ -723,7 +880,7 @@ div.header
 
 div.headertitle
 {
-	padding: 5px 5px 5px 10px;
+	padding: 5px 5px 5px 7px;
 }
 
 dl
@@ -731,47 +888,74 @@ dl
         padding: 0 0 0 10px;
 }
 
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
 {
-        border-left:4px solid;
-        padding: 0 0 0 6px;
+	margin-left: 0px;
+	padding-left: 0px;
 }
 
 dl.note
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #D0C000;
 }
 
 dl.warning, dl.attention
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #FF0000;
 }
 
 dl.pre, dl.post, dl.invariant
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00D000;
 }
 
 dl.deprecated
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #505050;
 }
 
 dl.todo
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00C0E0;
 }
 
 dl.test
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #3030E0;
 }
 
 dl.bug
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #C08050;
 }
 
+dl.section dd {
+	margin-bottom: 6px;
+}
+
+
 #projectlogo
 {
 	text-align: center;
@@ -833,3 +1017,117 @@ dl.bug
 	font-weight: bold;
 }
 
+div.zoom
+{
+	border: 1px solid #90A5CE;
+}
+
+dl.citelist {
+        margin-bottom:50px;
+}
+
+dl.citelist dt {
+        color:#334975;
+        float:left;
+        font-weight:bold;
+        margin-right:10px;
+        padding:5px;
+}
+
+dl.citelist dd {
+        margin:2px 0;
+        padding:5px 0;
+}
+
+div.toc {
+        padding: 14px 25px;
+        background-color: #F4F6FA;
+        border: 1px solid #D8DFEE;
+        border-radius: 7px 7px 7px 7px;
+        float: right;
+        height: auto;
+        margin: 0 20px 10px 10px;
+        width: 200px;
+}
+
+div.toc li {
+        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        margin-top: 5px;
+        padding-left: 10px;
+        padding-top: 2px;
+}
+
+div.toc h3 {
+        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+	color: #4665A2;
+        border-bottom: 0 none;
+        margin: 0;
+}
+
+div.toc ul {
+        list-style: none outside none;
+        border: medium none;
+        padding: 0px;
+}       
+
+div.toc li.level1 {
+        margin-left: 0px;
+}
+
+div.toc li.level2 {
+        margin-left: 15px;
+}
+
+div.toc li.level3 {
+        margin-left: 30px;
+}
+
+div.toc li.level4 {
+        margin-left: 45px;
+}
+
+.inherit_header {
+        font-weight: bold;
+        color: gray;
+        cursor: pointer;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+.inherit_header td {
+        padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+        display: none;
+}
+
+tr.heading h2 {
+        margin-top: 12px;
+        margin-bottom: 4px;
+}
+
+@media print
+{
+  #top { display: none; }
+  #side-nav { display: none; }
+  #nav-path { display: none; }
+  body { overflow:visible; }
+  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
+  .summary { display: none; }
+  .memitem { page-break-inside: avoid; }
+  #doc-content
+  {
+    margin-left:0 !important;
+    height:auto !important;
+    width:auto !important;
+    overflow:inherit;
+    display:inline;
+  }
+}
+
diff --git a/doc/gutenprint/html/doxygen.png b/doc/gutenprint/html/doxygen.png
index 635ed52..3ff17d8 100644
--- a/doc/gutenprint/html/doxygen.png
+++ b/doc/gutenprint/html/doxygen.png
diff --git a/doc/gutenprint/html/dynsections.js b/doc/gutenprint/html/dynsections.js
new file mode 100644
index 0000000..116542f
--- /dev/null
+++ b/doc/gutenprint/html/dynsections.js
@@ -0,0 +1,78 @@
+function toggleVisibility(linkObj)
+{
+ var base = $(linkObj).attr('id');
+ var summary = $('#'+base+'-summary');
+ var content = $('#'+base+'-content');
+ var trigger = $('#'+base+'-trigger');
+ var src=$(trigger).attr('src');
+ if (content.is(':visible')===true) {
+   content.hide();
+   summary.show();
+   $(linkObj).addClass('closed').removeClass('opened');
+   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
+ } else {
+   content.show();
+   summary.hide();
+   $(linkObj).removeClass('closed').addClass('opened');
+   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
+ } 
+ return false;
+}
+
+function updateStripes()
+{
+  $('table.directory tr').
+       removeClass('even').filter(':visible:even').addClass('even');
+}
+function toggleLevel(level)
+{
+  $('table.directory tr').each(function(){ 
+    var l = this.id.split('_').length-1;
+    var i = $('#img'+this.id.substring(3));
+    var a = $('#arr'+this.id.substring(3));
+    if (l<level+1) {
+      i.attr('src','ftv2folderopen.png');
+      a.attr('src','ftv2mnode.png');
+      $(this).show();
+    } else if (l==level+1) {
+      i.attr('src','ftv2folderclosed.png');
+      a.attr('src','ftv2pnode.png');
+      $(this).show();
+    } else {
+      $(this).hide();
+    }
+  });
+  updateStripes();
+}
+function toggleFolder(id) 
+{
+  var n = $('[id^=row_'+id+']');
+  var i = $('[id^=img_'+id+']');
+  var a = $('[id^=arr_'+id+']');
+  var c = n.slice(1);
+  if (c.filter(':first').is(':visible')===true) {
+    i.attr('src','ftv2folderclosed.png');
+    a.attr('src','ftv2pnode.png');
+    c.hide();
+  } else {
+    i.attr('src','ftv2folderopen.png');
+    a.attr('src','ftv2mnode.png');
+    c.show();
+  }
+  updateStripes();
+}
+
+function toggleInherit(id)
+{
+  var rows = $('tr.inherit.'+id);
+  var img = $('tr.inherit_header.'+id+' img');
+  var src = $(img).attr('src');
+  if (rows.filter(':first').is(':visible')===true) {
+    rows.css('display','none');
+    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
+  } else {
+    rows.css('display','table-row'); // using show() causes jump in firefox
+    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
+  }
+}
+
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 2fdd122..61aba07 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: File List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,42 +41,49 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">File List</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here is a list of all files with brief descriptions:</div><table>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue">Array functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue">Bit operations </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="channel_8h.html">channel.h</a></td><td class="indexvalue">Channel functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="color_8h.html">color.h</a></td><td class="indexvalue">Color functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></td><td class="indexvalue">Curve caching functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue">Curve functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></td><td class="indexvalue">Dither functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl-internal_8h.html">gutenprint-intl-internal.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-intl_8h.html">gutenprint-intl.h</a></td><td class="indexvalue">Internationalisation functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-module_8h.html">gutenprint-module.h</a></td><td class="indexvalue">Gutenprint module header </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint-version_8h.html">gutenprint-version.h</a></td><td class="indexvalue">Version functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="gutenprint_8h.html">gutenprint.h</a></td><td class="indexvalue">Gutenprint master header </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="image_8h.html">image.h</a></td><td class="indexvalue">Image functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="list_8h.html">list.h</a></td><td class="indexvalue">Generic list functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="module_8h.html">module.h</a></td><td class="indexvalue">Module functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></td><td class="indexvalue">Mini-XML XML parsing functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></td><td class="indexvalue">Paper size functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="path_8h.html">path.h</a></td><td class="indexvalue">Simple directory path functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></td><td class="indexvalue">Printer functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="sequence_8h.html">sequence.h</a></td><td class="indexvalue">Sequence functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></td><td class="indexvalue">String list functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="util_8h.html">util.h</a></td><td class="indexvalue">Utility functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></td><td class="indexvalue">Print job functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
-  <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
+<div class="textblock">Here is a list of all files with brief descriptions:</div><div class="directory">
+<div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span><span onclick="javascript:toggleLevel(3);">3</span>]</div><table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img id="arr_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('0_')"/><img id="img_0_" src="ftv2folderopen.png" alt="-" width="24" height="22" onclick="toggleFolder('0_')"/><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html" target="_self">include</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img id="arr_0_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('0_0_')"/><img id="img_0_0_" src="ftv2folderopen.png" alt="-" width="24" height="22" onclick="toggleFolder('0_0_')"/><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html" target="_self">gutenprint</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_0_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="array_8h.html" target="_self">array.h</a></td><td class="desc">Array functions</td></tr>
+<tr id="row_0_0_1_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="bit-ops_8h.html" target="_self">bit-ops.h</a></td><td class="desc">Bit operations</td></tr>
+<tr id="row_0_0_2_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="channel_8h.html" target="_self">channel.h</a></td><td class="desc">Channel functions</td></tr>
+<tr id="row_0_0_3_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="color_8h.html" target="_self">color.h</a></td><td class="desc">Color functions</td></tr>
+<tr id="row_0_0_4_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="curve-cache_8h.html" target="_self">curve-cache.h</a></td><td class="desc">Curve caching functions</td></tr>
+<tr id="row_0_0_5_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="curve_8h.html" target="_self">curve.h</a></td><td class="desc">Curve functions</td></tr>
+<tr id="row_0_0_6_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dither_8h.html" target="_self">dither.h</a></td><td class="desc">Dither functions</td></tr>
+<tr id="row_0_0_7_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprint-intl-internal_8h.html" target="_self">gutenprint-intl-internal.h</a></td><td class="desc">Internationalisation functions</td></tr>
+<tr id="row_0_0_8_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprint-intl_8h.html" target="_self">gutenprint-intl.h</a></td><td class="desc">Internationalisation functions</td></tr>
+<tr id="row_0_0_9_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprint-module_8h.html" target="_self">gutenprint-module.h</a></td><td class="desc">Gutenprint module header</td></tr>
+<tr id="row_0_0_10_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprint-version_8h.html" target="_self">gutenprint-version.h</a></td><td class="desc">Version functions</td></tr>
+<tr id="row_0_0_11_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprint_8h.html" target="_self">gutenprint.h</a></td><td class="desc">Gutenprint master header</td></tr>
+<tr id="row_0_0_12_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="image_8h.html" target="_self">image.h</a></td><td class="desc">Image functions</td></tr>
+<tr id="row_0_0_13_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="list_8h.html" target="_self">list.h</a></td><td class="desc">Generic list functions</td></tr>
+<tr id="row_0_0_14_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="module_8h.html" target="_self">module.h</a></td><td class="desc">Module functions</td></tr>
+<tr id="row_0_0_15_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="mxml_8h.html" target="_self">mxml.h</a></td><td class="desc">Mini-XML XML parsing functions</td></tr>
+<tr id="row_0_0_16_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="paper_8h.html" target="_self">paper.h</a></td><td class="desc">Paper size functions</td></tr>
+<tr id="row_0_0_17_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="path_8h.html" target="_self">path.h</a></td><td class="desc">Simple directory path functions</td></tr>
+<tr id="row_0_0_18_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="printers_8h.html" target="_self">printers.h</a></td><td class="desc">Printer functions</td></tr>
+<tr id="row_0_0_19_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="sequence_8h.html" target="_self">sequence.h</a></td><td class="desc">Sequence functions</td></tr>
+<tr id="row_0_0_20_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="string-list_8h.html" target="_self">string-list.h</a></td><td class="desc">String list functions</td></tr>
+<tr id="row_0_0_21_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="util_8h.html" target="_self">util.h</a></td><td class="desc">Utility functions</td></tr>
+<tr id="row_0_0_22_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="vars_8h.html" target="_self">vars.h</a></td><td class="desc">Print job functions</td></tr>
+<tr id="row_0_0_23_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="weave_8h.html" target="_self">weave.h</a></td><td class="desc">Softweave functions</td></tr>
+<tr id="row_0_0_24_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="xml_8h.html" target="_self">xml.h</a></td><td class="desc">XML tree functions</td></tr>
 </table>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/ftv2blank.png b/doc/gutenprint/html/ftv2blank.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprint/html/ftv2blank.png
diff --git a/doc/gutenprint/html/ftv2cl.png b/doc/gutenprint/html/ftv2cl.png
new file mode 100644
index 0000000..132f657
--- /dev/null
+++ b/doc/gutenprint/html/ftv2cl.png
diff --git a/doc/gutenprint/html/ftv2doc.png b/doc/gutenprint/html/ftv2doc.png
new file mode 100644
index 0000000..17edabf
--- /dev/null
+++ b/doc/gutenprint/html/ftv2doc.png
diff --git a/doc/gutenprint/html/ftv2folderclosed.png b/doc/gutenprint/html/ftv2folderclosed.png
new file mode 100644
index 0000000..bb8ab35
--- /dev/null
+++ b/doc/gutenprint/html/ftv2folderclosed.png
diff --git a/doc/gutenprint/html/ftv2folderopen.png b/doc/gutenprint/html/ftv2folderopen.png
new file mode 100644
index 0000000..d6c7f67
--- /dev/null
+++ b/doc/gutenprint/html/ftv2folderopen.png
diff --git a/doc/gutenprint/html/ftv2lastnode.png b/doc/gutenprint/html/ftv2lastnode.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprint/html/ftv2lastnode.png
diff --git a/doc/gutenprint/html/ftv2link.png b/doc/gutenprint/html/ftv2link.png
new file mode 100644
index 0000000..17edabf
--- /dev/null
+++ b/doc/gutenprint/html/ftv2link.png
diff --git a/doc/gutenprint/html/ftv2mlastnode.png b/doc/gutenprint/html/ftv2mlastnode.png
new file mode 100644
index 0000000..0b63f6d
--- /dev/null
+++ b/doc/gutenprint/html/ftv2mlastnode.png
diff --git a/doc/gutenprint/html/ftv2mnode.png b/doc/gutenprint/html/ftv2mnode.png
new file mode 100644
index 0000000..0b63f6d
--- /dev/null
+++ b/doc/gutenprint/html/ftv2mnode.png
diff --git a/doc/gutenprint/html/ftv2mo.png b/doc/gutenprint/html/ftv2mo.png
new file mode 100644
index 0000000..4bfb80f
--- /dev/null
+++ b/doc/gutenprint/html/ftv2mo.png
diff --git a/doc/gutenprint/html/ftv2node.png b/doc/gutenprint/html/ftv2node.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprint/html/ftv2node.png
diff --git a/doc/gutenprint/html/ftv2ns.png b/doc/gutenprint/html/ftv2ns.png
new file mode 100644
index 0000000..72e3d71
--- /dev/null
+++ b/doc/gutenprint/html/ftv2ns.png
diff --git a/doc/gutenprint/html/ftv2plastnode.png b/doc/gutenprint/html/ftv2plastnode.png
new file mode 100644
index 0000000..c6ee22f
--- /dev/null
+++ b/doc/gutenprint/html/ftv2plastnode.png
diff --git a/doc/gutenprint/html/ftv2pnode.png b/doc/gutenprint/html/ftv2pnode.png
new file mode 100644
index 0000000..c6ee22f
--- /dev/null
+++ b/doc/gutenprint/html/ftv2pnode.png
diff --git a/doc/gutenprint/html/ftv2splitbar.png b/doc/gutenprint/html/ftv2splitbar.png
new file mode 100644
index 0000000..fe895f2
--- /dev/null
+++ b/doc/gutenprint/html/ftv2splitbar.png
diff --git a/doc/gutenprint/html/ftv2vertline.png b/doc/gutenprint/html/ftv2vertline.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprint/html/ftv2vertline.png
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index 43c68a9..aab7fc8 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -69,7 +75,7 @@
       <li><a href="#index_y"><span>y</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all struct and union fields with links to the structures/unions they belong to:</div>
 
@@ -559,9 +565,12 @@
 : <a class="el" href="structdither__matrix__impl.html#a33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index f59099e..bd1faad 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Data Fields - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -69,7 +75,7 @@
       <li><a href="#index_y"><span>y</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -559,9 +565,12 @@
 : <a class="el" href="structdither__matrix__impl.html#a33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 8bdca88..5b7e113 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -72,9 +78,12 @@
 : <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">util.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index c7c763b..2ea0b3c 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -69,9 +75,12 @@
 , <a class="el" href="group__intl.html#gadd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 0bb907c..a47640c 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -77,9 +83,12 @@
 : <a class="el" href="curve-cache_8h.html#a4b278e86a2f914893307fb20cf218e7c">curve-cache.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 95a1c51..f30ea92 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -73,9 +79,12 @@
 , <a class="el" href="group__intl.html#gad24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index bd51c73..4cbaf6c 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -69,9 +75,12 @@
 , <a class="el" href="group__intl.html#ga83b8be0887dede025766d25e2bb884c6">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 32e848e..31ce621 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -69,9 +75,12 @@
 , <a class="el" href="group__intl.html#ga75278405e7f034d2b1af80bfd94675fe">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index f8a3f5f..b87e42f 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -92,9 +98,12 @@
 : <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616">vars.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index daf09ef..de9833d 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -313,6 +319,9 @@
 <li>stp_copy_options()
 : <a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">vars.h</a>
 </li>
+<li>stp_copy_vars_from()
+: <a class="el" href="group__vars.html#gadb632ed2afb82e30c6f1583a69d4a8ce">vars.h</a>
+</li>
 <li>stp_current_interface
 : <a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">gutenprint-version.h</a>
 </li>
@@ -811,6 +820,9 @@
 <li>stp_fold_4bit()
 : <a class="el" href="bit-ops_8h.html#a62ac3ec2651afff5fbe6c63544a13c66">bit-ops.h</a>
 </li>
+<li>stp_fold_8bit()
+: <a class="el" href="bit-ops_8h.html#a4aa21720b86de29d9834cb3ee782491a">bit-ops.h</a>
+</li>
 <li>stp_free()
 : <a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">util.h</a>
 </li>
@@ -2114,9 +2126,12 @@
 : <a class="el" href="path_8h.html#a17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index f24eac2..983bc7d 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -59,7 +65,7 @@
       <li class="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -69,9 +75,12 @@
 , <a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index e295415..0cca726 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li class="current"><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -58,7 +64,7 @@
       <li><a href="#index_t"><span>t</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -303,9 +309,12 @@
 , <a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index e2e85ef..19eec8b 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,10 +49,10 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>stp_curve_bounds_t
@@ -95,9 +101,12 @@
 : <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">weave.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index bdac4aa..f7ed72b 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -52,7 +58,7 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -251,9 +257,12 @@
 : <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991a6077c1fbd3cc6c79a1ac5f23d31bd2b3">weave.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 3908522..2c9e10f 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -51,7 +57,7 @@
       <li class="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -269,6 +275,9 @@
 <li>stp_copy_options()
 : <a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">vars.h</a>
 </li>
+<li>stp_copy_vars_from()
+: <a class="el" href="group__vars.html#gadb632ed2afb82e30c6f1583a69d4a8ce">vars.h</a>
+</li>
 <li>stp_curve_cache_copy()
 : <a class="el" href="curve-cache_8h.html#af5642e9d4e265b8d16db6075e1309a20">curve-cache.h</a>
 </li>
@@ -602,6 +611,9 @@
 <li>stp_fold_4bit()
 : <a class="el" href="bit-ops_8h.html#a62ac3ec2651afff5fbe6c63544a13c66">bit-ops.h</a>
 </li>
+<li>stp_fold_8bit()
+: <a class="el" href="bit-ops_8h.html#a4aa21720b86de29d9834cb3ee782491a">bit-ops.h</a>
+</li>
 <li>stp_free()
 : <a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">util.h</a>
 </li>
@@ -1575,9 +1587,12 @@
 : <a class="el" href="path_8h.html#a17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index 616a519..f7f5b2e 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,7 +49,7 @@
       <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -52,7 +58,7 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -182,9 +188,12 @@
 : <a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">xml.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index 0a4e780..2a8aa3d 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -43,10 +49,10 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>stp_binary_age
@@ -86,9 +92,12 @@
 : <a class="el" href="weave_8h.html#a561a5fd614c279fdc9ea9c14c7a5b540">weave.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 9d7a81d..d13eac6 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: array</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,53 +35,54 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">array</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The array is a simple "two-dimensional array of numbers" data structure.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_array&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The array opaque data type.  <a href="#ga26a474575a39c1c36ad520b95aa813b0"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga26a474575a39c1c36ad520b95aa813b0"><td class="memItemLeft" align="right" valign="top">typedef struct stp_array&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td></tr>
+<tr class="memdesc:ga26a474575a39c1c36ad520b95aa813b0"><td class="mdescLeft">&#160;</td><td class="mdescRight">The array opaque data type.  <a href="#ga26a474575a39c1c36ad520b95aa813b0"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new array.  <a href="#gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an array.  <a href="#gaafb2573df35220ef9be3f6ba4b8c871b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy an array.  <a href="#gaaa9bf798890e01b4bbce8cda45615021"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate an array.  <a href="#gad0b50228ca40df79196197f9c21f4b56"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Resize an array.  <a href="#gae6fb91b246ef5abd388927cb9674503e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the size of an array.  <a href="#gafe61db801ab3b0326646178e536dd161"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in an array.  <a href="#gaea0493f5bec9c5c185679adfde3edc9a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in an array.  <a href="#gae0d44ee80048189d244b16f231c54b80"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#gad6b95b2efd500007b098594826f4467f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#ga9078af984a5e1ec80a6068bdb51c9a6d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#gae05ba5cfe8c03e2435348d6c5488d87e"></a><br/></td></tr>
+<tr class="memitem:gaa3d385d3e2f248b1c1ac88d5f103e9a2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr class="memdesc:gaa3d385d3e2f248b1c1ac88d5f103e9a2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new array.  <a href="#gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a><br/></td></tr>
+<tr class="memitem:gaafb2573df35220ef9be3f6ba4b8c871b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaafb2573df35220ef9be3f6ba4b8c871b">stp_array_destroy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gaafb2573df35220ef9be3f6ba4b8c871b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an array.  <a href="#gaafb2573df35220ef9be3f6ba4b8c871b"></a><br/></td></tr>
+<tr class="memitem:gaaa9bf798890e01b4bbce8cda45615021"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaaa9bf798890e01b4bbce8cda45615021">stp_array_copy</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *source)</td></tr>
+<tr class="memdesc:gaaa9bf798890e01b4bbce8cda45615021"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy an array.  <a href="#gaaa9bf798890e01b4bbce8cda45615021"></a><br/></td></tr>
+<tr class="memitem:gad0b50228ca40df79196197f9c21f4b56"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad0b50228ca40df79196197f9c21f4b56">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gad0b50228ca40df79196197f9c21f4b56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate an array.  <a href="#gad0b50228ca40df79196197f9c21f4b56"></a><br/></td></tr>
+<tr class="memitem:gae6fb91b246ef5abd388927cb9674503e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae6fb91b246ef5abd388927cb9674503e">stp_array_set_size</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr class="memdesc:gae6fb91b246ef5abd388927cb9674503e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resize an array.  <a href="#gae6fb91b246ef5abd388927cb9674503e"></a><br/></td></tr>
+<tr class="memitem:gafe61db801ab3b0326646178e536dd161"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gafe61db801ab3b0326646178e536dd161">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr class="memdesc:gafe61db801ab3b0326646178e536dd161"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the size of an array.  <a href="#gafe61db801ab3b0326646178e536dd161"></a><br/></td></tr>
+<tr class="memitem:gaea0493f5bec9c5c185679adfde3edc9a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaea0493f5bec9c5c185679adfde3edc9a">stp_array_set_data</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr class="memdesc:gaea0493f5bec9c5c185679adfde3edc9a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in an array.  <a href="#gaea0493f5bec9c5c185679adfde3edc9a"></a><br/></td></tr>
+<tr class="memitem:gae0d44ee80048189d244b16f231c54b80"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae0d44ee80048189d244b16f231c54b80">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr class="memdesc:gae0d44ee80048189d244b16f231c54b80"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in an array.  <a href="#gae0d44ee80048189d244b16f231c54b80"></a><br/></td></tr>
+<tr class="memitem:gad6b95b2efd500007b098594826f4467f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gad6b95b2efd500007b098594826f4467f">stp_array_set_point</a> (<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr class="memdesc:gad6b95b2efd500007b098594826f4467f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#gad6b95b2efd500007b098594826f4467f"></a><br/></td></tr>
+<tr class="memitem:ga9078af984a5e1ec80a6068bdb51c9a6d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9078af984a5e1ec80a6068bdb51c9a6d">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr class="memdesc:ga9078af984a5e1ec80a6068bdb51c9a6d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#ga9078af984a5e1ec80a6068bdb51c9a6d"></a><br/></td></tr>
+<tr class="memitem:gae05ba5cfe8c03e2435348d6c5488d87e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gae05ba5cfe8c03e2435348d6c5488d87e">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memdesc:gae05ba5cfe8c03e2435348d6c5488d87e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#gae05ba5cfe8c03e2435348d6c5488d87e"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The array is a simple "two-dimensional array of numbers" data structure. </p>
 <p>array "inherits" from the sequence data structure (implemented via containment). </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga26a474575a39c1c36ad520b95aa813b0"></a><!-- doxytag: member="array.h::stp_array_t" ref="ga26a474575a39c1c36ad520b95aa813b0" args="" -->
+<a class="anchor" id="ga26a474575a39c1c36ad520b95aa813b0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -83,15 +90,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_array <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The array opaque data type. </p>
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="gaaa9bf798890e01b4bbce8cda45615021"></a><!-- doxytag: member="array.h::stp_array_copy" ref="gaaa9bf798890e01b4bbce8cda45615021" args="(stp_array_t *dest, const stp_array_t *source)" -->
+<a class="anchor" id="gaaa9bf798890e01b4bbce8cda45615021"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -113,12 +119,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy an array. </p>
 <p>Both dest and source must be valid arrays previously created with <a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2" title="Create a new array.">stp_array_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination array. </td></tr>
     <tr><td class="paramname">source</td><td>the source array. </td></tr>
@@ -128,7 +133,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a><!-- doxytag: member="array.h::stp_array_create" ref="gaa3d385d3e2f248b1c1ac88d5f103e9a2" args="(int x_size, int y_size)" -->
+<a class="anchor" id="gaa3d385d3e2f248b1c1ac88d5f103e9a2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -150,23 +155,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new array. </p>
 <p>The total size of the array will be (x_size * y_size). </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">x_size</td><td>the number of "columns". </td></tr>
     <tr><td class="paramname">y_size</td><td>the number of "rows". </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created array. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created array. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad0b50228ca40df79196197f9c21f4b56"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="gad0b50228ca40df79196197f9c21f4b56" args="(const stp_array_t *array)" -->
+<a class="anchor" id="gad0b50228ca40df79196197f9c21f4b56"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -178,22 +182,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate an array. </p>
 <p>dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__array.html#gaa3d385d3e2f248b1c1ac88d5f103e9a2" title="Create a new array.">stp_array_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the source array. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the array. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the array. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaafb2573df35220ef9be3f6ba4b8c871b"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="gaafb2573df35220ef9be3f6ba4b8c871b" args="(stp_array_t *array)" -->
+<a class="anchor" id="gaafb2573df35220ef9be3f6ba4b8c871b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -205,12 +208,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy an array. </p>
 <p>It is an error to destroy the array more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to destroy. </td></tr>
   </table>
@@ -219,7 +221,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gae0d44ee80048189d244b16f231c54b80"></a><!-- doxytag: member="array.h::stp_array_get_data" ref="gae0d44ee80048189d244b16f231c54b80" args="(const stp_array_t *array, size_t *size, const double **data)" -->
+<a class="anchor" id="gae0d44ee80048189d244b16f231c54b80"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -247,26 +249,25 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in an array. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to get the data from. </td></tr>
     <tr><td class="paramname">size</td><td>the number of elements in the array (x_size * y_size) are stored in the size_t pointed to. </td></tr>
-    <tr><td class="paramname">data</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0" title="The array opaque data type.">stp_array_t</a> *array;
- <span class="keywordtype">size_t</span> size;
- <span class="keywordtype">double</span> *data;
- <a class="code" href="group__array.html#gae0d44ee80048189d244b16f231c54b80" title="Get the data in an array.">stp_array_get_data</a>(array, &amp;size, &amp;data);
-</pre></div> </td></tr>
+    <tr><td class="paramname">data</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><div class="line"> <a class="code" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0" title="The array opaque data type.">stp_array_t</a> *array;</div>
+<div class="line"> <span class="keywordtype">size_t</span> size;</div>
+<div class="line"> <span class="keywordtype">double</span> *data;</div>
+<div class="line"> <a class="code" href="group__array.html#gae0d44ee80048189d244b16f231c54b80" title="Get the data in an array.">stp_array_get_data</a>(array, &amp;size, &amp;data);</div>
+</div><!-- fragment --> </td></tr>
   </table>
   </dd>
 </dl>
 
 </div>
 </div>
-<a class="anchor" id="ga9078af984a5e1ec80a6068bdb51c9a6d"></a><!-- doxytag: member="array.h::stp_array_get_point" ref="ga9078af984a5e1ec80a6068bdb51c9a6d" args="(const stp_array_t *array, int x, int y, double *data)" -->
+<a class="anchor" id="ga9078af984a5e1ec80a6068bdb51c9a6d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -300,11 +301,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data at a single point in the array. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to use. </td></tr>
     <tr><td class="paramname">x</td><td>the x location. </td></tr>
@@ -313,11 +313,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae05ba5cfe8c03e2435348d6c5488d87e"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="gae05ba5cfe8c03e2435348d6c5488d87e" args="(const stp_array_t *array)" -->
+<a class="anchor" id="gae05ba5cfe8c03e2435348d6c5488d87e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -329,21 +329,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the underlying stp_sequence_t. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the (constant) stp_sequence_t. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the (constant) stp_sequence_t. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gafe61db801ab3b0326646178e536dd161"></a><!-- doxytag: member="array.h::stp_array_get_size" ref="gafe61db801ab3b0326646178e536dd161" args="(const stp_array_t *array, int *x_size, int *y_size)" -->
+<a class="anchor" id="gafe61db801ab3b0326646178e536dd161"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -371,12 +370,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the size of an array. </p>
 <p>The current x and y sizes are stored in the integers pointed to by x_size and y_size. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to get the size of. </td></tr>
     <tr><td class="paramname">x_size</td><td>a pointer to an integer to store the x size in. </td></tr>
@@ -387,7 +385,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaea0493f5bec9c5c185679adfde3edc9a"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="gaea0493f5bec9c5c185679adfde3edc9a" args="(stp_array_t *array, const double *data)" -->
+<a class="anchor" id="gaea0493f5bec9c5c185679adfde3edc9a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -409,21 +407,23 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in an array. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to set. </td></tr>
-    <tr><td class="paramname">data</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size). </td></tr>
+    <tr><td class="paramname">data</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size<ul>
+<li>y_size). </li>
+</ul>
+</td></tr>
   </table>
   </dd>
 </dl>
 
 </div>
 </div>
-<a class="anchor" id="gad6b95b2efd500007b098594826f4467f"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="gad6b95b2efd500007b098594826f4467f" args="(stp_array_t *array, int x, int y, double data)" -->
+<a class="anchor" id="gad6b95b2efd500007b098594826f4467f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -457,11 +457,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data at a single point in the array. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to use. </td></tr>
     <tr><td class="paramname">x</td><td>the x location. </td></tr>
@@ -470,11 +469,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae6fb91b246ef5abd388927cb9674503e"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="gae6fb91b246ef5abd388927cb9674503e" args="(stp_array_t *array, int x_size, int y_size)" -->
+<a class="anchor" id="gae6fb91b246ef5abd388927cb9674503e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -502,12 +501,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Resize an array. </p>
 <p>Resizing an array will destroy all data stored in the array. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">array</td><td>the array to resize. </td></tr>
     <tr><td class="paramname">x_size</td><td>the new number of "columns". </td></tr>
@@ -518,9 +516,12 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 41424f7..071afb2 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: color</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,7 +35,7 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -37,58 +43,59 @@
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">color</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The color data type is responsible for providing colour conversion features.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:gad1408f9835b72f266ec7c7e1e1202a74"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__color.html">stp_color</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gaa282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available color modules.  <a href="#ga68c13c36d723e5604507bf33fe629f8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its name.  <a href="#ga3b8f62108f3604480e7b89b253527f4a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga68ba525119da39ae854645ae649557d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga612389b45f09358f6bad0e376c91b057"></a><br/></td></tr>
+<tr class="memitem:ga23392fc53078d51fcd14d6d565d56423"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga23392fc53078d51fcd14d6d565d56423">stp_color_init</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr class="memitem:ga0cf28c3c9638987df4b1740deadba0cb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0cf28c3c9638987df4b1740deadba0cb">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr class="memitem:gaa282220724877a57738b047140835141"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gaa282220724877a57738b047140835141">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga83bc80c9fd84d741099bc20285a1b655"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga83bc80c9fd84d741099bc20285a1b655">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:ga47d6a8163ef21a6e700b1371228b851d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga47d6a8163ef21a6e700b1371228b851d">stp_color_register</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *color)</td></tr>
+<tr class="memitem:ga2b62ec8e0afe1b6297bc71466f8a334c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2b62ec8e0afe1b6297bc71466f8a334c">stp_color_unregister</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *color)</td></tr>
+<tr class="memitem:ga68c13c36d723e5604507bf33fe629f8b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68c13c36d723e5604507bf33fe629f8b">stp_color_count</a> (void)</td></tr>
+<tr class="memdesc:ga68c13c36d723e5604507bf33fe629f8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available color modules.  <a href="#ga68c13c36d723e5604507bf33fe629f8b"></a><br/></td></tr>
+<tr class="memitem:ga3b8f62108f3604480e7b89b253527f4a"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3b8f62108f3604480e7b89b253527f4a">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr class="memdesc:ga3b8f62108f3604480e7b89b253527f4a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its name.  <a href="#ga3b8f62108f3604480e7b89b253527f4a"></a><br/></td></tr>
+<tr class="memitem:ga68ba525119da39ae854645ae649557d3"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga68ba525119da39ae854645ae649557d3">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:ga68ba525119da39ae854645ae649557d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga68ba525119da39ae854645ae649557d3"></a><br/></td></tr>
+<tr class="memitem:ga578f80b2bc3937df38ce7e803f5f472c"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga578f80b2bc3937df38ce7e803f5f472c">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr class="memitem:ga5a4a4da67cb5c3f1c0a2a9618e46ed50"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5a4a4da67cb5c3f1c0a2a9618e46ed50">stp_color_get_name</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *c)</td></tr>
+<tr class="memdesc:ga5a4a4da67cb5c3f1c0a2a9618e46ed50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><br/></td></tr>
+<tr class="memitem:ga612389b45f09358f6bad0e376c91b057"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga612389b45f09358f6bad0e376c91b057">stp_color_get_long_name</a> (const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *c)</td></tr>
+<tr class="memdesc:ga612389b45f09358f6bad0e376c91b057"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga612389b45f09358f6bad0e376c91b057"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The color data type is responsible for providing colour conversion features. </p>
 <p>Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="gad1408f9835b72f266ec7c7e1e1202a74"></a><!-- doxytag: member="color.h::stp_color_t" ref="gad1408f9835b72f266ec7c7e1e1202a74" args="" -->
+<a class="anchor" id="gad1408f9835b72f266ec7c7e1e1202a74"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__color.html">stp_color</a>  <a class="el" href="structstp__color.html">stp_color_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__color.html">stp_color</a>  <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga68c13c36d723e5604507bf33fe629f8b"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga68c13c36d723e5604507bf33fe629f8b" args="(void)" -->
+<a class="anchor" id="ga68c13c36d723e5604507bf33fe629f8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -100,15 +107,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the number of available color modules. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the number of color modules. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the number of color modules. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga83bc80c9fd84d741099bc20285a1b655"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="ga83bc80c9fd84d741099bc20285a1b655" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<a class="anchor" id="ga83bc80c9fd84d741099bc20285a1b655"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -136,64 +142,61 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga612389b45f09358f6bad0e376c91b057"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga612389b45f09358f6bad0e376c91b057" args="(const stp_color_t *c)" -->
+<a class="anchor" id="ga612389b45f09358f6bad0e376c91b057"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">const char* stp_color_get_long_name </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td>
           <td class="paramname"><em>c</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the long (translated) name of a color module. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">c</td><td>the color module to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the long name. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the long name. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="ga5a4a4da67cb5c3f1c0a2a9618e46ed50" args="(const stp_color_t *c)" -->
+<a class="anchor" id="ga5a4a4da67cb5c3f1c0a2a9618e46ed50"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">const char* stp_color_get_name </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td>
           <td class="paramname"><em>c</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the short (untranslated) name of a color module. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">c</td><td>the color module to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the short name. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the short name. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0cf28c3c9638987df4b1740deadba0cb"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="ga0cf28c3c9638987df4b1740deadba0cb" args="(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" -->
+<a class="anchor" id="ga0cf28c3c9638987df4b1740deadba0cb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -206,7 +209,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>, </td>
         </tr>
         <tr>
@@ -227,12 +230,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga23392fc53078d51fcd14d6d565d56423"></a><!-- doxytag: member="color.h::stp_color_init" ref="ga23392fc53078d51fcd14d6d565d56423" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" -->
+<a class="anchor" id="ga23392fc53078d51fcd14d6d565d56423"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -245,7 +247,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>, </td>
         </tr>
         <tr>
@@ -260,12 +262,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaa282220724877a57738b047140835141"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="gaa282220724877a57738b047140835141" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gaa282220724877a57738b047140835141"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -277,117 +278,114 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga47d6a8163ef21a6e700b1371228b851d"></a><!-- doxytag: member="color.h::stp_color_register" ref="ga47d6a8163ef21a6e700b1371228b851d" args="(const stp_color_t *color)" -->
+<a class="anchor" id="ga47d6a8163ef21a6e700b1371228b851d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_color_register </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td>
           <td class="paramname"><em>color</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga2b62ec8e0afe1b6297bc71466f8a334c"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="ga2b62ec8e0afe1b6297bc71466f8a334c" args="(const stp_color_t *color)" -->
+<a class="anchor" id="ga2b62ec8e0afe1b6297bc71466f8a334c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_color_unregister </td>
           <td>(</td>
-          <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&#160;</td>
+          <td class="paramtype">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a> *&#160;</td>
           <td class="paramname"><em>color</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga578f80b2bc3937df38ce7e803f5f472c"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga578f80b2bc3937df38ce7e803f5f472c" args="(stp_colorfuncs_t *colorfuncs)" -->
+<a class="anchor" id="ga578f80b2bc3937df38ce7e803f5f472c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_colorfuncs </td>
+          <td class="memname">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a>* stp_get_color_by_colorfuncs </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&#160;</td>
           <td class="paramname"><em>colorfuncs</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga68ba525119da39ae854645ae649557d3"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga68ba525119da39ae854645ae649557d3" args="(int idx)" -->
+<a class="anchor" id="ga68ba525119da39ae854645ae649557d3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_index </td>
+          <td class="memname">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a>* stp_get_color_by_index </td>
           <td>(</td>
           <td class="paramtype">int&#160;</td>
           <td class="paramname"><em>idx</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a color module by its index number. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">idx</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3b8f62108f3604480e7b89b253527f4a"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="ga3b8f62108f3604480e7b89b253527f4a" args="(const char *name)" -->
+<a class="anchor" id="ga3b8f62108f3604480e7b89b253527f4a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__color.html">stp_color_t</a>* stp_get_color_by_name </td>
+          <td class="memname">const <a class="el" href="group__color.html#gad1408f9835b72f266ec7c7e1e1202a74">stp_color_t</a>* stp_get_color_by_name </td>
           <td>(</td>
           <td class="paramtype">const char *&#160;</td>
           <td class="paramname"><em>name</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a color module by its name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">name</td><td>the short unique name. number of papers - 1). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index 3d47ac2..b8c8c72 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: curve</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,7 +35,7 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -38,143 +44,146 @@
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">curve</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The curve type models a linear, spline or gamma curve.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_curve&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The curve opaque data type.  <a href="#ga375a2b23705fb0698ae1d823243c8524"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:ga375a2b23705fb0698ae1d823243c8524"><td class="memItemLeft" align="right" valign="top">typedef struct stp_curve&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td></tr>
+<tr class="memdesc:ga375a2b23705fb0698ae1d823243c8524"><td class="mdescLeft">&#160;</td><td class="mdescRight">The curve opaque data type.  <a href="#ga375a2b23705fb0698ae1d823243c8524"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
+<tr class="memitem:ga982f8191c84b049cc3ad3cee1558fc23"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3">STP_CURVE_TYPE_LINEAR</a>, 
 <a class="el" href="group__curve.html#gga982f8191c84b049cc3ad3cee1558fc23afb1ffdc3754f428d8e3a2124e014ff77">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
+<tr class="memdesc:ga982f8191c84b049cc3ad3cee1558fc23"><td class="mdescLeft">&#160;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">More...</a><br/></td></tr>
+<tr class="memitem:ga3ae3af552b490b0ca8b02e442ac9547a"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a">STP_CURVE_WRAP_NONE</a>, 
 <a class="el" href="group__curve.html#gga3ae3af552b490b0ca8b02e442ac9547aac0361aebddfabfb263dc0205a61f6fbd">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
+<tr class="memdesc:ga3ae3af552b490b0ca8b02e442ac9547a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">More...</a><br/></td></tr>
+<tr class="memitem:ga7eddbee28cb1f3c76a19408b86ea142e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3">STP_CURVE_COMPOSE_ADD</a>, 
 <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142ead3bd2cdb63498d5d22686e79e2c0ed95">STP_CURVE_COMPOSE_MULTIPLY</a>, 
 <a class="el" href="group__curve.html#gga7eddbee28cb1f3c76a19408b86ea142ea8de151149fdfd4fcca78826e6352246a">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
+<tr class="memdesc:ga7eddbee28cb1f3c76a19408b86ea142e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">More...</a><br/></td></tr>
+<tr class="memitem:ga86d146e483ca1902f973d574f542b85f"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3">STP_CURVE_BOUNDS_RESCALE</a>, 
 <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85faec9e6673edac9d34e3aad376fa711aa5">STP_CURVE_BOUNDS_CLIP</a>, 
 <a class="el" href="group__curve.html#gga86d146e483ca1902f973d574f542b85fad699d675d5df223055388cd83d0b362b">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memdesc:ga86d146e483ca1902f973d574f542b85f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new curve.  <a href="#ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a curve.  <a href="#ga972ed591394396e0c66e928a0695b3bf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a curve.  <a href="#gacd7861bf1c9d61ac4ec87844a15ab9d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73">stp_curve_create_reverse</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a curve.  <a href="#ga8c2aed234d3e4ddc4c239801be17bb73"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3416157017287eae136fb928802be234">stp_curve_reverse</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a curve.  <a href="#ga3416157017287eae136fb928802be234"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an curve.  <a href="#ga4294b85e848fe421496469e2406ef380"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#gae32fb850963b8694d3739c0ed8475f75"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#ga63c3386fbfd75da9fe985673bf7b1ca3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the wrapping mode.  <a href="#ga859020827897bac0f4671322ec027dc4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#ga29b022a3055afe0b48d1f2736ff2f4da"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#ga766ff02b29b976372779f719076ad017"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#ga82890cef78f5861a88c5789c33693423"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#ga42c98a6a6d2512516738b6df9367510e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga81bceb4cb991cef1cda2298cf7bb9f15"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="#gace09cab4e6ae3d55f75aacae3689e8e6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gabd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#gabd7a39289471607311141c7fc3bbb415"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#gae6a435a21a5c4b5e582d42095a7b06fc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#ga723173297f5b67af937205c7d74ac353"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#ga31e76843f4d2f207701755b58766a670"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#ga2fa5222aab07e85f215e389734b6dbea"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#ga0af395eefa7bfe0d19acc1acbaeefe48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#gab2208f56694e47e4300d10e057f59ee8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#ga79e0d6afa3573917c756af64b56a0d82"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#ga251f105cb5f2b126ea02b7908f717c18"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#gaf59bd38c9dfc7beb08a283dc9e400bf2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#ga24a862eda4cdbb626f51aeb7d8ae9a50"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#ga6de80e81b64262e0051441f697ae4de4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#ga19b3160a57dc6959fe08c631c7206a8a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#ga87c5d1904efa58be8a21ab6b2c41d0b9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaa02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#gaa02125af6b9c192e34985851370391b8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#gade323594e84d4380c88ecf122a5a4da8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#gacb8a2b9b21f97f32faacb99a6125e152"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#ga0420a6cfa87aa96e5c9a56142aa0178d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a point along the curve.  <a href="#ga2d3b8372bde3fce699a3b7bb3c9d8582"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a point along the curve.  <a href="#ga569aae57147ed7681f23e0e60bd8af35"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#gab33642ee6c49334f379a4dc185ecd355"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#ga87298cf562468cbcf2c1f76a0ab80b62"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#gaad611b3ddbd667ec204fa7b42f8d7546"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gac12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a file.  <a href="#gac12af55cf0eb2f76db967886f8996313"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a string.  <a href="#gaf2f0da590278ff74af1eccb0aa0c7169"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga478a24e44a3ce345f7207cf7ded12e37"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="#gad96d7d1cda5f037f7d6a9b651ebbbb46"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a string.  <a href="#gab8c0df217306a6e0597f058efbfaca82"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#ga55c83a9139fc1b06b90e983d7c1ceff7"></a><br/></td></tr>
+<tr class="memitem:ga6b3640f0e25bd9d38e46bdc1b2ee58a4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4">stp_curve_create</a> (<a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr class="memdesc:ga6b3640f0e25bd9d38e46bdc1b2ee58a4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new curve.  <a href="#ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><br/></td></tr>
+<tr class="memitem:ga972ed591394396e0c66e928a0695b3bf"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga972ed591394396e0c66e928a0695b3bf">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga972ed591394396e0c66e928a0695b3bf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a curve.  <a href="#ga972ed591394396e0c66e928a0695b3bf"></a><br/></td></tr>
+<tr class="memitem:gacd7861bf1c9d61ac4ec87844a15ab9d3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacd7861bf1c9d61ac4ec87844a15ab9d3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
+<tr class="memdesc:gacd7861bf1c9d61ac4ec87844a15ab9d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a curve.  <a href="#gacd7861bf1c9d61ac4ec87844a15ab9d3"></a><br/></td></tr>
+<tr class="memitem:ga8c2aed234d3e4ddc4c239801be17bb73"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8c2aed234d3e4ddc4c239801be17bb73">stp_curve_create_reverse</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga8c2aed234d3e4ddc4c239801be17bb73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a curve.  <a href="#ga8c2aed234d3e4ddc4c239801be17bb73"></a><br/></td></tr>
+<tr class="memitem:ga3416157017287eae136fb928802be234"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3416157017287eae136fb928802be234">stp_curve_reverse</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *source)</td></tr>
+<tr class="memdesc:ga3416157017287eae136fb928802be234"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a curve.  <a href="#ga3416157017287eae136fb928802be234"></a><br/></td></tr>
+<tr class="memitem:ga4294b85e848fe421496469e2406ef380"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4294b85e848fe421496469e2406ef380">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga4294b85e848fe421496469e2406ef380"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy an curve.  <a href="#ga4294b85e848fe421496469e2406ef380"></a><br/></td></tr>
+<tr class="memitem:gae32fb850963b8694d3739c0ed8475f75"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae32fb850963b8694d3739c0ed8475f75">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr class="memdesc:gae32fb850963b8694d3739c0ed8475f75"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#gae32fb850963b8694d3739c0ed8475f75"></a><br/></td></tr>
+<tr class="memitem:ga63c3386fbfd75da9fe985673bf7b1ca3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga63c3386fbfd75da9fe985673bf7b1ca3">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr class="memdesc:ga63c3386fbfd75da9fe985673bf7b1ca3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#ga63c3386fbfd75da9fe985673bf7b1ca3"></a><br/></td></tr>
+<tr class="memitem:ga859020827897bac0f4671322ec027dc4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga859020827897bac0f4671322ec027dc4">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga859020827897bac0f4671322ec027dc4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the wrapping mode.  <a href="#ga859020827897bac0f4671322ec027dc4"></a><br/></td></tr>
+<tr class="memitem:ga29b022a3055afe0b48d1f2736ff2f4da"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29b022a3055afe0b48d1f2736ff2f4da">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga29b022a3055afe0b48d1f2736ff2f4da"><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#ga29b022a3055afe0b48d1f2736ff2f4da"></a><br/></td></tr>
+<tr class="memitem:gacb8e51731b9385556747744a0d4f43fb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8e51731b9385556747744a0d4f43fb">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr class="memitem:ga766ff02b29b976372779f719076ad017"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga766ff02b29b976372779f719076ad017">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga766ff02b29b976372779f719076ad017"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#ga766ff02b29b976372779f719076ad017"></a><br/></td></tr>
+<tr class="memitem:ga82890cef78f5861a88c5789c33693423"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga82890cef78f5861a88c5789c33693423">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a> itype)</td></tr>
+<tr class="memdesc:ga82890cef78f5861a88c5789c33693423"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#ga82890cef78f5861a88c5789c33693423"></a><br/></td></tr>
+<tr class="memitem:ga42c98a6a6d2512516738b6df9367510e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42c98a6a6d2512516738b6df9367510e">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga42c98a6a6d2512516738b6df9367510e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#ga42c98a6a6d2512516738b6df9367510e"></a><br/></td></tr>
+<tr class="memitem:ga81bceb4cb991cef1cda2298cf7bb9f15"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga81bceb4cb991cef1cda2298cf7bb9f15">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr class="memdesc:ga81bceb4cb991cef1cda2298cf7bb9f15"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga81bceb4cb991cef1cda2298cf7bb9f15"></a><br/></td></tr>
+<tr class="memitem:gace09cab4e6ae3d55f75aacae3689e8e6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gace09cab4e6ae3d55f75aacae3689e8e6">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr class="memdesc:gace09cab4e6ae3d55f75aacae3689e8e6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set all data points of the curve.  <a href="#gace09cab4e6ae3d55f75aacae3689e8e6"></a><br/></td></tr>
+<tr class="memitem:gabd7a39289471607311141c7fc3bbb415"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gabd7a39289471607311141c7fc3bbb415">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr class="memdesc:gabd7a39289471607311141c7fc3bbb415"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#gabd7a39289471607311141c7fc3bbb415"></a><br/></td></tr>
+<tr class="memitem:gae6a435a21a5c4b5e582d42095a7b06fc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gae6a435a21a5c4b5e582d42095a7b06fc">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr class="memdesc:gae6a435a21a5c4b5e582d42095a7b06fc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#gae6a435a21a5c4b5e582d42095a7b06fc"></a><br/></td></tr>
+<tr class="memitem:ga723173297f5b67af937205c7d74ac353"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga723173297f5b67af937205c7d74ac353">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr class="memdesc:ga723173297f5b67af937205c7d74ac353"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#ga723173297f5b67af937205c7d74ac353"></a><br/></td></tr>
+<tr class="memitem:ga31e76843f4d2f207701755b58766a670"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31e76843f4d2f207701755b58766a670">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr class="memdesc:ga31e76843f4d2f207701755b58766a670"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#ga31e76843f4d2f207701755b58766a670"></a><br/></td></tr>
+<tr class="memitem:ga3ee80f8e4f33691a78b3ad8c3fd7c34f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3ee80f8e4f33691a78b3ad8c3fd7c34f">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr class="memdesc:ga3ee80f8e4f33691a78b3ad8c3fd7c34f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><br/></td></tr>
+<tr class="memitem:ga2fa5222aab07e85f215e389734b6dbea"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2fa5222aab07e85f215e389734b6dbea">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr class="memdesc:ga2fa5222aab07e85f215e389734b6dbea"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#ga2fa5222aab07e85f215e389734b6dbea"></a><br/></td></tr>
+<tr class="memitem:ga0af395eefa7bfe0d19acc1acbaeefe48"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0af395eefa7bfe0d19acc1acbaeefe48">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr class="memdesc:ga0af395eefa7bfe0d19acc1acbaeefe48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#ga0af395eefa7bfe0d19acc1acbaeefe48"></a><br/></td></tr>
+<tr class="memitem:ga5cbf7c4b6ad96ecb35fc06f46c0319f0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5cbf7c4b6ad96ecb35fc06f46c0319f0">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr class="memdesc:ga5cbf7c4b6ad96ecb35fc06f46c0319f0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><br/></td></tr>
+<tr class="memitem:ga73dfcc4c95734449965227e21deb3037"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga73dfcc4c95734449965227e21deb3037">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr class="memitem:gab2208f56694e47e4300d10e057f59ee8"><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab2208f56694e47e4300d10e057f59ee8">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gab2208f56694e47e4300d10e057f59ee8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#gab2208f56694e47e4300d10e057f59ee8"></a><br/></td></tr>
+<tr class="memitem:ga79e0d6afa3573917c756af64b56a0d82"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga79e0d6afa3573917c756af64b56a0d82">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga79e0d6afa3573917c756af64b56a0d82"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#ga79e0d6afa3573917c756af64b56a0d82"></a><br/></td></tr>
+<tr class="memitem:ga251f105cb5f2b126ea02b7908f717c18"><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga251f105cb5f2b126ea02b7908f717c18">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga251f105cb5f2b126ea02b7908f717c18"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#ga251f105cb5f2b126ea02b7908f717c18"></a><br/></td></tr>
+<tr class="memitem:gaf59bd38c9dfc7beb08a283dc9e400bf2"><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf59bd38c9dfc7beb08a283dc9e400bf2">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gaf59bd38c9dfc7beb08a283dc9e400bf2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#gaf59bd38c9dfc7beb08a283dc9e400bf2"></a><br/></td></tr>
+<tr class="memitem:ga24a862eda4cdbb626f51aeb7d8ae9a50"><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24a862eda4cdbb626f51aeb7d8ae9a50">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga24a862eda4cdbb626f51aeb7d8ae9a50"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#ga24a862eda4cdbb626f51aeb7d8ae9a50"></a><br/></td></tr>
+<tr class="memitem:ga6de80e81b64262e0051441f697ae4de4"><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6de80e81b64262e0051441f697ae4de4">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga6de80e81b64262e0051441f697ae4de4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#ga6de80e81b64262e0051441f697ae4de4"></a><br/></td></tr>
+<tr class="memitem:ga19b3160a57dc6959fe08c631c7206a8a"><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19b3160a57dc6959fe08c631c7206a8a">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga19b3160a57dc6959fe08c631c7206a8a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#ga19b3160a57dc6959fe08c631c7206a8a"></a><br/></td></tr>
+<tr class="memitem:ga87c5d1904efa58be8a21ab6b2c41d0b9"><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87c5d1904efa58be8a21ab6b2c41d0b9">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:ga87c5d1904efa58be8a21ab6b2c41d0b9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#ga87c5d1904efa58be8a21ab6b2c41d0b9"></a><br/></td></tr>
+<tr class="memitem:gaa02125af6b9c192e34985851370391b8"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaa02125af6b9c192e34985851370391b8">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr class="memdesc:gaa02125af6b9c192e34985851370391b8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#gaa02125af6b9c192e34985851370391b8"></a><br/></td></tr>
+<tr class="memitem:gade323594e84d4380c88ecf122a5a4da8"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gade323594e84d4380c88ecf122a5a4da8">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gade323594e84d4380c88ecf122a5a4da8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#gade323594e84d4380c88ecf122a5a4da8"></a><br/></td></tr>
+<tr class="memitem:gacb8a2b9b21f97f32faacb99a6125e152"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gacb8a2b9b21f97f32faacb99a6125e152">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr class="memdesc:gacb8a2b9b21f97f32faacb99a6125e152"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#gacb8a2b9b21f97f32faacb99a6125e152"></a><br/></td></tr>
+<tr class="memitem:ga0420a6cfa87aa96e5c9a56142aa0178d"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0420a6cfa87aa96e5c9a56142aa0178d">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:ga0420a6cfa87aa96e5c9a56142aa0178d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#ga0420a6cfa87aa96e5c9a56142aa0178d"></a><br/></td></tr>
+<tr class="memitem:ga2d3b8372bde3fce699a3b7bb3c9d8582"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2d3b8372bde3fce699a3b7bb3c9d8582">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr class="memdesc:ga2d3b8372bde3fce699a3b7bb3c9d8582"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a point along the curve.  <a href="#ga2d3b8372bde3fce699a3b7bb3c9d8582"></a><br/></td></tr>
+<tr class="memitem:ga569aae57147ed7681f23e0e60bd8af35"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga569aae57147ed7681f23e0e60bd8af35">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr class="memdesc:ga569aae57147ed7681f23e0e60bd8af35"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a point along the curve.  <a href="#ga569aae57147ed7681f23e0e60bd8af35"></a><br/></td></tr>
+<tr class="memitem:gab33642ee6c49334f379a4dc185ecd355"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab33642ee6c49334f379a4dc185ecd355">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr class="memdesc:gab33642ee6c49334f379a4dc185ecd355"><td class="mdescLeft">&#160;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#gab33642ee6c49334f379a4dc185ecd355"></a><br/></td></tr>
+<tr class="memitem:ga87298cf562468cbcf2c1f76a0ab80b62"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga87298cf562468cbcf2c1f76a0ab80b62">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr class="memdesc:ga87298cf562468cbcf2c1f76a0ab80b62"><td class="mdescLeft">&#160;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#ga87298cf562468cbcf2c1f76a0ab80b62"></a><br/></td></tr>
+<tr class="memitem:gaad611b3ddbd667ec204fa7b42f8d7546"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaad611b3ddbd667ec204fa7b42f8d7546">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr class="memdesc:gaad611b3ddbd667ec204fa7b42f8d7546"><td class="mdescLeft">&#160;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#gaad611b3ddbd667ec204fa7b42f8d7546"></a><br/></td></tr>
+<tr class="memitem:gac12af55cf0eb2f76db967886f8996313"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gac12af55cf0eb2f76db967886f8996313">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gac12af55cf0eb2f76db967886f8996313"><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a file.  <a href="#gac12af55cf0eb2f76db967886f8996313"></a><br/></td></tr>
+<tr class="memitem:gaf2f0da590278ff74af1eccb0aa0c7169"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf2f0da590278ff74af1eccb0aa0c7169">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memdesc:gaf2f0da590278ff74af1eccb0aa0c7169"><td class="mdescLeft">&#160;</td><td class="mdescRight">Write a curve to a string.  <a href="#gaf2f0da590278ff74af1eccb0aa0c7169"></a><br/></td></tr>
+<tr class="memitem:ga478a24e44a3ce345f7207cf7ded12e37"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga478a24e44a3ce345f7207cf7ded12e37">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr class="memdesc:ga478a24e44a3ce345f7207cf7ded12e37"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga478a24e44a3ce345f7207cf7ded12e37"></a><br/></td></tr>
+<tr class="memitem:gad96d7d1cda5f037f7d6a9b651ebbbb46"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gad96d7d1cda5f037f7d6a9b651ebbbb46">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr class="memdesc:gad96d7d1cda5f037f7d6a9b651ebbbb46"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a stream.  <a href="#gad96d7d1cda5f037f7d6a9b651ebbbb46"></a><br/></td></tr>
+<tr class="memitem:gab8c0df217306a6e0597f058efbfaca82"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gab8c0df217306a6e0597f058efbfaca82">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr class="memdesc:gab8c0df217306a6e0597f058efbfaca82"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a curve from a string.  <a href="#gab8c0df217306a6e0597f058efbfaca82"></a><br/></td></tr>
+<tr class="memitem:ga55c83a9139fc1b06b90e983d7c1ceff7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga55c83a9139fc1b06b90e983d7c1ceff7">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr class="memdesc:ga55c83a9139fc1b06b90e983d7c1ceff7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#ga55c83a9139fc1b06b90e983d7c1ceff7"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The curve type models a linear, spline or gamma curve. </p>
 <p>curve "inherits" from the sequence data structure (implemented via containment), since the curve data is represented internally as a sequence of numbers, for linear and spline curves. Linear Piecewise Curves (LPCs) should be implemented in the future which represent a curve in a more compact format.</p>
 <p>Various operations are supported, including interpolation and composition. </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga375a2b23705fb0698ae1d823243c8524"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="ga375a2b23705fb0698ae1d823243c8524" args="" -->
+<a class="anchor" id="ga375a2b23705fb0698ae1d823243c8524"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -182,15 +191,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_curve <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The curve opaque data type. </p>
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ga86d146e483ca1902f973d574f542b85f"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="ga86d146e483ca1902f973d574f542b85f" args="" -->
+<a class="anchor" id="ga86d146e483ca1902f973d574f542b85f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -198,18 +206,17 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__curve.html#ga86d146e483ca1902f973d574f542b85f">stp_curve_bounds_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Behaviour when curve exceeds bounds. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85fa118d303bf7bdf4f00bda71cc6eac49c3"></a>STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
 <p>Rescale the bounds. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85faec9e6673edac9d34e3aad376fa711aa5"></a><!-- doxytag: member="STP_CURVE_BOUNDS_CLIP" ref="gga86d146e483ca1902f973d574f542b85faec9e6673edac9d34e3aad376fa711aa5" args="" -->STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85faec9e6673edac9d34e3aad376fa711aa5"></a>STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
 <p>Clip the curve to the existing bounds. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85fad699d675d5df223055388cd83d0b362b"></a><!-- doxytag: member="STP_CURVE_BOUNDS_ERROR" ref="gga86d146e483ca1902f973d574f542b85fad699d675d5df223055388cd83d0b362b" args="" -->STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga86d146e483ca1902f973d574f542b85fad699d675d5df223055388cd83d0b362b"></a>STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
 <p>Error if bounds are violated. </p>
 </td></tr>
 </table>
@@ -218,7 +225,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7eddbee28cb1f3c76a19408b86ea142e"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="ga7eddbee28cb1f3c76a19408b86ea142e" args="" -->
+<a class="anchor" id="ga7eddbee28cb1f3c76a19408b86ea142e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -226,18 +233,17 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Composition types. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142eac38b0bf09e93edb67c3e5c53035295f3"></a>STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
 <p>Add composition. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142ead3bd2cdb63498d5d22686e79e2c0ed95"></a><!-- doxytag: member="STP_CURVE_COMPOSE_MULTIPLY" ref="gga7eddbee28cb1f3c76a19408b86ea142ead3bd2cdb63498d5d22686e79e2c0ed95" args="" -->STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142ead3bd2cdb63498d5d22686e79e2c0ed95"></a>STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
 <p>Multiply composition. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142ea8de151149fdfd4fcca78826e6352246a"></a><!-- doxytag: member="STP_CURVE_COMPOSE_EXPONENTIATE" ref="gga7eddbee28cb1f3c76a19408b86ea142ea8de151149fdfd4fcca78826e6352246a" args="" -->STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga7eddbee28cb1f3c76a19408b86ea142ea8de151149fdfd4fcca78826e6352246a"></a>STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
 <p>Exponentiate composition. </p>
 </td></tr>
 </table>
@@ -246,7 +252,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga982f8191c84b049cc3ad3cee1558fc23"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="ga982f8191c84b049cc3ad3cee1558fc23" args="" -->
+<a class="anchor" id="ga982f8191c84b049cc3ad3cee1558fc23"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -254,15 +260,14 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__curve.html#ga982f8191c84b049cc3ad3cee1558fc23">stp_curve_type_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Curve types. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga982f8191c84b049cc3ad3cee1558fc23a46228ddaa2d52a85ccd79c4dc0f76ad3"></a>STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
 <p>Linear interpolation. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga982f8191c84b049cc3ad3cee1558fc23afb1ffdc3754f428d8e3a2124e014ff77"></a><!-- doxytag: member="STP_CURVE_TYPE_SPLINE" ref="gga982f8191c84b049cc3ad3cee1558fc23afb1ffdc3754f428d8e3a2124e014ff77" args="" -->STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga982f8191c84b049cc3ad3cee1558fc23afb1ffdc3754f428d8e3a2124e014ff77"></a>STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
 <p>Spline interpolation. </p>
 </td></tr>
 </table>
@@ -271,7 +276,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga3ae3af552b490b0ca8b02e442ac9547a"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="ga3ae3af552b490b0ca8b02e442ac9547a" args="" -->
+<a class="anchor" id="ga3ae3af552b490b0ca8b02e442ac9547a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -279,15 +284,14 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__curve.html#ga3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Wrapping mode. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga3ae3af552b490b0ca8b02e442ac9547aad840485ad7df768a06ee4be02d93b97a"></a>STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
 <p>The curve does not wrap. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga3ae3af552b490b0ca8b02e442ac9547aac0361aebddfabfb263dc0205a61f6fbd"></a><!-- doxytag: member="STP_CURVE_WRAP_AROUND" ref="gga3ae3af552b490b0ca8b02e442ac9547aac0361aebddfabfb263dc0205a61f6fbd" args="" -->STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga3ae3af552b490b0ca8b02e442ac9547aac0361aebddfabfb263dc0205a61f6fbd"></a>STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
 <p>The curve wraps to its starting point. </p>
 </td></tr>
 </table>
@@ -297,7 +301,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga55c83a9139fc1b06b90e983d7c1ceff7"></a><!-- doxytag: member="curve.h::stp_curve_compose" ref="ga55c83a9139fc1b06b90e983d7c1ceff7" args="(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)" -->
+<a class="anchor" id="ga55c83a9139fc1b06b90e983d7c1ceff7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -337,12 +341,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Compose two curves, creating a third curve. </p>
 <p>Only add and multiply composition is currently supported. If both curves are gamma curves with the same sign, and the operation is multiplication or division, the returned curve is a gamma curve with the appropriate number of points. Both a and b must have the same wraparound type. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">retval</td><td>a pointer to store the location of the newly-created output curve in. </td></tr>
     <tr><td class="paramname">a</td><td>the first source curve. </td></tr>
@@ -352,11 +355,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if element-wise composition fails. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if element-wise composition fails. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gacd7861bf1c9d61ac4ec87844a15ab9d3"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="gacd7861bf1c9d61ac4ec87844a15ab9d3" args="(stp_curve_t *dest, const stp_curve_t *source)" -->
+<a class="anchor" id="gacd7861bf1c9d61ac4ec87844a15ab9d3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -378,12 +381,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy a curve. </p>
 <p>Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination curve. </td></tr>
     <tr><td class="paramname">source</td><td>the source curve. </td></tr>
@@ -393,7 +395,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga766ff02b29b976372779f719076ad017"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="ga766ff02b29b976372779f719076ad017" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga766ff02b29b976372779f719076ad017"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -405,21 +407,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the number of allocated points in the curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the number of points. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the number of points. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="ga6b3640f0e25bd9d38e46bdc1b2ee58a4" args="(stp_curve_wrap_mode_t wrap)" -->
+<a class="anchor" id="ga6b3640f0e25bd9d38e46bdc1b2ee58a4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -431,23 +432,22 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new curve. </p>
 <p>Curves have y=lower..upper. The default bounds are 0..1. The default interpolation type is linear. There are no points allocated, and the gamma is defaulted to 1. The curve is a dense (equally-spaced) curve.</p>
 <p>A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cannot be changed except by routines that destroy the old curve entirely (e. g. stp_curve_copy, stp_curve_read). </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">wrap</td><td>the wrap mode of the curve. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga972ed591394396e0c66e928a0695b3bf"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ga972ed591394396e0c66e928a0695b3bf" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga972ed591394396e0c66e928a0695b3bf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -459,22 +459,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate a curve. </p>
 <p>dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the source curve. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad96d7d1cda5f037f7d6a9b651ebbbb46"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="gad96d7d1cda5f037f7d6a9b651ebbbb46" args="(const char *file)" -->
+<a class="anchor" id="gad96d7d1cda5f037f7d6a9b651ebbbb46"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -486,22 +485,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a curve from a stream. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">file</td><td>the file to read. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga478a24e44a3ce345f7207cf7ded12e37"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="ga478a24e44a3ce345f7207cf7ded12e37" args="(FILE *fp)" -->
+<a class="anchor" id="ga478a24e44a3ce345f7207cf7ded12e37"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -513,22 +511,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a curve from a stream. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">fp</td><td>the stream to read. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab8c0df217306a6e0597f058efbfaca82"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="gab8c0df217306a6e0597f058efbfaca82" args="(const char *string)" -->
+<a class="anchor" id="gab8c0df217306a6e0597f058efbfaca82"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -540,22 +537,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a curve from a string. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">string</td><td>the string to read. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga8c2aed234d3e4ddc4c239801be17bb73"></a><!-- doxytag: member="curve.h::stp_curve_create_reverse" ref="ga8c2aed234d3e4ddc4c239801be17bb73" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga8c2aed234d3e4ddc4c239801be17bb73"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -567,22 +563,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Reverse and allocate a curve. </p>
 <p>dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the source curve. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga4294b85e848fe421496469e2406ef380"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="ga4294b85e848fe421496469e2406ef380" args="(stp_curve_t *curve)" -->
+<a class="anchor" id="ga4294b85e848fe421496469e2406ef380"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -594,12 +589,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy an curve. </p>
 <p>It is an error to destroy the curve more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to destroy. </td></tr>
   </table>
@@ -608,7 +602,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga63c3386fbfd75da9fe985673bf7b1ca3"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="ga63c3386fbfd75da9fe985673bf7b1ca3" args="(const stp_curve_t *curve, double *low, double *high)" -->
+<a class="anchor" id="ga63c3386fbfd75da9fe985673bf7b1ca3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -636,11 +630,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the lower and upper bounds on a curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">low</td><td>a pointer to a double to store the lower bound in. </td></tr>
@@ -651,7 +644,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab2208f56694e47e4300d10e057f59ee8"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="gab2208f56694e47e4300d10e057f59ee8" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="gab2208f56694e47e4300d10e057f59ee8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -673,22 +666,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a pointer to the curve's raw data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga79e0d6afa3573917c756af64b56a0d82"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="ga79e0d6afa3573917c756af64b56a0d82" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga79e0d6afa3573917c756af64b56a0d82"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -710,22 +702,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a pointer to the curve's raw data as points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga251f105cb5f2b126ea02b7908f717c18"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="ga251f105cb5f2b126ea02b7908f717c18" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga251f105cb5f2b126ea02b7908f717c18"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -747,22 +738,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as floats. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0420a6cfa87aa96e5c9a56142aa0178d"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="ga0420a6cfa87aa96e5c9a56142aa0178d" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga0420a6cfa87aa96e5c9a56142aa0178d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -774,15 +764,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the gamma value of the curve. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6de80e81b64262e0051441f697ae4de4"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="ga6de80e81b64262e0051441f697ae4de4" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga6de80e81b64262e0051441f697ae4de4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -804,22 +793,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as integers. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga42c98a6a6d2512516738b6df9367510e"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="ga42c98a6a6d2512516738b6df9367510e" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga42c98a6a6d2512516738b6df9367510e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -831,21 +819,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the curve interpolation type. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the interpolation type. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the interpolation type. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaf59bd38c9dfc7beb08a283dc9e400bf2"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="gaf59bd38c9dfc7beb08a283dc9e400bf2" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="gaf59bd38c9dfc7beb08a283dc9e400bf2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -867,22 +854,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as longs. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga569aae57147ed7681f23e0e60bd8af35"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="ga569aae57147ed7681f23e0e60bd8af35" args="(const stp_curve_t *curve, size_t where, double *data)" -->
+<a class="anchor" id="ga569aae57147ed7681f23e0e60bd8af35"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -910,11 +896,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a point along the curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">where</td><td>the point to get. </td></tr>
@@ -922,11 +907,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gacb8e51731b9385556747744a0d4f43fb"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="gacb8e51731b9385556747744a0d4f43fb" args="(const stp_curve_t *curve, double *low, double *high)" -->
+<a class="anchor" id="gacb8e51731b9385556747744a0d4f43fb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -954,12 +939,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gade323594e84d4380c88ecf122a5a4da8"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="gade323594e84d4380c88ecf122a5a4da8" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="gade323594e84d4380c88ecf122a5a4da8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -971,22 +955,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the underlying stp_sequence_t data structure which stp_curve_t is derived from. </p>
 <p>This can be used for fast access to the raw data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL; </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL; </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga87c5d1904efa58be8a21ab6b2c41d0b9"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="ga87c5d1904efa58be8a21ab6b2c41d0b9" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga87c5d1904efa58be8a21ab6b2c41d0b9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1008,22 +991,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as shorts. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a><!-- doxytag: member="curve.h::stp_curve_get_subrange" ref="ga5cbf7c4b6ad96ecb35fc06f46c0319f0" args="(const stp_curve_t *curve, size_t start, size_t count)" -->
+<a class="anchor" id="ga5cbf7c4b6ad96ecb35fc06f46c0319f0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1051,12 +1033,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a curve containing a subrange of data. </p>
 <p>If the start or count is invalid, the returned curve will compare equal to NULL (i. e. it will be a null pointer). start and count must not exceed the number of points in the curve, and count must be at least 2. The curve must be a dense (equally-spaced) curve </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">start</td><td>the start of the subrange. </td></tr>
@@ -1064,11 +1045,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a curve containing the subrange. The returned curve is non-wrapping. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a curve containing the subrange. The returned curve is non-wrapping. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga19b3160a57dc6959fe08c631c7206a8a"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="ga19b3160a57dc6959fe08c631c7206a8a" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga19b3160a57dc6959fe08c631c7206a8a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1090,22 +1071,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as unsigned integers. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga24a862eda4cdbb626f51aeb7d8ae9a50"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="ga24a862eda4cdbb626f51aeb7d8ae9a50" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="ga24a862eda4cdbb626f51aeb7d8ae9a50"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1127,22 +1107,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as unsigned longs. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaa02125af6b9c192e34985851370391b8"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="gaa02125af6b9c192e34985851370391b8" args="(const stp_curve_t *curve, size_t *count)" -->
+<a class="anchor" id="gaa02125af6b9c192e34985851370391b8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1164,22 +1143,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get pointer to the curve's raw data as unsigned shorts. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga859020827897bac0f4671322ec027dc4"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="ga859020827897bac0f4671322ec027dc4" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga859020827897bac0f4671322ec027dc4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1191,21 +1169,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the wrapping mode. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the wrapping mode. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the wrapping mode. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab33642ee6c49334f379a4dc185ecd355"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="gab33642ee6c49334f379a4dc185ecd355" args="(const stp_curve_t *curve, double where, double *result)" -->
+<a class="anchor" id="gab33642ee6c49334f379a4dc185ecd355"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1233,11 +1210,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Interpolate a point along the curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">where</td><td>the point to interpolate. </td></tr>
@@ -1245,11 +1221,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga29b022a3055afe0b48d1f2736ff2f4da"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="ga29b022a3055afe0b48d1f2736ff2f4da" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ga29b022a3055afe0b48d1f2736ff2f4da"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1261,21 +1237,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Determine whether the curve is piecewise. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>whether the curve is piecewise </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>whether the curve is piecewise </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga87298cf562468cbcf2c1f76a0ab80b62"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="ga87298cf562468cbcf2c1f76a0ab80b62" args="(stp_curve_t *curve, size_t points)" -->
+<a class="anchor" id="ga87298cf562468cbcf2c1f76a0ab80b62"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1297,23 +1272,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Resample a curve (change the number of points). </p>
 <p>This does not destroy the gamma value of a curve. Points are interpolated as required; any interpolation that would place points outside of the bounds of the curve will be clipped to the bounds. The resulting curve is always dense (equally-spaced). This is the correct way to convert a piecewise curve to an equally-spaced curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use (must not exceed 1048576). </td></tr>
     <tr><td class="paramname">points</td><td>the number of points. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaad611b3ddbd667ec204fa7b42f8d7546"></a><!-- doxytag: member="curve.h::stp_curve_rescale" ref="gaad611b3ddbd667ec204fa7b42f8d7546" args="(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)" -->
+<a class="anchor" id="gaad611b3ddbd667ec204fa7b42f8d7546"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1347,12 +1321,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Rescale a curve (multiply all points by a scaling constant). </p>
 <p>This also rescales the bounds. Note that this currently destroys the gamma property of the curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">scale</td><td>the scaling factor. </td></tr>
@@ -1361,11 +1334,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if this would exceed floating point limits </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if this would exceed floating point limits </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3416157017287eae136fb928802be234"></a><!-- doxytag: member="curve.h::stp_curve_reverse" ref="ga3416157017287eae136fb928802be234" args="(stp_curve_t *dest, const stp_curve_t *source)" -->
+<a class="anchor" id="ga3416157017287eae136fb928802be234"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1387,12 +1360,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Reverse a curve. </p>
 <p>Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#ga6b3640f0e25bd9d38e46bdc1b2ee58a4" title="Create a new curve.">stp_curve_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination curve. </td></tr>
     <tr><td class="paramname">source</td><td>the source curve. </td></tr>
@@ -1402,7 +1374,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gae32fb850963b8694d3739c0ed8475f75"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="gae32fb850963b8694d3739c0ed8475f75" args="(stp_curve_t *curve, double low, double high)" -->
+<a class="anchor" id="gae32fb850963b8694d3739c0ed8475f75"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1430,12 +1402,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the lower and upper bounds on a curve. </p>
 <p>To change the bounds adjusting data as required, use stp_curve_rescale instead. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">low</td><td>the lower bound. </td></tr>
@@ -1443,11 +1414,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if any existing points on the curve are outside the bounds. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if any existing points on the curve are outside the bounds. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga81bceb4cb991cef1cda2298cf7bb9f15"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="ga81bceb4cb991cef1cda2298cf7bb9f15" args="(stp_curve_t *curve, size_t count, const double *data)" -->
+<a class="anchor" id="ga81bceb4cb991cef1cda2298cf7bb9f15"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1475,12 +1446,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set all data points of the curve. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1488,11 +1458,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gace09cab4e6ae3d55f75aacae3689e8e6"></a><!-- doxytag: member="curve.h::stp_curve_set_data_points" ref="gace09cab4e6ae3d55f75aacae3689e8e6" args="(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)" -->
+<a class="anchor" id="gace09cab4e6ae3d55f75aacae3689e8e6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1520,12 +1490,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set all data points of the curve. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a piecewise curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1533,11 +1502,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gabd7a39289471607311141c7fc3bbb415"></a><!-- doxytag: member="curve.h::stp_curve_set_float_data" ref="gabd7a39289471607311141c7fc3bbb415" args="(stp_curve_t *curve, size_t count, const float *data)" -->
+<a class="anchor" id="gabd7a39289471607311141c7fc3bbb415"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1565,12 +1534,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from float values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1578,11 +1546,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gacb8a2b9b21f97f32faacb99a6125e152"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="gacb8a2b9b21f97f32faacb99a6125e152" args="(stp_curve_t *curve, double f_gamma)" -->
+<a class="anchor" id="gacb8a2b9b21f97f32faacb99a6125e152"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1604,23 +1572,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the gamma of a curve. </p>
 <p>This replaces all existing points along the curve. The bounds are set to 0..1. If the gamma value is positive, the function is increasing; if negative, the function is decreasing. Count must be either 0 or at least 2. If the count is zero, the gamma of the curve is set for interpolation purposes, but points cannot be assigned to. It is illegal to set gamma on a wrap-mode curve. The resulting curve is treated as a dense (equally-spaced) curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">f_gamma</td><td>the gamma value to set. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga31e76843f4d2f207701755b58766a670"></a><!-- doxytag: member="curve.h::stp_curve_set_int_data" ref="ga31e76843f4d2f207701755b58766a670" args="(stp_curve_t *curve, size_t count, const int *data)" -->
+<a class="anchor" id="ga31e76843f4d2f207701755b58766a670"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1648,12 +1615,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from integer values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1661,11 +1627,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga82890cef78f5861a88c5789c33693423"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="ga82890cef78f5861a88c5789c33693423" args="(stp_curve_t *curve, stp_curve_type_t itype)" -->
+<a class="anchor" id="ga82890cef78f5861a88c5789c33693423"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1687,22 +1653,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the curve interpolation type. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">itype</td><td>the interpolation type. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, or 0 if itype is invalid. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, or 0 if itype is invalid. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae6a435a21a5c4b5e582d42095a7b06fc"></a><!-- doxytag: member="curve.h::stp_curve_set_long_data" ref="gae6a435a21a5c4b5e582d42095a7b06fc" args="(stp_curve_t *curve, size_t count, const long *data)" -->
+<a class="anchor" id="gae6a435a21a5c4b5e582d42095a7b06fc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1730,12 +1695,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from long values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1743,11 +1707,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2d3b8372bde3fce699a3b7bb3c9d8582"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="ga2d3b8372bde3fce699a3b7bb3c9d8582" args="(stp_curve_t *curve, size_t where, double data)" -->
+<a class="anchor" id="ga2d3b8372bde3fce699a3b7bb3c9d8582"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1775,12 +1739,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a point along the curve. </p>
 <p>This call destroys any gamma value assigned to the curve. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">where</td><td>the point to set. </td></tr>
@@ -1788,11 +1751,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2fa5222aab07e85f215e389734b6dbea"></a><!-- doxytag: member="curve.h::stp_curve_set_short_data" ref="ga2fa5222aab07e85f215e389734b6dbea" args="(stp_curve_t *curve, size_t count, const short *data)" -->
+<a class="anchor" id="ga2fa5222aab07e85f215e389734b6dbea"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1820,12 +1783,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from short values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1833,11 +1795,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga73dfcc4c95734449965227e21deb3037"></a><!-- doxytag: member="curve.h::stp_curve_set_subrange" ref="ga73dfcc4c95734449965227e21deb3037" args="(stp_curve_t *curve, const stp_curve_t *range, size_t start)" -->
+<a class="anchor" id="ga73dfcc4c95734449965227e21deb3037"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1865,12 +1827,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a><!-- doxytag: member="curve.h::stp_curve_set_uint_data" ref="ga3ee80f8e4f33691a78b3ad8c3fd7c34f" args="(stp_curve_t *curve, size_t count, const unsigned int *data)" -->
+<a class="anchor" id="ga3ee80f8e4f33691a78b3ad8c3fd7c34f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1898,12 +1859,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from unsigned integer values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1911,11 +1871,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga723173297f5b67af937205c7d74ac353"></a><!-- doxytag: member="curve.h::stp_curve_set_ulong_data" ref="ga723173297f5b67af937205c7d74ac353" args="(stp_curve_t *curve, size_t count, const unsigned long *data)" -->
+<a class="anchor" id="ga723173297f5b67af937205c7d74ac353"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1943,12 +1903,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from unsigned long values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -1956,11 +1915,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0af395eefa7bfe0d19acc1acbaeefe48"></a><!-- doxytag: member="curve.h::stp_curve_set_ushort_data" ref="ga0af395eefa7bfe0d19acc1acbaeefe48" args="(stp_curve_t *curve, size_t count, const unsigned short *data)" -->
+<a class="anchor" id="ga0af395eefa7bfe0d19acc1acbaeefe48"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1988,12 +1947,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data points in a curve from unsigned short values. </p>
 <p>If any of the data points fall outside the bounds, the operation is not performed and FALSE is returned. This creates a curve with equally-spaced points. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
     <tr><td class="paramname">count</td><td>the number of the number of points (must be at least two and not more than 1048576). </td></tr>
@@ -2001,11 +1959,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gac12af55cf0eb2f76db967886f8996313"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="gac12af55cf0eb2f76db967886f8996313" args="(FILE *file, const stp_curve_t *curve)" -->
+<a class="anchor" id="gac12af55cf0eb2f76db967886f8996313"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2027,24 +1985,23 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Write a curve to a file. </p>
 <p>The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, single quote, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">file</td><td>the file to write. </td></tr>
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaf2f0da590278ff74af1eccb0aa0c7169"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="gaf2f0da590278ff74af1eccb0aa0c7169" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="gaf2f0da590278ff74af1eccb0aa0c7169"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2056,25 +2013,27 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Write a curve to a string. </p>
 <p>The printable representation is guaranteed to contain only 7-bit printable ASCII characters, and is null-terminated. The curve will not contain any space, newline, or comma characters. Furthermore, a printed curve will be read back correctly in all locales. These calls are not guaranteed to provide more than 6 decimal places of precision or +/-0.5e-6 accuracy, whichever is less. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>NOTE that these calls are not thread-safe! These routines may manipulate the locale to achieve a safe representation. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">curve</td><td>the curve to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it. </dd></dl>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index 92af836..a30fa65 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: image</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,53 +35,57 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">image</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&#160;&#160;&#160;(32)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga0b7daa7e9e9b26fea847d71ca9de7c02"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&#160;&#160;&#160;(32)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#gaae0b5ef92b619849a51cb75d376a90fb"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:gaae0b5ef92b619849a51cb75d376a90fb"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
+<tr class="memdesc:gaae0b5ef92b619849a51cb75d376a90fb"><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#gaae0b5ef92b619849a51cb75d376a90fb"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
+<tr class="memitem:ga58672e1989d582c14328048b207657c8"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8a224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga58672e1989d582c14328048b207657c8">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memdesc:ga58672e1989d582c14328048b207657c8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga58672e1989d582c14328048b207657c8">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gad257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gabe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gad257f72ac5272e94ff9314f8ecd24f1e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gad257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gaf2fc433dba580b9ec8e69aebc2e65338"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gabe86b2ff9a3a0c0e98248990f9be5652"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gabe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gaf9dcdf718ad99df9eb71fc542d5b47e1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:ga01d72a16de9e98722859ca651561e8f5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr class="memitem:ga1643f6b9eb180e98f3c1c267950f18d2"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:ga7598151354fbeb5f6a8b3f92d1e40ad7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The image type is an abstract data type for interfacing with the image creation program. </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ga0b7daa7e9e9b26fea847d71ca9de7c02"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="ga0b7daa7e9e9b26fea847d71ca9de7c02" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ga0b7daa7e9e9b26fea847d71ca9de7c02"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -83,23 +93,21 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_CHANNEL_LIMIT&#160;&#160;&#160;(32)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>The maximum number of channels. </p>
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="gaae0b5ef92b619849a51cb75d376a90fb"></a><!-- doxytag: member="image.h::stp_image_t" ref="gaae0b5ef92b619849a51cb75d376a90fb" args="" -->
+<a class="anchor" id="gaae0b5ef92b619849a51cb75d376a90fb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__image.html">stp_image</a>  <a class="el" href="structstp__image.html">stp_image_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__image.html">stp_image</a>  <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The image type is an abstract data type for interfacing with the image creation program. </p>
 <p>It provides callbacks to functions defined within the client application which are called while printing the image. </p>
@@ -107,7 +115,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ga58672e1989d582c14328048b207657c8"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="ga58672e1989d582c14328048b207657c8" args="" -->
+<a class="anchor" id="ga58672e1989d582c14328048b207657c8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -115,15 +123,14 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Image status. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf"></a>STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
 <p>Everything is OK. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga58672e1989d582c14328048b207657c8a224b8ac15cf785b24b2f3f53b4fdc274"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gga58672e1989d582c14328048b207657c8a224b8ac15cf785b24b2f3f53b4fdc274" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga58672e1989d582c14328048b207657c8a224b8ac15cf785b24b2f3f53b4fdc274"></a>STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
 <p>An error occured, or the job was aborted. </p>
 </td></tr>
 </table>
@@ -133,48 +140,46 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga7598151354fbeb5f6a8b3f92d1e40ad7"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="ga7598151354fbeb5f6a8b3f92d1e40ad7" args="(stp_image_t *image)" -->
+<a class="anchor" id="ga7598151354fbeb5f6a8b3f92d1e40ad7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_image_conclude </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1643f6b9eb180e98f3c1c267950f18d2"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="ga1643f6b9eb180e98f3c1c267950f18d2" args="(stp_image_t *image)" -->
+<a class="anchor" id="ga1643f6b9eb180e98f3c1c267950f18d2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">const char* stp_image_get_appname </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga01d72a16de9e98722859ca651561e8f5"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="ga01d72a16de9e98722859ca651561e8f5" args="(stp_image_t *image, unsigned char *data, size_t limit, int row)" -->
+<a class="anchor" id="ga01d72a16de9e98722859ca651561e8f5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a> stp_image_get_row </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>, </td>
         </tr>
         <tr>
@@ -201,82 +206,80 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaf9dcdf718ad99df9eb71fc542d5b47e1"></a><!-- doxytag: member="image.h::stp_image_height" ref="gaf9dcdf718ad99df9eb71fc542d5b47e1" args="(stp_image_t *image)" -->
+<a class="anchor" id="gaf9dcdf718ad99df9eb71fc542d5b47e1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_image_height </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad257f72ac5272e94ff9314f8ecd24f1e"></a><!-- doxytag: member="image.h::stp_image_init" ref="gad257f72ac5272e94ff9314f8ecd24f1e" args="(stp_image_t *image)" -->
+<a class="anchor" id="gad257f72ac5272e94ff9314f8ecd24f1e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_image_init </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaf2fc433dba580b9ec8e69aebc2e65338"></a><!-- doxytag: member="image.h::stp_image_reset" ref="gaf2fc433dba580b9ec8e69aebc2e65338" args="(stp_image_t *image)" -->
+<a class="anchor" id="gaf2fc433dba580b9ec8e69aebc2e65338"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_image_reset </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gabe86b2ff9a3a0c0e98248990f9be5652"></a><!-- doxytag: member="image.h::stp_image_width" ref="gabe86b2ff9a3a0c0e98248990f9be5652" args="(stp_image_t *image)" -->
+<a class="anchor" id="gabe86b2ff9a3a0c0e98248990f9be5652"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_image_width </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 5c45b35..1d310a9 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: intl</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,33 +35,33 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a>  </div>
+<a href="#define-members">Macros</a>  </div>
   <div class="headertitle">
 <div class="title">intl</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga5f80e8482ab93869489531a8c7ce7006"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga83b8be0887dede025766d25e2bb884c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:gad24abc7110e1bdf384dc2ef2b63e5d07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:ga115dd6a6dd9d7a249f6374a7c06deef5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:gadd6dfc1077058ff26d79cdb18099d58a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
+<tr class="memitem:ga32a3cf3d9dd914f5aeeca5423c157934"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga75278405e7f034d2b1af80bfd94675fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. </p>
 <p>The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ga32a3cf3d9dd914f5aeeca5423c157934"></a><!-- doxytag: member="gutenprint&#45;intl.h::_" ref="ga32a3cf3d9dd914f5aeeca5423c157934" args="(String)" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ga32a3cf3d9dd914f5aeeca5423c157934"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -67,12 +73,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadd6dfc1077058ff26d79cdb18099d58a"></a><!-- doxytag: member="gutenprint&#45;intl.h::bindtextdomain" ref="gadd6dfc1077058ff26d79cdb18099d58a" args="(Domain, Directory)" -->
+<a class="anchor" id="gadd6dfc1077058ff26d79cdb18099d58a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -94,12 +99,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Domain)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga115dd6a6dd9d7a249f6374a7c06deef5"></a><!-- doxytag: member="gutenprint&#45;intl.h::dcgettext" ref="ga115dd6a6dd9d7a249f6374a7c06deef5" args="(Domain, Message, Type)" -->
+<a class="anchor" id="ga115dd6a6dd9d7a249f6374a7c06deef5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -127,12 +131,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Message)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad24abc7110e1bdf384dc2ef2b63e5d07"></a><!-- doxytag: member="gutenprint&#45;intl.h::dgettext" ref="gad24abc7110e1bdf384dc2ef2b63e5d07" args="(Domain, Message)" -->
+<a class="anchor" id="gad24abc7110e1bdf384dc2ef2b63e5d07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -154,12 +157,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Message)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga83b8be0887dede025766d25e2bb884c6"></a><!-- doxytag: member="gutenprint&#45;intl.h::gettext" ref="ga83b8be0887dede025766d25e2bb884c6" args="(String)" -->
+<a class="anchor" id="ga83b8be0887dede025766d25e2bb884c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -171,12 +173,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga75278405e7f034d2b1af80bfd94675fe"></a><!-- doxytag: member="gutenprint&#45;intl.h::N_" ref="ga75278405e7f034d2b1af80bfd94675fe" args="(String)" -->
+<a class="anchor" id="ga75278405e7f034d2b1af80bfd94675fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -188,12 +189,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga5f80e8482ab93869489531a8c7ce7006"></a><!-- doxytag: member="gutenprint&#45;intl.h::textdomain" ref="ga5f80e8482ab93869489531a8c7ce7006" args="(String)" -->
+<a class="anchor" id="ga5f80e8482ab93869489531a8c7ce7006"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -205,14 +205,16 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index ebb252d..ebc89cb 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: intl-internal</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,33 +35,33 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a>  </div>
+<a href="#define-members">Macros</a>  </div>
   <div class="headertitle">
 <div class="title">intl-internal</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga5f80e8482ab93869489531a8c7ce7006"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga83b8be0887dede025766d25e2bb884c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:gad24abc7110e1bdf384dc2ef2b63e5d07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:ga115dd6a6dd9d7a249f6374a7c06deef5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:gadd6dfc1077058ff26d79cdb18099d58a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
+<tr class="memitem:ga32a3cf3d9dd914f5aeeca5423c157934"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga75278405e7f034d2b1af80bfd94675fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. </p>
 <p>The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree. </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ga32a3cf3d9dd914f5aeeca5423c157934"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::_" ref="ga32a3cf3d9dd914f5aeeca5423c157934" args="(String)" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ga32a3cf3d9dd914f5aeeca5423c157934"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -67,12 +73,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadd6dfc1077058ff26d79cdb18099d58a"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::bindtextdomain" ref="gadd6dfc1077058ff26d79cdb18099d58a" args="(Domain, Directory)" -->
+<a class="anchor" id="gadd6dfc1077058ff26d79cdb18099d58a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -94,12 +99,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Domain)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga115dd6a6dd9d7a249f6374a7c06deef5"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::dcgettext" ref="ga115dd6a6dd9d7a249f6374a7c06deef5" args="(Domain, Message, Type)" -->
+<a class="anchor" id="ga115dd6a6dd9d7a249f6374a7c06deef5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -127,12 +131,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Message)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad24abc7110e1bdf384dc2ef2b63e5d07"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::dgettext" ref="gad24abc7110e1bdf384dc2ef2b63e5d07" args="(Domain, Message)" -->
+<a class="anchor" id="gad24abc7110e1bdf384dc2ef2b63e5d07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -154,12 +157,11 @@ Defines</h2></td></tr>
           <td></td><td>&#160;&#160;&#160;(Message)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga83b8be0887dede025766d25e2bb884c6"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::gettext" ref="ga83b8be0887dede025766d25e2bb884c6" args="(String)" -->
+<a class="anchor" id="ga83b8be0887dede025766d25e2bb884c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -171,12 +173,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga75278405e7f034d2b1af80bfd94675fe"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::N_" ref="ga75278405e7f034d2b1af80bfd94675fe" args="(String)" -->
+<a class="anchor" id="ga75278405e7f034d2b1af80bfd94675fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -188,12 +189,11 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga5f80e8482ab93869489531a8c7ce7006"></a><!-- doxytag: member="gutenprint&#45;intl&#45;internal.h::textdomain" ref="ga5f80e8482ab93869489531a8c7ce7006" args="(String)" -->
+<a class="anchor" id="ga5f80e8482ab93869489531a8c7ce7006"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -205,14 +205,16 @@ Defines</h2></td></tr>
           <td>&#160;&#160;&#160;(String)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 80a46c7..639031d 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: list</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,93 +35,94 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">list</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The list data type implements a fast generic doubly-linked list.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_list_item&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The list item opaque data type.  <a href="#ga67b4fafe1ab6ead5be7500f88874bdb0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The list opaque data type.  <a href="#ga53cf4f01ab7d712f771cb5fb479d2ba7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> )(void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#gac09ea139ad36a6e21f30755439afeab5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> )(const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#ga8d8084abc24eb4b00290916d5ff44c1f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> )(const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#ga815993ed02f7e9c7b5cb4680f0504d97"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#gae5c7167d6fc957fee0b6aff45bc0b126"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga67b4fafe1ab6ead5be7500f88874bdb0"><td class="memItemLeft" align="right" valign="top">typedef struct stp_list_item&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr class="memdesc:ga67b4fafe1ab6ead5be7500f88874bdb0"><td class="mdescLeft">&#160;</td><td class="mdescRight">The list item opaque data type.  <a href="#ga67b4fafe1ab6ead5be7500f88874bdb0"></a><br/></td></tr>
+<tr class="memitem:ga53cf4f01ab7d712f771cb5fb479d2ba7"><td class="memItemLeft" align="right" valign="top">typedef struct stp_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
+<tr class="memdesc:ga53cf4f01ab7d712f771cb5fb479d2ba7"><td class="mdescLeft">&#160;</td><td class="mdescRight">The list opaque data type.  <a href="#ga53cf4f01ab7d712f771cb5fb479d2ba7"></a><br/></td></tr>
+<tr class="memitem:gac09ea139ad36a6e21f30755439afeab5"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> )(void *)</td></tr>
+<tr class="memdesc:gac09ea139ad36a6e21f30755439afeab5"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#gac09ea139ad36a6e21f30755439afeab5"></a><br/></td></tr>
+<tr class="memitem:ga8d8084abc24eb4b00290916d5ff44c1f"><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr class="memdesc:ga8d8084abc24eb4b00290916d5ff44c1f"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#ga8d8084abc24eb4b00290916d5ff44c1f"></a><br/></td></tr>
+<tr class="memitem:ga815993ed02f7e9c7b5cb4680f0504d97"><td class="memItemLeft" align="right" valign="top">typedef const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr class="memdesc:ga815993ed02f7e9c7b5cb4680f0504d97"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#ga815993ed02f7e9c7b5cb4680f0504d97"></a><br/></td></tr>
+<tr class="memitem:gae5c7167d6fc957fee0b6aff45bc0b126"><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr class="memdesc:gae5c7167d6fc957fee0b6aff45bc0b126"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#gae5c7167d6fc957fee0b6aff45bc0b126"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#ga55fbb8f7a3920b783b02183c5ea57624"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list object.  <a href="#ga3cfea94cd07f50d7d9b4ce384d349fca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#ga0ba249dd06efbf5c0af8511ceab671e8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list object.  <a href="#gae23ef06175b27dd6772d4d4c098999b1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the first item in a list.  <a href="#gad185100e8d7969a473e9d42bc8084572"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the last item in a list.  <a href="#gae939f15ee1a6e4c0aaad7a7be7f40b74"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#gad377973e8b13d02c9c111d970f491993"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#ga729867c847dd8282f74806968c708f28"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#gacc9140df3f4311cd750ba10a1cbf37d1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the length of a list.  <a href="#gae22741060734c9cbc47656c5ea35c3f3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> freefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node free function.  <a href="#gae3300d7971c393d119d6fd62e2b578ec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node free function.  <a href="#gabfc1ef258084a3e1ad959aa3d2f053f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> copyfunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node copy function.  <a href="#ga7e002ed25bbfbad236c1c619841f1ac6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node copy function.  <a href="#ga686e92ee802147171e5fc723d0079b8d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> namefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node name function.  <a href="#ga889af512d87a00d696acc0b6b3fafe78"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node name function.  <a href="#ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> long_namefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node long name function.  <a href="#ga5be91978431b0ed48ea7919807bdcb73"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node long name function.  <a href="#gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> sortfunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node sort function.  <a href="#gab1d2486542b858b44b299cfcdf7d8784"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node sort function.  <a href="#ga4b32e315d3fd23eabeffcc8d931ea454"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list item.  <a href="#gae726297a82e140672a018e135ffc6a0e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list item.  <a href="#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the previous item in the list.  <a href="#gabaa2a241055402438a0cae6f40cf6a78"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the next item in the list.  <a href="#ga81ab310caf6432ce1e492eaafdb6c0d7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#gad6f6b303b40fa75f22a86391785178cb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br/></td></tr>
+<tr class="memitem:ga55fbb8f7a3920b783b02183c5ea57624"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr class="memdesc:ga55fbb8f7a3920b783b02183c5ea57624"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#ga55fbb8f7a3920b783b02183c5ea57624"></a><br/></td></tr>
+<tr class="memitem:ga3cfea94cd07f50d7d9b4ce384d349fca"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
+<tr class="memdesc:ga3cfea94cd07f50d7d9b4ce384d349fca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list object.  <a href="#ga3cfea94cd07f50d7d9b4ce384d349fca"></a><br/></td></tr>
+<tr class="memitem:ga0ba249dd06efbf5c0af8511ceab671e8"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga0ba249dd06efbf5c0af8511ceab671e8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#ga0ba249dd06efbf5c0af8511ceab671e8"></a><br/></td></tr>
+<tr class="memitem:gae23ef06175b27dd6772d4d4c098999b1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae23ef06175b27dd6772d4d4c098999b1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list object.  <a href="#gae23ef06175b27dd6772d4d4c098999b1"></a><br/></td></tr>
+<tr class="memitem:gad185100e8d7969a473e9d42bc8084572"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gad185100e8d7969a473e9d42bc8084572"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the first item in a list.  <a href="#gad185100e8d7969a473e9d42bc8084572"></a><br/></td></tr>
+<tr class="memitem:gae939f15ee1a6e4c0aaad7a7be7f40b74"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae939f15ee1a6e4c0aaad7a7be7f40b74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the last item in a list.  <a href="#gae939f15ee1a6e4c0aaad7a7be7f40b74"></a><br/></td></tr>
+<tr class="memitem:gad377973e8b13d02c9c111d970f491993"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
+<tr class="memdesc:gad377973e8b13d02c9c111d970f491993"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#gad377973e8b13d02c9c111d970f491993"></a><br/></td></tr>
+<tr class="memitem:ga729867c847dd8282f74806968c708f28"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
+<tr class="memdesc:ga729867c847dd8282f74806968c708f28"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#ga729867c847dd8282f74806968c708f28"></a><br/></td></tr>
+<tr class="memitem:gacc9140df3f4311cd750ba10a1cbf37d1"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr class="memdesc:gacc9140df3f4311cd750ba10a1cbf37d1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#gacc9140df3f4311cd750ba10a1cbf37d1"></a><br/></td></tr>
+<tr class="memitem:gae22741060734c9cbc47656c5ea35c3f3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae22741060734c9cbc47656c5ea35c3f3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the length of a list.  <a href="#gae22741060734c9cbc47656c5ea35c3f3"></a><br/></td></tr>
+<tr class="memitem:gae3300d7971c393d119d6fd62e2b578ec"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> freefunc)</td></tr>
+<tr class="memdesc:gae3300d7971c393d119d6fd62e2b578ec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node free function.  <a href="#gae3300d7971c393d119d6fd62e2b578ec"></a><br/></td></tr>
+<tr class="memitem:gabfc1ef258084a3e1ad959aa3d2f053f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gabfc1ef258084a3e1ad959aa3d2f053f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node free function.  <a href="#gabfc1ef258084a3e1ad959aa3d2f053f4"></a><br/></td></tr>
+<tr class="memitem:ga7e002ed25bbfbad236c1c619841f1ac6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr class="memdesc:ga7e002ed25bbfbad236c1c619841f1ac6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node copy function.  <a href="#ga7e002ed25bbfbad236c1c619841f1ac6"></a><br/></td></tr>
+<tr class="memitem:ga686e92ee802147171e5fc723d0079b8d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga686e92ee802147171e5fc723d0079b8d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node copy function.  <a href="#ga686e92ee802147171e5fc723d0079b8d"></a><br/></td></tr>
+<tr class="memitem:ga889af512d87a00d696acc0b6b3fafe78"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> namefunc)</td></tr>
+<tr class="memdesc:ga889af512d87a00d696acc0b6b3fafe78"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node name function.  <a href="#ga889af512d87a00d696acc0b6b3fafe78"></a><br/></td></tr>
+<tr class="memitem:ga50b1ab3c3b6b0ba7c0cf2128e2024369"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga50b1ab3c3b6b0ba7c0cf2128e2024369"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node name function.  <a href="#ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br/></td></tr>
+<tr class="memitem:ga5be91978431b0ed48ea7919807bdcb73"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr class="memdesc:ga5be91978431b0ed48ea7919807bdcb73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node long name function.  <a href="#ga5be91978431b0ed48ea7919807bdcb73"></a><br/></td></tr>
+<tr class="memitem:gab99b3ed6da1ea739eed3f2c04fbb7fa7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gab99b3ed6da1ea739eed3f2c04fbb7fa7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node long name function.  <a href="#gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br/></td></tr>
+<tr class="memitem:gab1d2486542b858b44b299cfcdf7d8784"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr class="memdesc:gab1d2486542b858b44b299cfcdf7d8784"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node sort function.  <a href="#gab1d2486542b858b44b299cfcdf7d8784"></a><br/></td></tr>
+<tr class="memitem:ga4b32e315d3fd23eabeffcc8d931ea454"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga4b32e315d3fd23eabeffcc8d931ea454"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node sort function.  <a href="#ga4b32e315d3fd23eabeffcc8d931ea454"></a><br/></td></tr>
+<tr class="memitem:gae726297a82e140672a018e135ffc6a0e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr class="memdesc:gae726297a82e140672a018e135ffc6a0e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list item.  <a href="#gae726297a82e140672a018e135ffc6a0e"></a><br/></td></tr>
+<tr class="memitem:ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list item.  <a href="#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br/></td></tr>
+<tr class="memitem:gabaa2a241055402438a0cae6f40cf6a78"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:gabaa2a241055402438a0cae6f40cf6a78"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the previous item in the list.  <a href="#gabaa2a241055402438a0cae6f40cf6a78"></a><br/></td></tr>
+<tr class="memitem:ga81ab310caf6432ce1e492eaafdb6c0d7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:ga81ab310caf6432ce1e492eaafdb6c0d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the next item in the list.  <a href="#ga81ab310caf6432ce1e492eaafdb6c0d7"></a><br/></td></tr>
+<tr class="memitem:gad6f6b303b40fa75f22a86391785178cb"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:gad6f6b303b40fa75f22a86391785178cb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#gad6f6b303b40fa75f22a86391785178cb"></a><br/></td></tr>
+<tr class="memitem:gac1e34edcd47ffdc119cdcaf5ad38e1c4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr class="memdesc:gac1e34edcd47ffdc119cdcaf5ad38e1c4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The list data type implements a fast generic doubly-linked list. </p>
 <p>It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head. </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga67b4fafe1ab6ead5be7500f88874bdb0"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="ga67b4fafe1ab6ead5be7500f88874bdb0" args="" -->
+<a class="anchor" id="ga67b4fafe1ab6ead5be7500f88874bdb0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -123,15 +130,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_list_item <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The list item opaque data type. </p>
 <p>This object is a node in the list. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga53cf4f01ab7d712f771cb5fb479d2ba7"></a><!-- doxytag: member="list.h::stp_list_t" ref="ga53cf4f01ab7d712f771cb5fb479d2ba7" args="" -->
+<a class="anchor" id="ga53cf4f01ab7d712f771cb5fb479d2ba7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -139,72 +145,67 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_list <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The list opaque data type. </p>
 <p>This object represents the list as a whole. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga8d8084abc24eb4b00290916d5ff44c1f"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="ga8d8084abc24eb4b00290916d5ff44c1f" args=")(const void *)" -->
+<a class="anchor" id="ga8d8084abc24eb4b00290916d5ff44c1f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void*(* <a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>)(const void *)</td>
+          <td class="memname">typedef void*(* stp_node_copyfunc)(const void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>A callback function to copy the data a node contains. </p>
 <p>The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data. </p>
 
 </div>
 </div>
-<a class="anchor" id="gac09ea139ad36a6e21f30755439afeab5"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="gac09ea139ad36a6e21f30755439afeab5" args=")(void *)" -->
+<a class="anchor" id="gac09ea139ad36a6e21f30755439afeab5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(* <a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>)(void *)</td>
+          <td class="memname">typedef void(* stp_node_freefunc)(void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>A callback function to free the data a node contains. </p>
 <p>The parameter is a pointer to the node data. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga815993ed02f7e9c7b5cb4680f0504d97"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="ga815993ed02f7e9c7b5cb4680f0504d97" args=")(const void *)" -->
+<a class="anchor" id="ga815993ed02f7e9c7b5cb4680f0504d97"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef const char*(* <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>)(const void *)</td>
+          <td class="memname">typedef const char*(* stp_node_namefunc)(const void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>A callback function to get the name of a node. </p>
 <p>The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name. </p>
 
 </div>
 </div>
-<a class="anchor" id="gae5c7167d6fc957fee0b6aff45bc0b126"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="gae5c7167d6fc957fee0b6aff45bc0b126" args=")(const void *, const void *)" -->
+<a class="anchor" id="gae5c7167d6fc957fee0b6aff45bc0b126"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int(* <a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>)(const void *, const void *)</td>
+          <td class="memname">typedef int(* stp_node_sortfunc)(const void *, const void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>A callback function to compare two nodes. </p>
 <p>The two parameters are pointers to node data. The return value is &lt;0 if the first sorts before the second, 0 if they sort identically, and &gt;0 if the first sorts after the second. </p>
@@ -212,7 +213,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga0ba249dd06efbf5c0af8511ceab671e8"></a><!-- doxytag: member="list.h::stp_list_copy" ref="ga0ba249dd06efbf5c0af8511ceab671e8" args="(const stp_list_t *list)" -->
+<a class="anchor" id="ga0ba249dd06efbf5c0af8511ceab671e8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -224,22 +225,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate a list object. </p>
 <p>list must be a valid list object previously created with <a class="el" href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca" title="Create a new list object.">stp_list_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to copy. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the new copy of the list. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the new copy of the list. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3cfea94cd07f50d7d9b4ce384d349fca"></a><!-- doxytag: member="list.h::stp_list_create" ref="ga3cfea94cd07f50d7d9b4ce384d349fca" args="(void)" -->
+<a class="anchor" id="ga3cfea94cd07f50d7d9b4ce384d349fca"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -251,15 +251,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new list object. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created list object. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created list object. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae23ef06175b27dd6772d4d4c098999b1"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="gae23ef06175b27dd6772d4d4c098999b1" args="(stp_list_t *list)" -->
+<a class="anchor" id="gae23ef06175b27dd6772d4d4c098999b1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -271,22 +270,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a list object. </p>
 <p>It is an error to destroy the list more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to destroy. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on success, 1 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga686e92ee802147171e5fc723d0079b8d"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="ga686e92ee802147171e5fc723d0079b8d" args="(const stp_list_t *list)" -->
+<a class="anchor" id="ga686e92ee802147171e5fc723d0079b8d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -298,21 +296,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a list node copy function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae939f15ee1a6e4c0aaad7a7be7f40b74"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="gae939f15ee1a6e4c0aaad7a7be7f40b74" args="(const stp_list_t *list)" -->
+<a class="anchor" id="gae939f15ee1a6e4c0aaad7a7be7f40b74"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -324,21 +321,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find the last item in a list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the last list item, or NULL if the list is empty. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the last list item, or NULL if the list is empty. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gabfc1ef258084a3e1ad959aa3d2f053f4"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="gabfc1ef258084a3e1ad959aa3d2f053f4" args="(const stp_list_t *list)" -->
+<a class="anchor" id="gabfc1ef258084a3e1ad959aa3d2f053f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -350,21 +346,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a list node free function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad377973e8b13d02c9c111d970f491993"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="gad377973e8b13d02c9c111d970f491993" args="(const stp_list_t *list, int idx)" -->
+<a class="anchor" id="gad377973e8b13d02c9c111d970f491993"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -386,22 +381,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find an item in a list by its index. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">idx</td><td>the index to find. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gacc9140df3f4311cd750ba10a1cbf37d1"></a><!-- doxytag: member="list.h::stp_list_get_item_by_long_name" ref="gacc9140df3f4311cd750ba10a1cbf37d1" args="(const stp_list_t *list, const char *long_name)" -->
+<a class="anchor" id="gacc9140df3f4311cd750ba10a1cbf37d1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -423,22 +417,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find an item in a list by its long name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">long_name</td><td>the long name to find. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga729867c847dd8282f74806968c708f28"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="ga729867c847dd8282f74806968c708f28" args="(const stp_list_t *list, const char *name)" -->
+<a class="anchor" id="ga729867c847dd8282f74806968c708f28"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -460,22 +453,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find an item in a list by its name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">name</td><td>the name to find. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae22741060734c9cbc47656c5ea35c3f3"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="gae22741060734c9cbc47656c5ea35c3f3" args="(const stp_list_t *list)" -->
+<a class="anchor" id="gae22741060734c9cbc47656c5ea35c3f3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -487,21 +479,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the length of a list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the list length (number of list items). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the list length (number of list items). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="gab99b3ed6da1ea739eed3f2c04fbb7fa7" args="(const stp_list_t *list)" -->
+<a class="anchor" id="gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -513,21 +504,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a list node long name function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="ga50b1ab3c3b6b0ba7c0cf2128e2024369" args="(const stp_list_t *list)" -->
+<a class="anchor" id="ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -539,21 +529,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a list node name function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga4b32e315d3fd23eabeffcc8d931ea454"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga4b32e315d3fd23eabeffcc8d931ea454" args="(const stp_list_t *list)" -->
+<a class="anchor" id="ga4b32e315d3fd23eabeffcc8d931ea454"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -565,21 +554,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a list node sort function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad185100e8d7969a473e9d42bc8084572"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="gad185100e8d7969a473e9d42bc8084572" args="(const stp_list_t *list)" -->
+<a class="anchor" id="gad185100e8d7969a473e9d42bc8084572"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -591,21 +579,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find the first item in a list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first list item, or NULL if the list is empty. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first list item, or NULL if the list is empty. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae726297a82e140672a018e135ffc6a0e"></a><!-- doxytag: member="list.h::stp_list_item_create" ref="gae726297a82e140672a018e135ffc6a0e" args="(stp_list_t *list, stp_list_item_t *next, const void *data)" -->
+<a class="anchor" id="gae726297a82e140672a018e135ffc6a0e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -633,11 +620,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new list item. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">next</td><td>the next item in the list, or NULL to insert at the end of the list. </td></tr>
@@ -645,11 +631,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL, for example). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on success, 1 on failure (if data is NULL, for example). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="ga5e36d4f61e00cb3e4c4a759f5e7e9f4b" args="(stp_list_t *list, stp_list_item_t *item)" -->
+<a class="anchor" id="ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -671,22 +657,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a list item. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">item</td><td>the item to destroy. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on success, 1 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad6f6b303b40fa75f22a86391785178cb"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="gad6f6b303b40fa75f22a86391785178cb" args="(const stp_list_item_t *item)" -->
+<a class="anchor" id="gad6f6b303b40fa75f22a86391785178cb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -698,21 +683,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data associated with a list item. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">item</td><td>the list item to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the data associated with item. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the data associated with item. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga81ab310caf6432ce1e492eaafdb6c0d7"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="ga81ab310caf6432ce1e492eaafdb6c0d7" args="(const stp_list_item_t *item)" -->
+<a class="anchor" id="ga81ab310caf6432ce1e492eaafdb6c0d7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -724,21 +708,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the next item in the list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">item</td><td>the item to start from. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gabaa2a241055402438a0cae6f40cf6a78"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="gabaa2a241055402438a0cae6f40cf6a78" args="(const stp_list_item_t *item)" -->
+<a class="anchor" id="gabaa2a241055402438a0cae6f40cf6a78"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -750,21 +733,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the previous item in the list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">item</td><td>the item to start from. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="gac1e34edcd47ffdc119cdcaf5ad38e1c4" args="(stp_list_item_t *item, void *data)" -->
+<a class="anchor" id="gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -786,23 +768,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data associated with a list item. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>Note that if a sortfunc is in use, changing the data will NOT re-sort the list! </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>Note that if a sortfunc is in use, changing the data will NOT re-sort the list! </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">item</td><td>the list item to use. </td></tr>
     <tr><td class="paramname">data</td><td>the data to set. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on success, 1 on failure (if data is NULL). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga55fbb8f7a3920b783b02183c5ea57624"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="ga55fbb8f7a3920b783b02183c5ea57624" args="(void *item)" -->
+<a class="anchor" id="ga55fbb8f7a3920b783b02183c5ea57624"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -814,12 +795,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Free node data allocated with stp_malloc. </p>
 <p>This function is indended for use as an stp_node_freefunc, which uses stp_free to free the node data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">item</td><td>the node data to free </td></tr>
   </table>
@@ -828,7 +808,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7e002ed25bbfbad236c1c619841f1ac6"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="ga7e002ed25bbfbad236c1c619841f1ac6" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" -->
+<a class="anchor" id="ga7e002ed25bbfbad236c1c619841f1ac6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -850,12 +830,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a list node copy function. </p>
 <p>This callback function will be called whenever a list item is copied. Its intended use is for automatic object copying (since C lacks a copy constructor). </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">copyfunc</td><td>the function to set. </td></tr>
@@ -865,7 +844,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gae3300d7971c393d119d6fd62e2b578ec"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="gae3300d7971c393d119d6fd62e2b578ec" args="(stp_list_t *list, stp_node_freefunc freefunc)" -->
+<a class="anchor" id="gae3300d7971c393d119d6fd62e2b578ec"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -887,12 +866,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a list node free function. </p>
 <p>This callback function will be called whenever a list item is destroyed. Its intended use is for automatic object destruction and any other cleanup required. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">freefunc</td><td>the function to set. </td></tr>
@@ -902,7 +880,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga5be91978431b0ed48ea7919807bdcb73"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="ga5be91978431b0ed48ea7919807bdcb73" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" -->
+<a class="anchor" id="ga5be91978431b0ed48ea7919807bdcb73"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -924,12 +902,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a list node long name function. </p>
 <p>This callback function will be called whenever the long name of a list item needs to be determined. This is used to find list items by long name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">long_namefunc</td><td>the function to set. </td></tr>
@@ -939,7 +916,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga889af512d87a00d696acc0b6b3fafe78"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="ga889af512d87a00d696acc0b6b3fafe78" args="(stp_list_t *list, stp_node_namefunc namefunc)" -->
+<a class="anchor" id="ga889af512d87a00d696acc0b6b3fafe78"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -961,12 +938,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a list node name function. </p>
 <p>This callback function will be called whenever the name of a list item needs to be determined. This is used to find list items by name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">namefunc</td><td>the function to set. </td></tr>
@@ -976,7 +952,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab1d2486542b858b44b299cfcdf7d8784"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="gab1d2486542b858b44b299cfcdf7d8784" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" -->
+<a class="anchor" id="gab1d2486542b858b44b299cfcdf7d8784"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -998,12 +974,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a list node sort function. </p>
 <p>This callback function will be called to determine the sort order for list items in sorted lists. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the list to use. </td></tr>
     <tr><td class="paramname">sortfunc</td><td>the function to set. </td></tr>
@@ -1013,9 +988,12 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index a5e3bde..6801b90 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: papersize</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,7 +35,7 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -37,46 +43,48 @@
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">papersize</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The papersize describes the dimensions of a paper.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<tr class="memitem:ga72e4619e373e38dc02dc452813b7b958"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a6d5868bc6707f8801ce4d584428c2ae8">PAPERSIZE_METRIC_STANDARD</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a00b7e9a18afc172872861b26dbcc8cb8">PAPERSIZE_ENGLISH_EXTENDED</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a62e2906a87fa4bcf32913943fd5b225a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> { <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f">PAPERSIZE_TYPE_STANDARD</a> =  0, 
+<tr class="memdesc:ga72e4619e373e38dc02dc452813b7b958"><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">More...</a><br/></td></tr>
+<tr class="memitem:ga31255c4eebfaaf5cd319e5638a6a3069"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> { <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f">PAPERSIZE_TYPE_STANDARD</a> =  0, 
 <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a660290248a563e7590202afd3ba68fb4">PAPERSIZE_TYPE_ENVELOPE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#ga84fd0bad33b134217f54fa8c1e6c8b99"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by name.  <a href="#ga60f3dee8f26cac05d8d6fcaff1e39630"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size.  <a href="#ga1484a5e75a2b2921bbe0c9e17deb0b77"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="#ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="#ga33c0be56646361b1ce85a9d338336dd3"></a><br/></td></tr>
+<tr class="memitem:ga84fd0bad33b134217f54fa8c1e6c8b99"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
+<tr class="memdesc:ga84fd0bad33b134217f54fa8c1e6c8b99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#ga84fd0bad33b134217f54fa8c1e6c8b99"></a><br/></td></tr>
+<tr class="memitem:ga60f3dee8f26cac05d8d6fcaff1e39630"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr class="memdesc:ga60f3dee8f26cac05d8d6fcaff1e39630"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by name.  <a href="#ga60f3dee8f26cac05d8d6fcaff1e39630"></a><br/></td></tr>
+<tr class="memitem:ga1484a5e75a2b2921bbe0c9e17deb0b77"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr class="memdesc:ga1484a5e75a2b2921bbe0c9e17deb0b77"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size.  <a href="#ga1484a5e75a2b2921bbe0c9e17deb0b77"></a><br/></td></tr>
+<tr class="memitem:ga879cd515ca2eb5fd8cd76ae62f4bfa4e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
+<tr class="memdesc:ga879cd515ca2eb5fd8cd76ae62f4bfa4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="#ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br/></td></tr>
+<tr class="memitem:gab2e9f694a3b90aeaaa14d6af3b5fe75a"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:gab2e9f694a3b90aeaaa14d6af3b5fe75a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br/></td></tr>
+<tr class="memitem:ga33c0be56646361b1ce85a9d338336dd3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr class="memdesc:ga33c0be56646361b1ce85a9d338336dd3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="#ga33c0be56646361b1ce85a9d338336dd3"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The papersize describes the dimensions of a paper. </p>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ga31255c4eebfaaf5cd319e5638a6a3069"></a><!-- doxytag: member="paper.h::stp_papersize_type_t" ref="ga31255c4eebfaaf5cd319e5638a6a3069" args="" -->
+<a class="anchor" id="ga31255c4eebfaaf5cd319e5638a6a3069"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -84,13 +92,12 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f"></a><!-- doxytag: member="PAPERSIZE_TYPE_STANDARD" ref="gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f" args="" -->PAPERSIZE_TYPE_STANDARD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f"></a>PAPERSIZE_TYPE_STANDARD</em>&nbsp;</td><td>
 <p>Standard paper size. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga31255c4eebfaaf5cd319e5638a6a3069a660290248a563e7590202afd3ba68fb4"></a><!-- doxytag: member="PAPERSIZE_TYPE_ENVELOPE" ref="gga31255c4eebfaaf5cd319e5638a6a3069a660290248a563e7590202afd3ba68fb4" args="" -->PAPERSIZE_TYPE_ENVELOPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga31255c4eebfaaf5cd319e5638a6a3069a660290248a563e7590202afd3ba68fb4"></a>PAPERSIZE_TYPE_ENVELOPE</em>&nbsp;</td><td>
 <p>Envelope. </p>
 </td></tr>
 </table>
@@ -99,7 +106,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga72e4619e373e38dc02dc452813b7b958"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="ga72e4619e373e38dc02dc452813b7b958" args="" -->
+<a class="anchor" id="ga72e4619e373e38dc02dc452813b7b958"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -107,21 +114,20 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Units of measurement. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3"></a>PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
 <p>English/Imperial units. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a6d5868bc6707f8801ce4d584428c2ae8"></a><!-- doxytag: member="PAPERSIZE_METRIC_STANDARD" ref="gga72e4619e373e38dc02dc452813b7b958a6d5868bc6707f8801ce4d584428c2ae8" args="" -->PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a6d5868bc6707f8801ce4d584428c2ae8"></a>PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
 <p>Metric units. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a00b7e9a18afc172872861b26dbcc8cb8"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_EXTENDED" ref="gga72e4619e373e38dc02dc452813b7b958a00b7e9a18afc172872861b26dbcc8cb8" args="" -->PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a00b7e9a18afc172872861b26dbcc8cb8"></a>PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
 <p>English/Imperial units (optional paper, not displayed by default). </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a62e2906a87fa4bcf32913943fd5b225a"></a><!-- doxytag: member="PAPERSIZE_METRIC_EXTENDED" ref="gga72e4619e373e38dc02dc452813b7b958a62e2906a87fa4bcf32913943fd5b225a" args="" -->PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga72e4619e373e38dc02dc452813b7b958a62e2906a87fa4bcf32913943fd5b225a"></a>PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
 <p>Metric units (optional paper, not displayed by default). </p>
 </td></tr>
 </table>
@@ -131,7 +137,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga33c0be56646361b1ce85a9d338336dd3"></a><!-- doxytag: member="paper.h::stp_default_media_size" ref="ga33c0be56646361b1ce85a9d338336dd3" args="(const stp_vars_t *v, int *width, int *height)" -->
+<a class="anchor" id="ga33c0be56646361b1ce85a9d338336dd3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -159,12 +165,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the default paper dimensions for the current configuration. </p>
 <p>The default is derived from the PageSize parameter if set, otherwise the default page size for the printer is used. If no value can be determined, 1x1 will be returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the Gutenprint vars object </td></tr>
     <tr><td class="paramname">width</td><td>pointer to storage that the width will be returned in. </td></tr>
@@ -175,7 +180,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="gab2e9f694a3b90aeaaa14d6af3b5fe75a" args="(int idx)" -->
+<a class="anchor" id="gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -187,21 +192,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a papersize by its index number. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">idx</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga60f3dee8f26cac05d8d6fcaff1e39630"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="ga60f3dee8f26cac05d8d6fcaff1e39630" args="(const char *name)" -->
+<a class="anchor" id="ga60f3dee8f26cac05d8d6fcaff1e39630"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -213,21 +217,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a papersize by name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">name</td><td>the short unique name of the paper. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga1484a5e75a2b2921bbe0c9e17deb0b77"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="ga1484a5e75a2b2921bbe0c9e17deb0b77" args="(int length, int width)" -->
+<a class="anchor" id="ga1484a5e75a2b2921bbe0c9e17deb0b77"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -249,23 +252,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a papersize by size. </p>
 <p>The nearest available size to the size requested will be found. Only paper sizes within 5 points of width and height will be considered. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">length</td><td>the length of the paper. </td></tr>
     <tr><td class="paramname">width</td><td>the width of the paper </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size_exact" ref="ga879cd515ca2eb5fd8cd76ae62f4bfa4e" args="(int length, int width)" -->
+<a class="anchor" id="ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -287,22 +289,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a papersize by size if an exact match is found. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">length</td><td>the length of the paper. </td></tr>
     <tr><td class="paramname">width</td><td>the width of the paper </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a static pointer to the papersize, or NULL on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga84fd0bad33b134217f54fa8c1e6c8b99"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="ga84fd0bad33b134217f54fa8c1e6c8b99" args="(void)" -->
+<a class="anchor" id="ga84fd0bad33b134217f54fa8c1e6c8b99"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -314,17 +315,19 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the number of available papersizes. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the number of papersizes. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the number of papersizes. </dd></dl>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 42c048a..bc3ae78 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: printer</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,7 +35,7 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -37,94 +43,95 @@
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">printer</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The printer type represents a printer model.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_printer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#gacddc2ce7fa4e0a68fcc30c123503738f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:gacddc2ce7fa4e0a68fcc30c123503738f"><td class="memItemLeft" align="right" valign="top">typedef struct stp_printer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr class="memdesc:gacddc2ce7fa4e0a68fcc30c123503738f"><td class="mdescLeft">&#160;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#gacddc2ce7fa4e0a68fcc30c123503738f"></a><br/></td></tr>
+<tr class="memitem:ga66a5e7cf2b1743a46bd78cb851e1d0a4"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available printer models.  <a href="#ga6a76f8f76106eddd51af4b1593b4f3af"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#ga440501ca226e0a9ac1335c7e52ee55a6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#ga6bd5abd876100c17fc9029659fed92f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#gae45de9ef94fb609c2a54f1d80144552e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155">stp_get_printer_by_device_id</a> (const char *device_id)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its IEEE 1284 device ID.  <a href="#gadce65b83e3dd0ffcb75591ed3ba81155"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8">stp_get_printer_by_foomatic_id</a> (const char *foomatic_id)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its foomatic ID.  <a href="#gacd449b7863a5fcddb6bdb602079448f8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#gac649c4b3d0a93f26f99deb4b081305c1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#ga41094e69b71eb930e770bd2cf8bbf795"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354">stp_printer_get_device_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's IEEE 1284 device ID, if known.  <a href="#ga7bbd6440baa533d99616eccb5f449354"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's family name.  <a href="#ga487b74bf101a842f30b5941b8db4769a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#gab99dd05c42aed848d1567f2b346fb4f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41">stp_printer_get_foomatic_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's foomatic ID.  <a href="#gaac52d241cc86a10965046afc0a8c8a41"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's model number.  <a href="#gaae84d3fb263c4a171b7b63b6d93a940e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#ga4f6859e0f21ed2062075d6b9f680a202"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="#gaf5084888feed9878811ac491cb5313ee"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="#gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the image.  <a href="#ga6065874cbb246875925e14d8801898cc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Start a print job.  <a href="#ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">End a print job.  <a href="#gae61d056dd504facc72ff56d7f16eb23c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve options that need to be passed to the underlying print system.  <a href="#gaae7a50e6175eed1b84d2e20c924b33ca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga6a76f8f76106eddd51af4b1593b4f3af"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
+<tr class="memdesc:ga6a76f8f76106eddd51af4b1593b4f3af"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available printer models.  <a href="#ga6a76f8f76106eddd51af4b1593b4f3af"></a><br/></td></tr>
+<tr class="memitem:ga440501ca226e0a9ac1335c7e52ee55a6"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:ga440501ca226e0a9ac1335c7e52ee55a6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#ga440501ca226e0a9ac1335c7e52ee55a6"></a><br/></td></tr>
+<tr class="memitem:ga6bd5abd876100c17fc9029659fed92f4"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr class="memdesc:ga6bd5abd876100c17fc9029659fed92f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#ga6bd5abd876100c17fc9029659fed92f4"></a><br/></td></tr>
+<tr class="memitem:gae45de9ef94fb609c2a54f1d80144552e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr class="memdesc:gae45de9ef94fb609c2a54f1d80144552e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#gae45de9ef94fb609c2a54f1d80144552e"></a><br/></td></tr>
+<tr class="memitem:gadce65b83e3dd0ffcb75591ed3ba81155"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155">stp_get_printer_by_device_id</a> (const char *device_id)</td></tr>
+<tr class="memdesc:gadce65b83e3dd0ffcb75591ed3ba81155"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its IEEE 1284 device ID.  <a href="#gadce65b83e3dd0ffcb75591ed3ba81155"></a><br/></td></tr>
+<tr class="memitem:gacd449b7863a5fcddb6bdb602079448f8"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8">stp_get_printer_by_foomatic_id</a> (const char *foomatic_id)</td></tr>
+<tr class="memdesc:gacd449b7863a5fcddb6bdb602079448f8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its foomatic ID.  <a href="#gacd449b7863a5fcddb6bdb602079448f8"></a><br/></td></tr>
+<tr class="memitem:gac649c4b3d0a93f26f99deb4b081305c1"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gac649c4b3d0a93f26f99deb4b081305c1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#gac649c4b3d0a93f26f99deb4b081305c1"></a><br/></td></tr>
+<tr class="memitem:ga41094e69b71eb930e770bd2cf8bbf795"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr class="memdesc:ga41094e69b71eb930e770bd2cf8bbf795"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#ga41094e69b71eb930e770bd2cf8bbf795"></a><br/></td></tr>
+<tr class="memitem:ga11804fb9b8d87ed1f2a3acbd39f5f85a"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga11804fb9b8d87ed1f2a3acbd39f5f85a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br/></td></tr>
+<tr class="memitem:gac345b8cf8cd78da98fdb4c6b2d9cf7ca"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gac345b8cf8cd78da98fdb4c6b2d9cf7ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br/></td></tr>
+<tr class="memitem:ga7bbd6440baa533d99616eccb5f449354"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354">stp_printer_get_device_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga7bbd6440baa533d99616eccb5f449354"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's IEEE 1284 device ID, if known.  <a href="#ga7bbd6440baa533d99616eccb5f449354"></a><br/></td></tr>
+<tr class="memitem:ga487b74bf101a842f30b5941b8db4769a"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga487b74bf101a842f30b5941b8db4769a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's family name.  <a href="#ga487b74bf101a842f30b5941b8db4769a"></a><br/></td></tr>
+<tr class="memitem:gab99dd05c42aed848d1567f2b346fb4f4"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gab99dd05c42aed848d1567f2b346fb4f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#gab99dd05c42aed848d1567f2b346fb4f4"></a><br/></td></tr>
+<tr class="memitem:gaac52d241cc86a10965046afc0a8c8a41"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41">stp_printer_get_foomatic_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaac52d241cc86a10965046afc0a8c8a41"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's foomatic ID.  <a href="#gaac52d241cc86a10965046afc0a8c8a41"></a><br/></td></tr>
+<tr class="memitem:gaae84d3fb263c4a171b7b63b6d93a940e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaae84d3fb263c4a171b7b63b6d93a940e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's model number.  <a href="#gaae84d3fb263c4a171b7b63b6d93a940e"></a><br/></td></tr>
+<tr class="memitem:ga4f6859e0f21ed2062075d6b9f680a202"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga4f6859e0f21ed2062075d6b9f680a202"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#ga4f6859e0f21ed2062075d6b9f680a202"></a><br/></td></tr>
+<tr class="memitem:gaf5084888feed9878811ac491cb5313ee"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaf5084888feed9878811ac491cb5313ee"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="#gaf5084888feed9878811ac491cb5313ee"></a><br/></td></tr>
+<tr class="memitem:gac2ed6f27e4db29ceaa74a1b9bd6a78cf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gac2ed6f27e4db29ceaa74a1b9bd6a78cf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="#gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br/></td></tr>
+<tr class="memitem:ga6065874cbb246875925e14d8801898cc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:ga6065874cbb246875925e14d8801898cc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the image.  <a href="#ga6065874cbb246875925e14d8801898cc"></a><br/></td></tr>
+<tr class="memitem:ga31ef7bcc34dda5d3fd46b2d04fcb0c64"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:ga31ef7bcc34dda5d3fd46b2d04fcb0c64"><td class="mdescLeft">&#160;</td><td class="mdescRight">Start a print job.  <a href="#ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br/></td></tr>
+<tr class="memitem:gae61d056dd504facc72ff56d7f16eb23c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:gae61d056dd504facc72ff56d7f16eb23c"><td class="mdescLeft">&#160;</td><td class="mdescRight">End a print job.  <a href="#gae61d056dd504facc72ff56d7f16eb23c"></a><br/></td></tr>
+<tr class="memitem:gaae7a50e6175eed1b84d2e20c924b33ca"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gaae7a50e6175eed1b84d2e20c924b33ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve options that need to be passed to the underlying print system.  <a href="#gaae7a50e6175eed1b84d2e20c924b33ca"></a><br/></td></tr>
+<tr class="memitem:ga2057c5fcfc31d8b4cf7f3291cf3c0cf4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga5b5cb603c9432c03ea459b57a2039bdc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1c6d389f49a185ca24546107bd6f4993"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
+<tr class="memitem:ga67e5c18254f7ad0b0fd77b4cc2265405"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
+<tr class="memitem:ga381f3a4f132a00d6d2e2a9b54f9ed675"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr class="memitem:ga09bf7aebf0385f7b5aac537a13b6e3ed"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga07bc634c85950526155b711aac42c6a0"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:ga50b48bab8d6d1734c3a0f6622d65582e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The printer type represents a printer model. </p>
 <p>A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object. </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga66a5e7cf2b1743a46bd78cb851e1d0a4"></a><!-- doxytag: member="printers.h::stp_family_t" ref="ga66a5e7cf2b1743a46bd78cb851e1d0a4" args="" -->
+<a class="anchor" id="ga66a5e7cf2b1743a46bd78cb851e1d0a4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__family.html">stp_family</a>  <a class="el" href="structstp__family.html">stp_family_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__family.html">stp_family</a>  <a class="el" href="group__printer.html#ga66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gacddc2ce7fa4e0a68fcc30c123503738f"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="gacddc2ce7fa4e0a68fcc30c123503738f" args="" -->
+<a class="anchor" id="gacddc2ce7fa4e0a68fcc30c123503738f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -132,15 +139,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_printer <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The printer opaque data type (representation of printer model). </p>
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga50b48bab8d6d1734c3a0f6622d65582e"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="ga50b48bab8d6d1734c3a0f6622d65582e" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga50b48bab8d6d1734c3a0f6622d65582e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -152,12 +158,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gae61d056dd504facc72ff56d7f16eb23c"></a><!-- doxytag: member="printers.h::stp_end_job" ref="gae61d056dd504facc72ff56d7f16eb23c" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="gae61d056dd504facc72ff56d7f16eb23c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -170,7 +175,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>&#160;</td>
         </tr>
         <tr>
@@ -179,22 +184,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>End a print job. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">image</td><td>the image to print. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga1c6d389f49a185ca24546107bd6f4993"></a><!-- doxytag: member="printers.h::stp_family_register" ref="ga1c6d389f49a185ca24546107bd6f4993" args="(stp_list_t *family)" -->
+<a class="anchor" id="ga1c6d389f49a185ca24546107bd6f4993"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -206,12 +210,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga67e5c18254f7ad0b0fd77b4cc2265405"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga67e5c18254f7ad0b0fd77b4cc2265405" args="(stp_list_t *family)" -->
+<a class="anchor" id="ga67e5c18254f7ad0b0fd77b4cc2265405"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -223,12 +226,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaae7a50e6175eed1b84d2e20c924b33ca"></a><!-- doxytag: member="printers.h::stp_get_external_options" ref="gaae7a50e6175eed1b84d2e20c924b33ca" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gaae7a50e6175eed1b84d2e20c924b33ca"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -240,21 +242,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Retrieve options that need to be passed to the underlying print system. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>list of options in a string list ('name' is the name of the option; 'text' is the value it takes on). NULL return means no external options are required. User must stp_string_list_destroy the list after use. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>list of options in a string list ('name' is the name of the option; 'text' is the value it takes on). NULL return means no external options are required. User must stp_string_list_destroy the list after use. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2057c5fcfc31d8b4cf7f3291cf3c0cf4"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="ga2057c5fcfc31d8b4cf7f3291cf3c0cf4" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga2057c5fcfc31d8b4cf7f3291cf3c0cf4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -266,12 +267,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gac649c4b3d0a93f26f99deb4b081305c1"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="gac649c4b3d0a93f26f99deb4b081305c1" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gac649c4b3d0a93f26f99deb4b081305c1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -283,21 +283,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the printer model from a vars object. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gadce65b83e3dd0ffcb75591ed3ba81155"></a><!-- doxytag: member="printers.h::stp_get_printer_by_device_id" ref="gadce65b83e3dd0ffcb75591ed3ba81155" args="(const char *device_id)" -->
+<a class="anchor" id="gadce65b83e3dd0ffcb75591ed3ba81155"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -309,21 +308,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model by its IEEE 1284 device ID. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">device_id</td><td>the printer model's device ID. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae45de9ef94fb609c2a54f1d80144552e"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="gae45de9ef94fb609c2a54f1d80144552e" args="(const char *driver)" -->
+<a class="anchor" id="gae45de9ef94fb609c2a54f1d80144552e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -335,21 +333,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model by its short name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">driver</td><td>the printer model's short (driver) name. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gacd449b7863a5fcddb6bdb602079448f8"></a><!-- doxytag: member="printers.h::stp_get_printer_by_foomatic_id" ref="gacd449b7863a5fcddb6bdb602079448f8" args="(const char *foomatic_id)" -->
+<a class="anchor" id="gacd449b7863a5fcddb6bdb602079448f8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -361,21 +358,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model by its foomatic ID. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">foomatic_id</td><td>the printer model's foomatic ID </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga440501ca226e0a9ac1335c7e52ee55a6"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="ga440501ca226e0a9ac1335c7e52ee55a6" args="(int idx)" -->
+<a class="anchor" id="ga440501ca226e0a9ac1335c7e52ee55a6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -387,21 +383,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model by its index number. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">idx</td><td>the index number. This must not be greater than (total number of printers - 1). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6bd5abd876100c17fc9029659fed92f4"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="ga6bd5abd876100c17fc9029659fed92f4" args="(const char *long_name)" -->
+<a class="anchor" id="ga6bd5abd876100c17fc9029659fed92f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -413,21 +408,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model by its long (translated) name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">long_name</td><td>the printer model's long (translated) name. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga41094e69b71eb930e770bd2cf8bbf795"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="ga41094e69b71eb930e770bd2cf8bbf795" args="(const char *driver)" -->
+<a class="anchor" id="ga41094e69b71eb930e770bd2cf8bbf795"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -439,22 +433,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the printer index number from the printer model short (driver) name. </p>
 <dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>There should never be any need to use this function. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">driver</td><td>the printer model's short (driver) name. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the index number, or -1 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga381f3a4f132a00d6d2e2a9b54f9ed675"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="ga381f3a4f132a00d6d2e2a9b54f9ed675" args="(void)" -->
+<a class="anchor" id="ga381f3a4f132a00d6d2e2a9b54f9ed675"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -466,12 +459,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga6065874cbb246875925e14d8801898cc"></a><!-- doxytag: member="printers.h::stp_print" ref="ga6065874cbb246875925e14d8801898cc" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="ga6065874cbb246875925e14d8801898cc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -484,7 +476,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>&#160;</td>
         </tr>
         <tr>
@@ -493,23 +485,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Print the image. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>stp_job_start() must be called prior to the first call to this function. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>stp_job_start() must be called prior to the first call to this function. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">image</td><td>the image to print. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga07bc634c85950526155b711aac42c6a0"></a><!-- doxytag: member="printers.h::stp_printer_describe_parameter" ref="ga07bc634c85950526155b711aac42c6a0" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<a class="anchor" id="ga07bc634c85950526155b711aac42c6a0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -537,12 +528,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga4f6859e0f21ed2062075d6b9f680a202"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ga4f6859e0f21ed2062075d6b9f680a202" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="ga4f6859e0f21ed2062075d6b9f680a202"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -554,22 +544,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the default vars for a particular printer model. </p>
 <p>The default vars should be copied to a new vars object and customised prior to printing. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the printer model's default vars. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the printer model's default vars. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga7bbd6440baa533d99616eccb5f449354"></a><!-- doxytag: member="printers.h::stp_printer_get_device_id" ref="ga7bbd6440baa533d99616eccb5f449354" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="ga7bbd6440baa533d99616eccb5f449354"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -581,21 +570,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's IEEE 1284 device ID, if known. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the IEEE 1284 device ID, or NULL if not known. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the IEEE 1284 device ID, or NULL if not known. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="gac345b8cf8cd78da98fdb4c6b2d9cf7ca" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -607,21 +595,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's short (driver) name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the short name (should never be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the short name (should never be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga487b74bf101a842f30b5941b8db4769a"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="ga487b74bf101a842f30b5941b8db4769a" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="ga487b74bf101a842f30b5941b8db4769a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -633,22 +620,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's family name. </p>
 <p>The family name is the name of the modular "family" driver this model uses. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the family name (should never be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the family name (should never be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaac52d241cc86a10965046afc0a8c8a41"></a><!-- doxytag: member="printers.h::stp_printer_get_foomatic_id" ref="gaac52d241cc86a10965046afc0a8c8a41" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="gaac52d241cc86a10965046afc0a8c8a41"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -660,21 +646,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's foomatic ID. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the foomatic ID or NULL (should never be freed) </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the foomatic ID or NULL (should never be freed) </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="ga11804fb9b8d87ed1f2a3acbd39f5f85a" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -686,21 +671,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's long (translated) name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the long name (should never be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the long name (should never be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab99dd05c42aed848d1567f2b346fb4f4"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="gab99dd05c42aed848d1567f2b346fb4f4" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="gab99dd05c42aed848d1567f2b346fb4f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -712,21 +696,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's manufacturer's name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the manufacturer's name (should never be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the manufacturer's name (should never be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaae84d3fb263c4a171b7b63b6d93a940e"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="gaae84d3fb263c4a171b7b63b6d93a940e" args="(const stp_printer_t *p)" -->
+<a class="anchor" id="gaae84d3fb263c4a171b7b63b6d93a940e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -738,22 +721,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a printer model's model number. </p>
 <p>The model number is used internally by the "family" driver module, and has no meaning out of that context. It bears no relation to the model name/number actually found on the printer itself. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the model number. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the model number. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga09bf7aebf0385f7b5aac537a13b6e3ed"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="ga09bf7aebf0385f7b5aac537a13b6e3ed" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga09bf7aebf0385f7b5aac537a13b6e3ed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -765,12 +747,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga6a76f8f76106eddd51af4b1593b4f3af"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="ga6a76f8f76106eddd51af4b1593b4f3af" args="(void)" -->
+<a class="anchor" id="ga6a76f8f76106eddd51af4b1593b4f3af"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -782,15 +763,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the number of available printer models. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the number of printer models. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the number of printer models. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaf5084888feed9878811ac491cb5313ee"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="gaf5084888feed9878811ac491cb5313ee" args="(stp_vars_t *v, const stp_printer_t *p)" -->
+<a class="anchor" id="gaf5084888feed9878811ac491cb5313ee"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -812,11 +792,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a vars object to use a particular driver, and set the parameters to their defaults. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
@@ -826,7 +805,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults_soft" ref="gac2ed6f27e4db29ceaa74a1b9bd6a78cf" args="(stp_vars_t *v, const stp_printer_t *p)" -->
+<a class="anchor" id="gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -848,11 +827,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a vars object to use a particular driver, and set any unset parameters to their defaults. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">p</td><td>the printer model to use. </td></tr>
@@ -862,7 +840,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><!-- doxytag: member="printers.h::stp_start_job" ref="ga31ef7bcc34dda5d3fd46b2d04fcb0c64" args="(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -875,7 +853,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *&#160;</td>
           <td class="paramname"><em>image</em>&#160;</td>
         </tr>
         <tr>
@@ -884,23 +862,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Start a print job. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc" title="Print the image.">stp_print()</a>. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc" title="Print the image.">stp_print()</a>. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">image</td><td>the image to print. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5b5cb603c9432c03ea459b57a2039bdc"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="ga5b5cb603c9432c03ea459b57a2039bdc" args="(stp_vars_t *v)" -->
+<a class="anchor" id="ga5b5cb603c9432c03ea459b57a2039bdc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -912,14 +889,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index 8dc97e7..f08c2d2 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: sequence</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,90 +35,91 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">sequence</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The sequence is a simple "vector of numbers" data structure.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_sequence&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The sequence opaque data type.  <a href="#ga327a46aa1d782a4cd53abf306068e272"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga327a46aa1d782a4cd53abf306068e272"><td class="memItemLeft" align="right" valign="top">typedef struct stp_sequence&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr class="memdesc:ga327a46aa1d782a4cd53abf306068e272"><td class="mdescLeft">&#160;</td><td class="mdescRight">The sequence opaque data type.  <a href="#ga327a46aa1d782a4cd53abf306068e272"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new sequence.  <a href="#ga9f0233f39d6a27c796bb283c80974618"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a sequence.  <a href="#ga3d571f155c1d00e7794b8299a41c5099"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a sequence.  <a href="#ga28087c76e1106ca11c2d247956e3a3c3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a sequence.  <a href="#gab03a34a03ffd4163f51126916d737df7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26">stp_sequence_reverse</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a sequence.  <a href="#ga51f0d093b1b7c1bafe068dcbf172ac26"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gade64193f944aaba0365a96691d479974">stp_sequence_create_reverse</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a sequence.  <a href="#gade64193f944aaba0365a96691d479974"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#ga1720509809473bc33e6f11b277c78bf6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#ga14ad64c63f45a2716ff8d9ceaf00697d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#ga999021f2caf1a9d0d6d133123031ce17"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the sequence size.  <a href="#gae0af31b854e61e0e047b3ba6dc6ec528"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the sequence size.  <a href="#gafa512afc64116f673ae2061d04a5ef90"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence.  <a href="#ga44bf5a48231675305718162559205fb6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#ga5bb962248581af2c3c54193442d9c82f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence.  <a href="#ga755c8a35e2e9e83a1dfac4f6138c4122"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#ga42c76060886da02cb4a7d843ffe6d21c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#gaa79c5f747a80ab2ad9d09b09e0330cc7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#ga35972a289b95891699ade61246882ab4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#gaaa76cdc9094ee3c05c49a782fea64478"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#ga3e274a2095f2e6986892384ee89e1255"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#ga9d3e18b8e576b5c00531dac444397051"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#ga497c32dec3d745a2602c5e97819de21d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#ga572ecad03d772a255481bb8b6d79106f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#ga317d484a67a2b775bee27f3dfe67fed4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#gaff096d5b027157151c65978b95d4e29e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#ga039d9054cfd0f7d5a892a7fec3f734f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#ga12f54f27144d490893f46dd1b0037b8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#ga01b0bc9e181a097aff3e97254dbfcb14"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#gae7189582ef9e4d638f909a2b1ee0c1b2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#ga4d1cf137e4a77e9123e2afcdf7d63bec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#ga20007077e1d8365a0eddaa922a5967c3"></a><br/></td></tr>
+<tr class="memitem:ga9f0233f39d6a27c796bb283c80974618"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
+<tr class="memdesc:ga9f0233f39d6a27c796bb283c80974618"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new sequence.  <a href="#ga9f0233f39d6a27c796bb283c80974618"></a><br/></td></tr>
+<tr class="memitem:ga3d571f155c1d00e7794b8299a41c5099"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:ga3d571f155c1d00e7794b8299a41c5099"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a sequence.  <a href="#ga3d571f155c1d00e7794b8299a41c5099"></a><br/></td></tr>
+<tr class="memitem:ga28087c76e1106ca11c2d247956e3a3c3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
+<tr class="memdesc:ga28087c76e1106ca11c2d247956e3a3c3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a sequence.  <a href="#ga28087c76e1106ca11c2d247956e3a3c3"></a><br/></td></tr>
+<tr class="memitem:gab03a34a03ffd4163f51126916d737df7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gab03a34a03ffd4163f51126916d737df7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a sequence.  <a href="#gab03a34a03ffd4163f51126916d737df7"></a><br/></td></tr>
+<tr class="memitem:ga51f0d093b1b7c1bafe068dcbf172ac26"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26">stp_sequence_reverse</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
+<tr class="memdesc:ga51f0d093b1b7c1bafe068dcbf172ac26"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a sequence.  <a href="#ga51f0d093b1b7c1bafe068dcbf172ac26"></a><br/></td></tr>
+<tr class="memitem:gade64193f944aaba0365a96691d479974"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gade64193f944aaba0365a96691d479974">stp_sequence_create_reverse</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gade64193f944aaba0365a96691d479974"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a sequence.  <a href="#gade64193f944aaba0365a96691d479974"></a><br/></td></tr>
+<tr class="memitem:ga1720509809473bc33e6f11b277c78bf6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr class="memdesc:ga1720509809473bc33e6f11b277c78bf6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#ga1720509809473bc33e6f11b277c78bf6"></a><br/></td></tr>
+<tr class="memitem:ga14ad64c63f45a2716ff8d9ceaf00697d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr class="memdesc:ga14ad64c63f45a2716ff8d9ceaf00697d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#ga14ad64c63f45a2716ff8d9ceaf00697d"></a><br/></td></tr>
+<tr class="memitem:ga999021f2caf1a9d0d6d133123031ce17"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr class="memdesc:ga999021f2caf1a9d0d6d133123031ce17"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#ga999021f2caf1a9d0d6d133123031ce17"></a><br/></td></tr>
+<tr class="memitem:gae0af31b854e61e0e047b3ba6dc6ec528"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr class="memdesc:gae0af31b854e61e0e047b3ba6dc6ec528"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the sequence size.  <a href="#gae0af31b854e61e0e047b3ba6dc6ec528"></a><br/></td></tr>
+<tr class="memitem:gafa512afc64116f673ae2061d04a5ef90"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gafa512afc64116f673ae2061d04a5ef90"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the sequence size.  <a href="#gafa512afc64116f673ae2061d04a5ef90"></a><br/></td></tr>
+<tr class="memitem:ga44bf5a48231675305718162559205fb6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr class="memdesc:ga44bf5a48231675305718162559205fb6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence.  <a href="#ga44bf5a48231675305718162559205fb6"></a><br/></td></tr>
+<tr class="memitem:ga5bb962248581af2c3c54193442d9c82f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr class="memdesc:ga5bb962248581af2c3c54193442d9c82f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#ga5bb962248581af2c3c54193442d9c82f"></a><br/></td></tr>
+<tr class="memitem:ga755c8a35e2e9e83a1dfac4f6138c4122"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr class="memdesc:ga755c8a35e2e9e83a1dfac4f6138c4122"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence.  <a href="#ga755c8a35e2e9e83a1dfac4f6138c4122"></a><br/></td></tr>
+<tr class="memitem:ga42c76060886da02cb4a7d843ffe6d21c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr class="memdesc:ga42c76060886da02cb4a7d843ffe6d21c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#ga42c76060886da02cb4a7d843ffe6d21c"></a><br/></td></tr>
+<tr class="memitem:gaa79c5f747a80ab2ad9d09b09e0330cc7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr class="memdesc:gaa79c5f747a80ab2ad9d09b09e0330cc7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#gaa79c5f747a80ab2ad9d09b09e0330cc7"></a><br/></td></tr>
+<tr class="memitem:ga35972a289b95891699ade61246882ab4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr class="memdesc:ga35972a289b95891699ade61246882ab4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#ga35972a289b95891699ade61246882ab4"></a><br/></td></tr>
+<tr class="memitem:gaaa76cdc9094ee3c05c49a782fea64478"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr class="memdesc:gaaa76cdc9094ee3c05c49a782fea64478"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#gaaa76cdc9094ee3c05c49a782fea64478"></a><br/></td></tr>
+<tr class="memitem:ga3e274a2095f2e6986892384ee89e1255"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr class="memdesc:ga3e274a2095f2e6986892384ee89e1255"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#ga3e274a2095f2e6986892384ee89e1255"></a><br/></td></tr>
+<tr class="memitem:ga9d3e18b8e576b5c00531dac444397051"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr class="memdesc:ga9d3e18b8e576b5c00531dac444397051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#ga9d3e18b8e576b5c00531dac444397051"></a><br/></td></tr>
+<tr class="memitem:ga497c32dec3d745a2602c5e97819de21d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr class="memdesc:ga497c32dec3d745a2602c5e97819de21d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#ga497c32dec3d745a2602c5e97819de21d"></a><br/></td></tr>
+<tr class="memitem:ga572ecad03d772a255481bb8b6d79106f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr class="memdesc:ga572ecad03d772a255481bb8b6d79106f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#ga572ecad03d772a255481bb8b6d79106f"></a><br/></td></tr>
+<tr class="memitem:ga317d484a67a2b775bee27f3dfe67fed4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr class="memdesc:ga317d484a67a2b775bee27f3dfe67fed4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#ga317d484a67a2b775bee27f3dfe67fed4"></a><br/></td></tr>
+<tr class="memitem:gaff096d5b027157151c65978b95d4e29e"><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:gaff096d5b027157151c65978b95d4e29e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#gaff096d5b027157151c65978b95d4e29e"></a><br/></td></tr>
+<tr class="memitem:ga039d9054cfd0f7d5a892a7fec3f734f4"><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga039d9054cfd0f7d5a892a7fec3f734f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#ga039d9054cfd0f7d5a892a7fec3f734f4"></a><br/></td></tr>
+<tr class="memitem:ga12f54f27144d490893f46dd1b0037b8b"><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga12f54f27144d490893f46dd1b0037b8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#ga12f54f27144d490893f46dd1b0037b8b"></a><br/></td></tr>
+<tr class="memitem:ga01b0bc9e181a097aff3e97254dbfcb14"><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga01b0bc9e181a097aff3e97254dbfcb14"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#ga01b0bc9e181a097aff3e97254dbfcb14"></a><br/></td></tr>
+<tr class="memitem:gae7189582ef9e4d638f909a2b1ee0c1b2"><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:gae7189582ef9e4d638f909a2b1ee0c1b2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#gae7189582ef9e4d638f909a2b1ee0c1b2"></a><br/></td></tr>
+<tr class="memitem:ga4d1cf137e4a77e9123e2afcdf7d63bec"><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga4d1cf137e4a77e9123e2afcdf7d63bec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#ga4d1cf137e4a77e9123e2afcdf7d63bec"></a><br/></td></tr>
+<tr class="memitem:ga20007077e1d8365a0eddaa922a5967c3"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga20007077e1d8365a0eddaa922a5967c3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#ga20007077e1d8365a0eddaa922a5967c3"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The sequence is a simple "vector of numbers" data structure. </p>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga327a46aa1d782a4cd53abf306068e272"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="ga327a46aa1d782a4cd53abf306068e272" args="" -->
+<a class="anchor" id="ga327a46aa1d782a4cd53abf306068e272"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -120,15 +127,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_sequence <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The sequence opaque data type. </p>
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga28087c76e1106ca11c2d247956e3a3c3"></a><!-- doxytag: member="sequence.h::stp_sequence_copy" ref="ga28087c76e1106ca11c2d247956e3a3c3" args="(stp_sequence_t *dest, const stp_sequence_t *source)" -->
+<a class="anchor" id="ga28087c76e1106ca11c2d247956e3a3c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -150,12 +156,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy a sequence. </p>
 <p>Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination sequence. </td></tr>
     <tr><td class="paramname">source</td><td>the source sequence. </td></tr>
@@ -165,7 +170,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga9f0233f39d6a27c796bb283c80974618"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="ga9f0233f39d6a27c796bb283c80974618" args="(void)" -->
+<a class="anchor" id="ga9f0233f39d6a27c796bb283c80974618"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -177,15 +182,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new sequence. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created sequence. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created sequence. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab03a34a03ffd4163f51126916d737df7"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="gab03a34a03ffd4163f51126916d737df7" args="(const stp_sequence_t *sequence)" -->
+<a class="anchor" id="gab03a34a03ffd4163f51126916d737df7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -197,22 +201,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate a sequence. </p>
 <p>A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the source sequence. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the sequence. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the sequence. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gade64193f944aaba0365a96691d479974"></a><!-- doxytag: member="sequence.h::stp_sequence_create_reverse" ref="gade64193f944aaba0365a96691d479974" args="(const stp_sequence_t *sequence)" -->
+<a class="anchor" id="gade64193f944aaba0365a96691d479974"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -224,22 +227,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Reverse and allocate a sequence. </p>
 <p>A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the source sequence. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the sequence. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the sequence. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3d571f155c1d00e7794b8299a41c5099"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="ga3d571f155c1d00e7794b8299a41c5099" args="(stp_sequence_t *sequence)" -->
+<a class="anchor" id="ga3d571f155c1d00e7794b8299a41c5099"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -251,12 +253,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a sequence. </p>
 <p>It is an error to destroy the sequence more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to destroy. </td></tr>
   </table>
@@ -265,7 +266,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga14ad64c63f45a2716ff8d9ceaf00697d"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="ga14ad64c63f45a2716ff8d9ceaf00697d" args="(const stp_sequence_t *sequence, double *low, double *high)" -->
+<a class="anchor" id="ga14ad64c63f45a2716ff8d9ceaf00697d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -293,12 +294,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the lower and upper bounds. </p>
 <p>The values are stored in the variables pointed to by low and high. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to work on. </td></tr>
     <tr><td class="paramname">low</td><td>a pointer to a double to store the low bound in. </td></tr>
@@ -309,7 +309,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga755c8a35e2e9e83a1dfac4f6138c4122"></a><!-- doxytag: member="sequence.h::stp_sequence_get_data" ref="ga755c8a35e2e9e83a1dfac4f6138c4122" args="(const stp_sequence_t *sequence, size_t *size, const double **data)" -->
+<a class="anchor" id="ga755c8a35e2e9e83a1dfac4f6138c4122"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -337,26 +337,25 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">size</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
-    <tr><td class="paramname">data</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272" title="The sequence opaque data type.">stp_sequence_t</a> *sequence;
- <span class="keywordtype">size_t</span> size;
- <span class="keywordtype">double</span> *data;
- <a class="code" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122" title="Get the data in a sequence.">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
-</pre></div> </td></tr>
+    <tr><td class="paramname">data</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><div class="line"> <a class="code" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272" title="The sequence opaque data type.">stp_sequence_t</a> *sequence;</div>
+<div class="line"> <span class="keywordtype">size_t</span> size;</div>
+<div class="line"> <span class="keywordtype">double</span> *data;</div>
+<div class="line"> <a class="code" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122" title="Get the data in a sequence.">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);</div>
+</div><!-- fragment --> </td></tr>
   </table>
   </dd>
 </dl>
 
 </div>
 </div>
-<a class="anchor" id="gaff096d5b027157151c65978b95d4e29e"></a><!-- doxytag: member="sequence.h::stp_sequence_get_float_data" ref="gaff096d5b027157151c65978b95d4e29e" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="gaff096d5b027157151c65978b95d4e29e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -378,23 +377,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as float data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga01b0bc9e181a097aff3e97254dbfcb14"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="ga01b0bc9e181a097aff3e97254dbfcb14" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="ga01b0bc9e181a097aff3e97254dbfcb14"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -416,23 +414,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as int data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga039d9054cfd0f7d5a892a7fec3f734f4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="ga039d9054cfd0f7d5a892a7fec3f734f4" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="ga039d9054cfd0f7d5a892a7fec3f734f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -454,23 +451,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as long data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaa79c5f747a80ab2ad9d09b09e0330cc7"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="gaa79c5f747a80ab2ad9d09b09e0330cc7" args="(const stp_sequence_t *sequence, size_t where, double *data)" -->
+<a class="anchor" id="gaa79c5f747a80ab2ad9d09b09e0330cc7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -498,11 +494,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data at a single point in a sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to use. </td></tr>
     <tr><td class="paramname">where</td><td>the location (indexed from zero). </td></tr>
@@ -510,11 +505,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga999021f2caf1a9d0d6d133123031ce17"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="ga999021f2caf1a9d0d6d133123031ce17" args="(const stp_sequence_t *sequence, double *low, double *high)" -->
+<a class="anchor" id="ga999021f2caf1a9d0d6d133123031ce17"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -542,12 +537,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get range of values stored in the sequence. </p>
 <p>The values are stored in the variables pointed to by low and high. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to work on. </td></tr>
     <tr><td class="paramname">low</td><td>a pointer to a double to store the low bound in. </td></tr>
@@ -558,7 +552,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4d1cf137e4a77e9123e2afcdf7d63bec"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="ga4d1cf137e4a77e9123e2afcdf7d63bec" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="ga4d1cf137e4a77e9123e2afcdf7d63bec"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -580,23 +574,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as short data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gafa512afc64116f673ae2061d04a5ef90"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="gafa512afc64116f673ae2061d04a5ef90" args="(const stp_sequence_t *sequence)" -->
+<a class="anchor" id="gafa512afc64116f673ae2061d04a5ef90"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -608,15 +601,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the sequence size. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the sequence size. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the sequence size. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae7189582ef9e4d638f909a2b1ee0c1b2"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="gae7189582ef9e4d638f909a2b1ee0c1b2" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="gae7189582ef9e4d638f909a2b1ee0c1b2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -638,23 +630,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as unsigned int data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga12f54f27144d490893f46dd1b0037b8b"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="ga12f54f27144d490893f46dd1b0037b8b" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="ga12f54f27144d490893f46dd1b0037b8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -676,23 +667,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as unsigned long data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga20007077e1d8365a0eddaa922a5967c3"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="ga20007077e1d8365a0eddaa922a5967c3" args="(const stp_sequence_t *sequence, size_t *count)" -->
+<a class="anchor" id="ga20007077e1d8365a0eddaa922a5967c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -714,23 +704,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the data in a sequence as unsigned short data. </p>
 <p>The pointer returned is owned by the curve, and is not guaranteed to be valid beyond the next non-const curve call; If the bounds of the curve exceed the limits of the data type, NULL is returned. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to get the data from. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga51f0d093b1b7c1bafe068dcbf172ac26"></a><!-- doxytag: member="sequence.h::stp_sequence_reverse" ref="ga51f0d093b1b7c1bafe068dcbf172ac26" args="(stp_sequence_t *dest, const stp_sequence_t *source)" -->
+<a class="anchor" id="ga51f0d093b1b7c1bafe068dcbf172ac26"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -752,12 +741,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Reverse a sequence. </p>
 <p>Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618" title="Create a new sequence.">stp_sequence_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination sequence. </td></tr>
     <tr><td class="paramname">source</td><td>the source sequence. </td></tr>
@@ -767,7 +755,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga1720509809473bc33e6f11b277c78bf6"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="ga1720509809473bc33e6f11b277c78bf6" args="(stp_sequence_t *sequence, double low, double high)" -->
+<a class="anchor" id="ga1720509809473bc33e6f11b277c78bf6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -795,12 +783,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the lower and upper bounds. </p>
 <p>The lower and upper bounds set the minimum and maximum values that a point in the sequence may hold. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to work on. </td></tr>
     <tr><td class="paramname">low</td><td>the lower bound. </td></tr>
@@ -808,11 +795,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga44bf5a48231675305718162559205fb6"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="ga44bf5a48231675305718162559205fb6" args="(stp_sequence_t *sequence, size_t count, const double *data)" -->
+<a class="anchor" id="ga44bf5a48231675305718162559205fb6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -840,11 +827,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -852,11 +838,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga35972a289b95891699ade61246882ab4"></a><!-- doxytag: member="sequence.h::stp_sequence_set_float_data" ref="ga35972a289b95891699ade61246882ab4" args="(stp_sequence_t *sequence, size_t count, const float *data)" -->
+<a class="anchor" id="ga35972a289b95891699ade61246882ab4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -884,11 +870,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from float values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -896,11 +881,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga9d3e18b8e576b5c00531dac444397051"></a><!-- doxytag: member="sequence.h::stp_sequence_set_int_data" ref="ga9d3e18b8e576b5c00531dac444397051" args="(stp_sequence_t *sequence, size_t count, const int *data)" -->
+<a class="anchor" id="ga9d3e18b8e576b5c00531dac444397051"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -928,11 +913,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from int values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -940,11 +924,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaaa76cdc9094ee3c05c49a782fea64478"></a><!-- doxytag: member="sequence.h::stp_sequence_set_long_data" ref="gaaa76cdc9094ee3c05c49a782fea64478" args="(stp_sequence_t *sequence, size_t count, const long *data)" -->
+<a class="anchor" id="gaaa76cdc9094ee3c05c49a782fea64478"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -972,11 +956,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from long values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -984,11 +967,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga42c76060886da02cb4a7d843ffe6d21c"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="ga42c76060886da02cb4a7d843ffe6d21c" args="(stp_sequence_t *sequence, size_t where, double data)" -->
+<a class="anchor" id="ga42c76060886da02cb4a7d843ffe6d21c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1016,11 +999,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data at a single point in a sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to use. </td></tr>
     <tr><td class="paramname">where</td><td>the location (indexed from zero). </td></tr>
@@ -1028,11 +1010,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga572ecad03d772a255481bb8b6d79106f"></a><!-- doxytag: member="sequence.h::stp_sequence_set_short_data" ref="ga572ecad03d772a255481bb8b6d79106f" args="(stp_sequence_t *sequence, size_t count, const short *data)" -->
+<a class="anchor" id="ga572ecad03d772a255481bb8b6d79106f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1060,11 +1042,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from short values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -1072,11 +1053,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae0af31b854e61e0e047b3ba6dc6ec528"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="gae0af31b854e61e0e047b3ba6dc6ec528" args="(stp_sequence_t *sequence, size_t size)" -->
+<a class="anchor" id="gae0af31b854e61e0e047b3ba6dc6ec528"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1098,23 +1079,22 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the sequence size. </p>
 <p>The size is the number of elements the sequence contains. Note that resizing will destroy all data contained in the sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to work on. </td></tr>
     <tr><td class="paramname">size</td><td>the size to set the sequence to. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5bb962248581af2c3c54193442d9c82f"></a><!-- doxytag: member="sequence.h::stp_sequence_set_subrange" ref="ga5bb962248581af2c3c54193442d9c82f" args="(stp_sequence_t *sequence, size_t where, size_t size, const double *data)" -->
+<a class="anchor" id="ga5bb962248581af2c3c54193442d9c82f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1148,11 +1128,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a subrange of a sequence. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">where</td><td>the starting element in the sequence (indexed from 0). </td></tr>
@@ -1161,11 +1140,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga497c32dec3d745a2602c5e97819de21d"></a><!-- doxytag: member="sequence.h::stp_sequence_set_uint_data" ref="ga497c32dec3d745a2602c5e97819de21d" args="(stp_sequence_t *sequence, size_t count, const unsigned int *data)" -->
+<a class="anchor" id="ga497c32dec3d745a2602c5e97819de21d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1193,11 +1172,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from unsigned int values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -1205,11 +1183,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3e274a2095f2e6986892384ee89e1255"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ulong_data" ref="ga3e274a2095f2e6986892384ee89e1255" args="(stp_sequence_t *sequence, size_t count, const unsigned long *data)" -->
+<a class="anchor" id="ga3e274a2095f2e6986892384ee89e1255"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1237,11 +1215,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from unsigned long values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -1249,11 +1226,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga317d484a67a2b775bee27f3dfe67fed4"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ushort_data" ref="ga317d484a67a2b775bee27f3dfe67fed4" args="(stp_sequence_t *sequence, size_t count, const unsigned short *data)" -->
+<a class="anchor" id="ga317d484a67a2b775bee27f3dfe67fed4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1281,11 +1258,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the data in a sequence from unsigned short values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">sequence</td><td>the sequence to set. </td></tr>
     <tr><td class="paramname">count</td><td>the number of elements in the data. </td></tr>
@@ -1293,13 +1269,16 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>1 on success, 0 on failure. </dd></dl>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index b9f4f91..1d64334 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: util</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,92 +35,93 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">util</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>Utility functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&#160;&#160;&#160;0x1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&#160;&#160;&#160;0x2</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&#160;&#160;&#160;0x4</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&#160;&#160;&#160;0x8</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&#160;&#160;&#160;0x10</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gada7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&#160;&#160;&#160;0x20</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&#160;&#160;&#160;0x40</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&#160;&#160;&#160;0x80</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&#160;&#160;&#160;0x100</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&#160;&#160;&#160;0x200</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&#160;&#160;&#160;0x400</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&#160;&#160;&#160;0x800</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&#160;&#160;&#160;0x1000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&#160;&#160;&#160;0x2000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&#160;&#160;&#160;0x4000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&#160;&#160;&#160;0x8000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gacf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&#160;&#160;&#160;0x10000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&#160;&#160;&#160;0x20000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31234d4cc42f026f39ea32ee3dd7b0a1">STP_DBG_DYESUB</a>&#160;&#160;&#160;0x40000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&#160;&#160;&#160;0x80000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&#160;&#160;&#160;0x100000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&#160;&#160;&#160;0x200000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&#160;&#160;&#160;0x400000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaef83832f5488d7be5f6e75a5bc022360">STP_DBG_ASSERTIONS</a>&#160;&#160;&#160;0x800000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga4472d3ba849ed203d43005f04583decc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&#160;&#160;&#160;0x1</td></tr>
+<tr class="memitem:ga0beee5fa281098eab25e3f22570c0fdc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&#160;&#160;&#160;0x2</td></tr>
+<tr class="memitem:ga1c6936662d2cbe95de396fe8af2f254d"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&#160;&#160;&#160;0x4</td></tr>
+<tr class="memitem:ga90d230dd93fa96d34b438e82ed3f9639"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&#160;&#160;&#160;0x8</td></tr>
+<tr class="memitem:gaf8162186c8118e5c3a8543bc0c410a78"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&#160;&#160;&#160;0x10</td></tr>
+<tr class="memitem:gada7c4766db0c05ecb5ce435ddd81ecdd"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gada7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&#160;&#160;&#160;0x20</td></tr>
+<tr class="memitem:ga109cde96d907cbd28f0b631f07a3d696"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&#160;&#160;&#160;0x40</td></tr>
+<tr class="memitem:gac71c7cb5cdf49c881d944ef813a3733f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&#160;&#160;&#160;0x80</td></tr>
+<tr class="memitem:ga2af8b3f36dbda4cfd313b50ba2dae636"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&#160;&#160;&#160;0x100</td></tr>
+<tr class="memitem:ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&#160;&#160;&#160;0x200</td></tr>
+<tr class="memitem:ga01f4480bda8819f337b2be4c41e0ebe1"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&#160;&#160;&#160;0x400</td></tr>
+<tr class="memitem:ga3c5672b14a2e2ccdffca5b6277b1aac2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&#160;&#160;&#160;0x800</td></tr>
+<tr class="memitem:ga9ace1ab545abac936101248caf9a50c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&#160;&#160;&#160;0x1000</td></tr>
+<tr class="memitem:ga6f8cdfb28d0d73e9579fb1751f540dc7"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&#160;&#160;&#160;0x2000</td></tr>
+<tr class="memitem:gad5eeaeabba7a0a861ae0dc936057aabd"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&#160;&#160;&#160;0x4000</td></tr>
+<tr class="memitem:gadbfb451ebbd246d62bd52e0120fa232b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&#160;&#160;&#160;0x8000</td></tr>
+<tr class="memitem:gacf72e68aa70e333b06b0bb821218d967"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gacf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&#160;&#160;&#160;0x10000</td></tr>
+<tr class="memitem:ga4c481c5ea8d87ae6c0e556593ab2020e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&#160;&#160;&#160;0x20000</td></tr>
+<tr class="memitem:ga31234d4cc42f026f39ea32ee3dd7b0a1"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31234d4cc42f026f39ea32ee3dd7b0a1">STP_DBG_DYESUB</a>&#160;&#160;&#160;0x40000</td></tr>
+<tr class="memitem:ga8f3e76af1b2564a5763e790a45215438"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&#160;&#160;&#160;0x80000</td></tr>
+<tr class="memitem:gaabbc2868668663cc28d6289d50e5f83d"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&#160;&#160;&#160;0x100000</td></tr>
+<tr class="memitem:gab3c2a0be5bea6ef42b720eabde62cd44"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&#160;&#160;&#160;0x200000</td></tr>
+<tr class="memitem:gaa447450ea502f96203aa2c47f6e49e92"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&#160;&#160;&#160;0x400000</td></tr>
+<tr class="memitem:gaef83832f5488d7be5f6e75a5bc022360"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaef83832f5488d7be5f6e75a5bc022360">STP_DBG_ASSERTIONS</a>&#160;&#160;&#160;0x800000</td></tr>
+<tr class="memitem:gaa5a86efbbd3e2eb391718d82a1d7ffcc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output encoding.  <a href="#ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaaace483bb815cde40e15bee42be1e24d">stp_write_raw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaeba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library version string (x.y.z)  <a href="#ga1f0797636484393574cb95e667819dc1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library release version string (x.y)  <a href="#ga5ba7edc43ed094f32ae7d9158a362a7b"></a><br/></td></tr>
+<tr class="memitem:ga2ce0a2e8887fe5ff7f3eed1370d0d691"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
+<tr class="memdesc:ga2ce0a2e8887fe5ff7f3eed1370d0d691"><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br/></td></tr>
+<tr class="memitem:ga7fcc19f0abdc6513dfba7eaebeb16cb9"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr class="memdesc:ga7fcc19f0abdc6513dfba7eaebeb16cb9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output encoding.  <a href="#ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br/></td></tr>
+<tr class="memitem:gadbe8c167230b49bc10391d2c246e6dc0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr class="memitem:gad0c145dc5cebecab0bb4e3ac40fc8e4d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
+<tr class="memitem:ga13aa8afef5b0872704390adc6a01924e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gad7ffe058decb939af6a5c1ec1d0d77fa"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga183d8f36f187530f9d7acdb176be3409"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaaace483bb815cde40e15bee42be1e24d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaaace483bb815cde40e15bee42be1e24d">stp_write_raw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga39e4c5f6fa2a07dfca3090a50a8858f9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1ffcb45ea3c37bb6b485addcaf945c99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga23b504253ceda208b9a4985e6de8a5f7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaadf69b8b3f713d2bd7ca3a5648da0c56"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga258b7b5f8808d0a3168f798e8bf72608"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaf6cf72e5e45f175ae8c332c0588832b9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga79dd0a6f5c63f4fbf8591d3c041a7720"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gadb49b9cba9ddf4e506b6f530353ad93d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr class="memitem:ga15987fbd850e04f2520cb151e08908e1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
+<tr class="memitem:gae53707df5c9945f289c58bfbe08a8d88"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga1df22de14e3275cb26ede10da66eebdf"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga3f57c5298a5c6140ac56771dd62bd036"><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:gad4f33438f0103a143d90dc9c48d248eb"><td class="memItemLeft" align="right" valign="top">void void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:gaeba8c24f265ee904c5876704b767841c"><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaeba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
+<tr class="memitem:ga511e0c4cac91c674797da98ab96b83e6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga129f45d7df47fd58d8653538fd13a1f2"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga6d15e5b4e00f9d242166edb5332f8368"><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gabe74390c1422e9746745da55692f47b8"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga86a2976738a237df953655e733c75b3a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
+<tr class="memitem:gac8fd1a439fa2d8e1ff1a2b104cd0137b"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
+<tr class="memitem:ga2420936ab8b3492581f389deea44f58c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr class="memitem:ga7d0c40c3157b2c5c630200352064874c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
+<tr class="memitem:ga56b08d3e12750bdfae8b53263f97aba9"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
+<tr class="memitem:gab026f7022963acd694a8b89e4decbde5"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr class="memitem:ga5c0731867697f555a94b2a1229804381"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
+<tr class="memitem:ga1f0797636484393574cb95e667819dc1"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
+<tr class="memdesc:ga1f0797636484393574cb95e667819dc1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library version string (x.y.z)  <a href="#ga1f0797636484393574cb95e667819dc1"></a><br/></td></tr>
+<tr class="memitem:ga5ba7edc43ed094f32ae7d9158a362a7b"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
+<tr class="memdesc:ga5ba7edc43ed094f32ae7d9158a362a7b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library release version string (x.y)  <a href="#ga5ba7edc43ed094f32ae7d9158a362a7b"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>Utility functions. </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="gaef83832f5488d7be5f6e75a5bc022360"></a><!-- doxytag: member="util.h::STP_DBG_ASSERTIONS" ref="gaef83832f5488d7be5f6e75a5bc022360" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="gaef83832f5488d7be5f6e75a5bc022360"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -122,12 +129,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_ASSERTIONS&#160;&#160;&#160;0x800000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga109cde96d907cbd28f0b631f07a3d696"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga109cde96d907cbd28f0b631f07a3d696" args="" -->
+<a class="anchor" id="ga109cde96d907cbd28f0b631f07a3d696"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -135,12 +141,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_CANON&#160;&#160;&#160;0x40</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga0beee5fa281098eab25e3f22570c0fdc"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="ga0beee5fa281098eab25e3f22570c0fdc" args="" -->
+<a class="anchor" id="ga0beee5fa281098eab25e3f22570c0fdc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -148,12 +153,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_COLORFUNC&#160;&#160;&#160;0x2</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga8f3e76af1b2564a5763e790a45215438"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="ga8f3e76af1b2564a5763e790a45215438" args="" -->
+<a class="anchor" id="ga8f3e76af1b2564a5763e790a45215438"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -161,12 +165,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_CURVE&#160;&#160;&#160;0x80000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaabbc2868668663cc28d6289d50e5f83d"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="gaabbc2868668663cc28d6289d50e5f83d" args="" -->
+<a class="anchor" id="gaabbc2868668663cc28d6289d50e5f83d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -174,12 +177,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_CURVE_ERRORS&#160;&#160;&#160;0x100000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga31234d4cc42f026f39ea32ee3dd7b0a1"></a><!-- doxytag: member="util.h::STP_DBG_DYESUB" ref="ga31234d4cc42f026f39ea32ee3dd7b0a1" args="" -->
+<a class="anchor" id="ga31234d4cc42f026f39ea32ee3dd7b0a1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -187,12 +189,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_DYESUB&#160;&#160;&#160;0x40000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gada7c4766db0c05ecb5ce435ddd81ecdd"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="gada7c4766db0c05ecb5ce435ddd81ecdd" args="" -->
+<a class="anchor" id="gada7c4766db0c05ecb5ce435ddd81ecdd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -200,12 +201,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_ESCP2&#160;&#160;&#160;0x20</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1c6936662d2cbe95de396fe8af2f254d"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="ga1c6936662d2cbe95de396fe8af2f254d" args="" -->
+<a class="anchor" id="ga1c6936662d2cbe95de396fe8af2f254d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -213,12 +213,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_INK&#160;&#160;&#160;0x4</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gac71c7cb5cdf49c881d944ef813a3733f"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="gac71c7cb5cdf49c881d944ef813a3733f" args="" -->
+<a class="anchor" id="gac71c7cb5cdf49c881d944ef813a3733f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -226,12 +225,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_LEXMARK&#160;&#160;&#160;0x80</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga3c5672b14a2e2ccdffca5b6277b1aac2"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="ga3c5672b14a2e2ccdffca5b6277b1aac2" args="" -->
+<a class="anchor" id="ga3c5672b14a2e2ccdffca5b6277b1aac2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -239,12 +237,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_LIST&#160;&#160;&#160;0x800</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga4472d3ba849ed203d43005f04583decc"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="ga4472d3ba849ed203d43005f04583decc" args="" -->
+<a class="anchor" id="ga4472d3ba849ed203d43005f04583decc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -252,12 +249,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_LUT&#160;&#160;&#160;0x1</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga01f4480bda8819f337b2be4c41e0ebe1"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="ga01f4480bda8819f337b2be4c41e0ebe1" args="" -->
+<a class="anchor" id="ga01f4480bda8819f337b2be4c41e0ebe1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -265,12 +261,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_MARK_FILE&#160;&#160;&#160;0x400</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga9ace1ab545abac936101248caf9a50c6"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="ga9ace1ab545abac936101248caf9a50c6" args="" -->
+<a class="anchor" id="ga9ace1ab545abac936101248caf9a50c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -278,12 +273,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_MODULE&#160;&#160;&#160;0x1000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaa447450ea502f96203aa2c47f6e49e92"></a><!-- doxytag: member="util.h::STP_DBG_NO_COMPRESSION" ref="gaa447450ea502f96203aa2c47f6e49e92" args="" -->
+<a class="anchor" id="gaa447450ea502f96203aa2c47f6e49e92"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -291,12 +285,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_NO_COMPRESSION&#160;&#160;&#160;0x400000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad5eeaeabba7a0a861ae0dc936057aabd"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="gad5eeaeabba7a0a861ae0dc936057aabd" args="" -->
+<a class="anchor" id="gad5eeaeabba7a0a861ae0dc936057aabd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -304,12 +297,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PAPER&#160;&#160;&#160;0x4000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga6f8cdfb28d0d73e9579fb1751f540dc7"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="ga6f8cdfb28d0d73e9579fb1751f540dc7" args="" -->
+<a class="anchor" id="ga6f8cdfb28d0d73e9579fb1751f540dc7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -317,12 +309,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PATH&#160;&#160;&#160;0x2000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaf8162186c8118e5c3a8543bc0c410a78"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="gaf8162186c8118e5c3a8543bc0c410a78" args="" -->
+<a class="anchor" id="gaf8162186c8118e5c3a8543bc0c410a78"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -330,12 +321,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PCL&#160;&#160;&#160;0x10</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gab3c2a0be5bea6ef42b720eabde62cd44"></a><!-- doxytag: member="util.h::STP_DBG_PPD" ref="gab3c2a0be5bea6ef42b720eabde62cd44" args="" -->
+<a class="anchor" id="gab3c2a0be5bea6ef42b720eabde62cd44"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -343,12 +333,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PPD&#160;&#160;&#160;0x200000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadbfb451ebbd246d62bd52e0120fa232b"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="gadbfb451ebbd246d62bd52e0120fa232b" args="" -->
+<a class="anchor" id="gadbfb451ebbd246d62bd52e0120fa232b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -356,12 +345,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PRINTERS&#160;&#160;&#160;0x8000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga90d230dd93fa96d34b438e82ed3f9639"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="ga90d230dd93fa96d34b438e82ed3f9639" args="" -->
+<a class="anchor" id="ga90d230dd93fa96d34b438e82ed3f9639"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -369,12 +357,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_PS&#160;&#160;&#160;0x8</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0" args="" -->
+<a class="anchor" id="ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -382,12 +369,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_ROWS&#160;&#160;&#160;0x200</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga4c481c5ea8d87ae6c0e556593ab2020e"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="ga4c481c5ea8d87ae6c0e556593ab2020e" args="" -->
+<a class="anchor" id="ga4c481c5ea8d87ae6c0e556593ab2020e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -395,12 +381,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_VARS&#160;&#160;&#160;0x20000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga2af8b3f36dbda4cfd313b50ba2dae636"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="ga2af8b3f36dbda4cfd313b50ba2dae636" args="" -->
+<a class="anchor" id="ga2af8b3f36dbda4cfd313b50ba2dae636"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -408,12 +393,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_WEAVE_PARAMS&#160;&#160;&#160;0x100</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gacf72e68aa70e333b06b0bb821218d967"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="gacf72e68aa70e333b06b0bb821218d967" args="" -->
+<a class="anchor" id="gacf72e68aa70e333b06b0bb821218d967"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -421,12 +405,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_DBG_XML&#160;&#160;&#160;0x10000</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaa5a86efbbd3e2eb391718d82a1d7ffcc"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="gaa5a86efbbd3e2eb391718d82a1d7ffcc" args="(x)" -->
+<a class="anchor" id="gaa5a86efbbd3e2eb391718d82a1d7ffcc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -438,19 +421,18 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
-<b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span>                                              \
-{                                               \
-  <span class="keywordflow">if</span> ((x))                                      \
-    <a class="code" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
-  ((x)) = NULL;                                 \
-} <span class="keywordflow">while</span> (0)
-</pre></div>
+</div><div class="memdoc">
+<b>Value:</b><div class="fragment"><div class="line"><span class="keywordflow">do</span>                                              \</div>
+<div class="line">{                                               \</div>
+<div class="line">  if ((x))                                      \</div>
+<div class="line">    stp_free((<span class="keywordtype">char</span> *)(x));                      \</div>
+<div class="line">  ((x)) = NULL;                                 \</div>
+<div class="line">} <span class="keywordflow">while</span> (0)</div>
+</div><!-- fragment -->
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="gad0c145dc5cebecab0bb4e3ac40fc8e4d"></a><!-- doxytag: member="util.h::stp_abort" ref="gad0c145dc5cebecab0bb4e3ac40fc8e4d" args="(void)" -->
+<a class="anchor" id="gad0c145dc5cebecab0bb4e3ac40fc8e4d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -462,12 +444,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga3f57c5298a5c6140ac56771dd62bd036"></a><!-- doxytag: member="util.h::stp_asprintf" ref="ga3f57c5298a5c6140ac56771dd62bd036" args="(char **strp, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="ga3f57c5298a5c6140ac56771dd62bd036"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -495,12 +476,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad4f33438f0103a143d90dc9c48d248eb"></a><!-- doxytag: member="util.h::stp_catprintf" ref="gad4f33438f0103a143d90dc9c48d248eb" args="(char **strp, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="gad4f33438f0103a143d90dc9c48d248eb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -528,12 +508,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga129f45d7df47fd58d8653538fd13a1f2"></a><!-- doxytag: member="util.h::stp_deprintf" ref="ga129f45d7df47fd58d8653538fd13a1f2" args="(unsigned long level, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="ga129f45d7df47fd58d8653538fd13a1f2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -561,12 +540,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga511e0c4cac91c674797da98ab96b83e6"></a><!-- doxytag: member="util.h::stp_dprintf" ref="ga511e0c4cac91c674797da98ab96b83e6" args="(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="ga511e0c4cac91c674797da98ab96b83e6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -600,12 +578,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gae53707df5c9945f289c58bfbe08a8d88"></a><!-- doxytag: member="util.h::stp_eprintf" ref="gae53707df5c9945f289c58bfbe08a8d88" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="gae53707df5c9945f289c58bfbe08a8d88"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -633,12 +610,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1df22de14e3275cb26ede10da66eebdf"></a><!-- doxytag: member="util.h::stp_erprintf" ref="ga1df22de14e3275cb26ede10da66eebdf" args="(const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="ga1df22de14e3275cb26ede10da66eebdf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -660,12 +636,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga15987fbd850e04f2520cb151e08908e1"></a><!-- doxytag: member="util.h::stp_erputc" ref="ga15987fbd850e04f2520cb151e08908e1" args="(int ch)" -->
+<a class="anchor" id="ga15987fbd850e04f2520cb151e08908e1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -677,12 +652,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gabe74390c1422e9746745da55692f47b8"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="gabe74390c1422e9746745da55692f47b8" args="(stp_vars_t *v)" -->
+<a class="anchor" id="gabe74390c1422e9746745da55692f47b8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -694,12 +668,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga7d0c40c3157b2c5c630200352064874c"></a><!-- doxytag: member="util.h::stp_free" ref="ga7d0c40c3157b2c5c630200352064874c" args="(void *ptr)" -->
+<a class="anchor" id="ga7d0c40c3157b2c5c630200352064874c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -711,12 +684,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaeba8c24f265ee904c5876704b767841c"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="gaeba8c24f265ee904c5876704b767841c" args="(void)" -->
+<a class="anchor" id="gaeba8c24f265ee904c5876704b767841c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -728,12 +700,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga5ba7edc43ed094f32ae7d9158a362a7b"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ga5ba7edc43ed094f32ae7d9158a362a7b" args="(void)" -->
+<a class="anchor" id="ga5ba7edc43ed094f32ae7d9158a362a7b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -745,15 +716,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the library release version string (x.y) </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the release name of the package, which must not be modified or freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the release name of the package, which must not be modified or freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga1f0797636484393574cb95e667819dc1"></a><!-- doxytag: member="util.h::stp_get_version" ref="ga1f0797636484393574cb95e667819dc1" args="(void)" -->
+<a class="anchor" id="ga1f0797636484393574cb95e667819dc1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -765,15 +735,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the library version string (x.y.z) </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the version name of the package, which must not be modified or freed. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the version name of the package, which must not be modified or freed. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a><!-- doxytag: member="util.h::stp_init" ref="ga2ce0a2e8887fe5ff7f3eed1370d0d691" args="(void)" -->
+<a class="anchor" id="ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -785,16 +754,15 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Initialise libgimpprint. </p>
 <p>This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on success, 1 on failure. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6d15e5b4e00f9d242166edb5332f8368"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="ga6d15e5b4e00f9d242166edb5332f8368" args="(stp_vars_t *v)" -->
+<a class="anchor" id="ga6d15e5b4e00f9d242166edb5332f8368"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -806,12 +774,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga86a2976738a237df953655e733c75b3a"></a><!-- doxytag: member="util.h::stp_malloc" ref="ga86a2976738a237df953655e733c75b3a" args="(size_t)" -->
+<a class="anchor" id="ga86a2976738a237df953655e733c75b3a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -823,12 +790,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga13aa8afef5b0872704390adc6a01924e"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="ga13aa8afef5b0872704390adc6a01924e" args="(stp_vars_t *v)" -->
+<a class="anchor" id="ga13aa8afef5b0872704390adc6a01924e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -840,12 +806,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga23b504253ceda208b9a4985e6de8a5f7"></a><!-- doxytag: member="util.h::stp_put16_be" ref="ga23b504253ceda208b9a4985e6de8a5f7" args="(unsigned short sh, const stp_vars_t *v)" -->
+<a class="anchor" id="ga23b504253ceda208b9a4985e6de8a5f7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -867,12 +832,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1ffcb45ea3c37bb6b485addcaf945c99"></a><!-- doxytag: member="util.h::stp_put16_le" ref="ga1ffcb45ea3c37bb6b485addcaf945c99" args="(unsigned short sh, const stp_vars_t *v)" -->
+<a class="anchor" id="ga1ffcb45ea3c37bb6b485addcaf945c99"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -894,12 +858,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga258b7b5f8808d0a3168f798e8bf72608"></a><!-- doxytag: member="util.h::stp_put32_be" ref="ga258b7b5f8808d0a3168f798e8bf72608" args="(unsigned int sh, const stp_vars_t *v)" -->
+<a class="anchor" id="ga258b7b5f8808d0a3168f798e8bf72608"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -921,12 +884,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaadf69b8b3f713d2bd7ca3a5648da0c56"></a><!-- doxytag: member="util.h::stp_put32_le" ref="gaadf69b8b3f713d2bd7ca3a5648da0c56" args="(unsigned int sh, const stp_vars_t *v)" -->
+<a class="anchor" id="gaadf69b8b3f713d2bd7ca3a5648da0c56"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -948,12 +910,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga39e4c5f6fa2a07dfca3090a50a8858f9"></a><!-- doxytag: member="util.h::stp_putc" ref="ga39e4c5f6fa2a07dfca3090a50a8858f9" args="(int ch, const stp_vars_t *v)" -->
+<a class="anchor" id="ga39e4c5f6fa2a07dfca3090a50a8858f9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -975,12 +936,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga79dd0a6f5c63f4fbf8591d3c041a7720"></a><!-- doxytag: member="util.h::stp_putraw" ref="ga79dd0a6f5c63f4fbf8591d3c041a7720" args="(const stp_raw_t *r, const stp_vars_t *v)" -->
+<a class="anchor" id="ga79dd0a6f5c63f4fbf8591d3c041a7720"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1002,12 +962,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaf6cf72e5e45f175ae8c332c0588832b9"></a><!-- doxytag: member="util.h::stp_puts" ref="gaf6cf72e5e45f175ae8c332c0588832b9" args="(const char *s, const stp_vars_t *v)" -->
+<a class="anchor" id="gaf6cf72e5e45f175ae8c332c0588832b9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1029,12 +988,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadbe8c167230b49bc10391d2c246e6dc0"></a><!-- doxytag: member="util.h::stp_read_and_compose_curves" ref="gadbe8c167230b49bc10391d2c246e6dc0" args="(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)" -->
+<a class="anchor" id="gadbe8c167230b49bc10391d2c246e6dc0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1068,12 +1026,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga2420936ab8b3492581f389deea44f58c"></a><!-- doxytag: member="util.h::stp_realloc" ref="ga2420936ab8b3492581f389deea44f58c" args="(void *ptr, size_t)" -->
+<a class="anchor" id="ga2420936ab8b3492581f389deea44f58c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1095,12 +1052,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadb49b9cba9ddf4e506b6f530353ad93d"></a><!-- doxytag: member="util.h::stp_send_command" ref="gadb49b9cba9ddf4e506b6f530353ad93d" args="(const stp_vars_t *v, const char *command, const char *format,...)" -->
+<a class="anchor" id="gadb49b9cba9ddf4e506b6f530353ad93d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1134,12 +1090,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="ga7fcc19f0abdc6513dfba7eaebeb16cb9" args="(const char *codeset)" -->
+<a class="anchor" id="ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1151,22 +1106,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the output encoding. </p>
 <p>This function sets the encoding that all strings translated by gettext are output in. It is a wrapper around the gettext bind_textdomain_codeset() function. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">codeset</td><td>the standard name of the encoding, which must be usable with iconv_open(). For example, "US-ASCII" or "UTF-8". If NULL, the currently-selected codeset will be returned (or NULL if no codeset has been selected yet). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5c0731867697f555a94b2a1229804381"></a><!-- doxytag: member="util.h::stp_strdup" ref="ga5c0731867697f555a94b2a1229804381" args="(const char *s)" -->
+<a class="anchor" id="ga5c0731867697f555a94b2a1229804381"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1178,12 +1132,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga56b08d3e12750bdfae8b53263f97aba9"></a><!-- doxytag: member="util.h::stp_strlen" ref="ga56b08d3e12750bdfae8b53263f97aba9" args="(const char *s)" -->
+<a class="anchor" id="ga56b08d3e12750bdfae8b53263f97aba9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1195,12 +1148,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gab026f7022963acd694a8b89e4decbde5"></a><!-- doxytag: member="util.h::stp_strndup" ref="gab026f7022963acd694a8b89e4decbde5" args="(const char *s, int n)" -->
+<a class="anchor" id="gab026f7022963acd694a8b89e4decbde5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1222,12 +1174,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaaace483bb815cde40e15bee42be1e24d"></a><!-- doxytag: member="util.h::stp_write_raw" ref="gaaace483bb815cde40e15bee42be1e24d" args="(const stp_raw_t *raw, const stp_vars_t *v)" -->
+<a class="anchor" id="gaaace483bb815cde40e15bee42be1e24d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1249,12 +1200,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gac8fd1a439fa2d8e1ff1a2b104cd0137b"></a><!-- doxytag: member="util.h::stp_zalloc" ref="gac8fd1a439fa2d8e1ff1a2b104cd0137b" args="(size_t)" -->
+<a class="anchor" id="gac8fd1a439fa2d8e1ff1a2b104cd0137b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1266,12 +1216,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga183d8f36f187530f9d7acdb176be3409"></a><!-- doxytag: member="util.h::stp_zfwrite" ref="ga183d8f36f187530f9d7acdb176be3409" args="(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)" -->
+<a class="anchor" id="ga183d8f36f187530f9d7acdb176be3409"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1305,12 +1254,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad7ffe058decb939af6a5c1ec1d0d77fa"></a><!-- doxytag: member="util.h::stp_zprintf" ref="gad7ffe058decb939af6a5c1ec1d0d77fa" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" -->
+<a class="anchor" id="gad7ffe058decb939af6a5c1ec1d0d77fa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1338,14 +1286,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index 2d5f00f..2c8f4b2 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: vars</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,53 +35,56 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
 <div class="title">vars</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Raw parameter.  <a href="structstp__raw__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">double_bound (range) parameter.  <a href="structstp__double__bound__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">int_bound (range) parameter.  <a href="structstp__int__bound__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&#160;&#160;&#160;{ sizeof((x)), (x) }</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&#160;&#160;&#160;{ sizeof((x)) - 1, (x) }</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&#160;&#160;&#160;((unsigned char) -1)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Raw parameter.  <a href="structstp__raw__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">double_bound (range) parameter.  <a href="structstp__double__bound__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">int_bound (range) parameter.  <a href="structstp__int__bound__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga9fc3819cba14f7f4c5654508a08a1adf"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&#160;&#160;&#160;{ sizeof((x)), (x) }</td></tr>
+<tr class="memitem:gad888c1f6a36f999ffebfffa7b74f28d2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&#160;&#160;&#160;{ sizeof((x)) - 1, (x) }</td></tr>
+<tr class="memitem:ga4f46af65b4df5881b980acba32a05b70"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&#160;&#160;&#160;((unsigned char) -1)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_vars&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The vars opaque data type.  <a href="#ga2d49c94847d18d8b62a214995b14680f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#ga40c1035f88ac38d77eddb65195b28595"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#ga53c035a67629ae3b3eb86b3c09df7774"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#ga268c87919653380a22b1f69c78fe6555"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> )(void *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_compdata&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:ga2d49c94847d18d8b62a214995b14680f"><td class="memItemLeft" align="right" valign="top">typedef struct stp_vars&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
+<tr class="memdesc:ga2d49c94847d18d8b62a214995b14680f"><td class="mdescLeft">&#160;</td><td class="mdescRight">The vars opaque data type.  <a href="#ga2d49c94847d18d8b62a214995b14680f"></a><br/></td></tr>
+<tr class="memitem:ga40c1035f88ac38d77eddb65195b28595"><td class="memItemLeft" align="right" valign="top">typedef void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
+<tr class="memdesc:ga40c1035f88ac38d77eddb65195b28595"><td class="mdescLeft">&#160;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#ga40c1035f88ac38d77eddb65195b28595"></a><br/></td></tr>
+<tr class="memitem:ga53c035a67629ae3b3eb86b3c09df7774"><td class="memItemLeft" align="right" valign="top">typedef const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
+<tr class="memdesc:ga53c035a67629ae3b3eb86b3c09df7774"><td class="mdescLeft">&#160;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#ga53c035a67629ae3b3eb86b3c09df7774"></a><br/></td></tr>
+<tr class="memitem:ga268c87919653380a22b1f69c78fe6555"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr class="memdesc:ga268c87919653380a22b1f69c78fe6555"><td class="mdescLeft">&#160;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#ga268c87919653380a22b1f69c78fe6555"></a><br/></td></tr>
+<tr class="memitem:ga25e6aec21fd8f8a65c4c4086d0f3dec0"><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr class="memitem:ga1ac9aa4c059fbb52307d8522a5f1dc6d"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr class="memitem:ga4d45b95baae036143e14adfc0014f562"><td class="memItemLeft" align="right" valign="top">typedef struct stp_compdata&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br/>
+<tr class="memitem:ga9b3d4f47a44c0c8c9b150cddc56d2a91"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br/>
 &#160;&#160;<a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91a7a6f3e019c8a92ddecd34c71013acde0">STP_PARAMETER_TYPE_STRING_LIST</a>, 
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91aae2cac85ef78157b53c7a79706dc0f70">STP_PARAMETER_TYPE_INT</a>, 
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91af97ef629defc99977bd1cb35daabe0c1">STP_PARAMETER_TYPE_BOOLEAN</a>, 
@@ -90,14 +99,14 @@ Enumerations</h2></td></tr>
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91ad053047279b4c82034d26c4aa4c818d5">STP_PARAMETER_TYPE_INVALID</a>
 <br/>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
+<tr class="memdesc:ga9b3d4f47a44c0c8c9b150cddc56d2a91"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br/></td></tr>
+<tr class="memitem:ga4eba7e712c0e17b76e472f26e202d7b8"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8affc6ff4bfbf2873ce55dfc03776bb6d9">STP_PARAMETER_CLASS_OUTPUT</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa05ce344ff3338e69638d69f9c120d01">STP_PARAMETER_CLASS_CORE</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8a2e17ce7ebc18801c11af7ea0a61e93ca">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br/>
+<tr class="memdesc:ga4eba7e712c0e17b76e472f26e202d7b8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">More...</a><br/></td></tr>
+<tr class="memitem:gaaa9c9265ffe70122bd33659cf2983207"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br/>
 &#160;&#160;<a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207ae9d7192607a6e1ec92dfed3f13a3a46f">STP_PARAMETER_LEVEL_BASIC</a>, 
 <a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207a3130e7060a3b901ea8dcb37d986d47e0">STP_PARAMETER_LEVEL_ADVANCED</a>, 
 <a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207a3d016c9587f698ee400bc7e66071f06c">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
@@ -111,303 +120,306 @@ Enumerations</h2></td></tr>
 &#160;&#160;<a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207ab8bf539d78e56f06f463d00f7a3b56b3">STP_PARAMETER_LEVEL_INVALID</a>
 <br/>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
+<tr class="memdesc:gaaa9c9265ffe70122bd33659cf2983207"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">More...</a><br/></td></tr>
+<tr class="memitem:ga70ebf70dc8e6199d84fc91985c94bae9"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
 <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a410b7e080ef62fb8896f2f844b1c1e00">STP_PARAMETER_DEFAULTED</a>, 
 <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9adbc7323a015e40652fd256e49c8d5b8c">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
+<tr class="memdesc:ga70ebf70dc8e6199d84fc91985c94bae9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">More...</a><br/></td></tr>
+<tr class="memitem:gac061852de3627383cd415cd80a979e02"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
 <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616">PARAMETER_OK</a>, 
 <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a5cb96da6c2e3ae7187e85a1ef6e41fc6">PARAMETER_INACTIVE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new vars object.  <a href="#ga5d641ab7093c9ba82cbd4cfbf904fabc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a vars object.  <a href="#ga88376207367adb4260ff14e5d9ec76e9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#gaec00fba49ad08d20890e64773bcdbd48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a vars object.  <a href="#gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#gacf237afcbc26436ebedac5b11f469fdf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga188d298a8739b84fcb965f211fc7dc4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#ga20c45707399ef6fdf6ee8c8209b5c7c0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga7eb2a1c4b892efd5507fcd4b7a434cea"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga5a842b31f0a572d8e64f1a5616e25a99"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#ga2bac9212773ecf603b7667bd0268c23e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the left edge of the image.  <a href="#ga3b0cc83e87247854ecafd46a6e446bcb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the left edge of the image.  <a href="#ga5c02ee2422d86e4bcdcae613c70c9e1e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the top edge of the image.  <a href="#ga557b5ad44d3b1da8392496681624ad8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the top edge of the image.  <a href="#ga292132b97b20a6d034e22f4146d36131"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the width of the image.  <a href="#ga3a852ce7e42d7f8e0cef6c7d399e0491"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the width edge of the image.  <a href="#ga1c54d99b94c69a67eb4ae0349a4720e7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the height of the image.  <a href="#ga8ce73c5efa41f005936d5f84c44c6667"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the height of the image.  <a href="#ga8731a92f5d3047e00ba33577821d5aec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page width.  <a href="#ga639be0da07c3e5b7dc6d68ac2aa999e9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page width.  <a href="#gaad2d305eed993707d22263b54578a39b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page height.  <a href="#ga83326bacb8b92149af1b70457b23bc8f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page height.  <a href="#gac0c4928fa488bb95e73ba9b8aa932584"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print output information.  <a href="#ga075ffc274f0d2d2b6edd8326de1d7142"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga7c6c7c547d0c973ac801362db5ca4879"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#ga82f6a7514840de82c9ed7edd30f16b5d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga2f246d3af2be9e108abe423691e16049"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output data.  <a href="#gac2b3408200a9676e6c6063cc0ae2f4bd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the output data.  <a href="#ga7042b05e0df5b32206d54397429bbac5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the error data.  <a href="#ga8b30fbadf3475c59101af9d7d37c33b7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error data.  <a href="#gad08bdcd721d37f52993c1862e25ebaf7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#ga086303d36b835d539e75f16187e99e8f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#ga12e8bb617e5c90da99d6d74519664634"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#ga7a94856ce75482a5edb6153fe8916a54"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name.  <a href="#gadcd8062af7b643c734f53c545694d258"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#ga70d69ef7dec383004bf4570e57b76e18"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#ga3ffaadbe73187aa1f298c4eaa80ea82e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a parameter_list.  <a href="#ga404bf7f1b3632178d559f6980478a312"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#ga8f4f06610d1f58bae9e70e632919c405"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#ga92be87a573b883584e5a036743c1bb7d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#ga4b62bc6d0133704b3a2568b1654b6678"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#ga0b8991bd1a91e2cac7d0b355b1186c8e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter description.  <a href="#gad598d95a82767e05c958ccd44534c51d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#ga6ce39557b61706421232b5f1ac604b1b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="#gaa147483996fa118516ddb36fe3366aa9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="#gafe6c8b3d86ca16239a63ce9d2ef57f48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="#ga537f2ba6c74c9562b2f6883d7e36c59f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="#ga6f7816adbce50ca9e2fdacad35282e6a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a float parameter.  <a href="#gaf3a3283247deaad7d1ac19818aa4b796"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an integer parameter.  <a href="#ga70eded5d0df4677dd4b357b4b934f75a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a dimension parameter.  <a href="#ga6ca7898c212230cdbdc70ada2efb1417"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a boolean parameter.  <a href="#ga2167971895eea887eaaa656ed075beff"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a curve parameter.  <a href="#gafe5f1f6364b89437664b2bbc55288025"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an array parameter.  <a href="#ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a raw parameter.  <a href="#ga0155de75bf2aa95ab45a3319539cda56"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#ga227ec3e75a78a5c3dd01c85dbc1e7004"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="#gaf299bd0827a4d86aca59fb0d9015a866"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="#gaa5d6d8858b266517f5899196b062d00d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="#gaf5e225475c66f966f4ba8d8c88374186"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga217eece123630113cfcf8181d475fb53"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default float parameter.  <a href="#gae52dbb466422a18dec110220c45fe64e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default integer parameter.  <a href="#ga3c0418772a82144f317dc973f01a8d55"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#gab6f1820cadd75a4311bfc49b01de447b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#ga81d5f09980407b4310dada2a68fc4b09"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default curve parameter.  <a href="#gafe38044cc067b2c2afa3da469d1cb860"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default array parameter.  <a href="#ga63e7ff7b4c3e1d092f95c6234f21e39f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default raw parameter.  <a href="#ga8159b3f5bea06a99711921f0201f5e0f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a string parameter.  <a href="#gab5b21e5606b8ca755c5eac7774260efa"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a file parameter.  <a href="#ga2021992d89c92b10138fb012a9554a08"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a float parameter.  <a href="#ga365412d9c176fd3ac9375ded3f22ddb3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an integer parameter.  <a href="#ga7c0d95ba35aba0786bfc5f918efa79fc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a dimension parameter.  <a href="#ga3c8d1333086ca5a01a3439f94d9f94d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a boolean parameter.  <a href="#ga8a30b26fa842805384b6ad663cabaea2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve parameter.  <a href="#ga553dec81dd8b3e5590d963ba72223557"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an array parameter.  <a href="#gac50c216c2d5cd56a9704f48d4338b179"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a raw parameter.  <a href="#ga9fff6c14a71f5f8ec28620ef64a92fd5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a string parameter.  <a href="#ga9e98ef9a9b1b84a0c0580fe024e35490"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a file parameter.  <a href="#ga4fad48e3e6453842559bd872650cb88f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#ga4eccbbe421f8b0c9342b17cef40b263d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#ga2107c08f37e31f45253f7d75a3773d46"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#ga514a21602ae7a8ebe8e5072a5a4b6f89"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#ga42ebfed8dec2054799e4943a8ca84267"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a curve parameter.  <a href="#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear an array parameter.  <a href="#ga7c67cef38cead5f519fd04ae09265b53"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga11b79add82faf23b0e3c758f9530d95c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a parameter.  <a href="#ga390f7c2fe642bea08507374a184de233"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all string parameters.  <a href="#ga110e543418842a6dd79149409620bf13"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all file parameters.  <a href="#ga76c7e033078e6c2fa276ee72ca97c63c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all float parameters.  <a href="#gadec4183ce240188ed18fdc21d9b518f7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all integer parameters.  <a href="#gae08d29a439b77219f32d037ab5b191f5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all dimension parameters.  <a href="#ga5cae4a118badc7c52e5f7b7543c83d8e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all boolean parameters.  <a href="#ga60f98e23144fd1bf5aa53def670b2c91"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all curve parameters.  <a href="#ga1329d614d6cd18fc6c244b020e26b081"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all array parameters.  <a href="#ga16d23d59368e907a29719f0902ea75fe"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all raw parameters.  <a href="#ga4d06ccaf72d08800f7eb78b3293f4a00"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all parameters.  <a href="#ga27864133bc2159d1472cbdfb3b781c27"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#gac9f06e27ce5b6808d30c6fc01558db3b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#ga0628a3f1feb7db7b5b10249a2b4f2412"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#ga0cc1a26e8c3d502024c55a065fd5629a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#ga28feceb75f731d6de08d1fdad1fc269e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ga3b74af22c776ddebd6b70455e196fe1c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ga0486744f97114ba03d4f8f7562d6c739"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#ga47b8c3b31693ecdef420160b40b23a0d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a parameter.  <a href="#ga5ececd1972a375e1e569ed4a242ed1ed"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#ga8189b61073bfcd0244d5d6f2a2c8ba86"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#gaa7db6701be5d05e545c79db905e4c7eb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#gab12bebb419eb1ae8f323aa931e324389"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#ga4fd7914c01e2e1b34797736dfd2c9b9c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#gac1f2b865c76da441b6c1bd9b5b93aa1f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#ga23b9c17426210460618c4f95c5f34229"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#ga6c94a1df4388b142d00d5d30df904b47"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#ga5a629e6da1f5008f0db034191ad8b1d5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#ga285f05c648724c80bf05af30f87120a3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a parameter is set.  <a href="#gaa416ba26ede5046db94b54b9d846e329"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#ga0b7be7ba9f763be692dd833a434ed13d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#ga47e7a69ff8e23eed6188542c5c8bff4f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#ga4b8f9847f2eebfff53446a9bc235ab68"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#gab74fd69c4ef62af7b5ab33c6baf48b8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#ga45f9abd8ac6772ea850344c513f6c436"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#gab33cf5376adc63e826cd3dedae33e930"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#gae36bf982c52215f11fe8e392b4b3d705"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#gac9f85c3a8bf99e09150cbf4220e4b983"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#gab6e41a5edb7474ed7ac26e236e00c80c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="#ga31b32d5481a838276f23cfa4bc010c03"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media (paper) size.  <a href="#gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#ga67d1e68ed47e5b554f2021fca1f01978"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="#gad17cadb7fd78bffb759f2213a1a90df6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media size limits.  <a href="#ga0c8ee62453baff3d2c00e0ccae67b049"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga88715b31fcec18778f769ffbc1b55384"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Verify parameters.  <a href="#gab926417b2f601c78d85df44694cc6d38"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get default global settings.  <a href="#gaf63982a6e44f8b62532346d9ceb3d91c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b">stp_parameter_get_category</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the value of a specified category for the specified parameter.  <a href="#gadb64d444ebed8ec698ce949f8a1aae4b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37">stp_parameter_has_category_value</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether a parameter has a category with the specified value.  <a href="#gaecbbdd337f5b844ae7cc3e035dea8b37"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863">stp_parameter_get_categories</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the list of categories and their values for the specified parameter.  <a href="#gad87a41146ef226c77cb8dc4993e40863"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gabfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr class="memitem:ga5d641ab7093c9ba82cbd4cfbf904fabc"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
+<tr class="memdesc:ga5d641ab7093c9ba82cbd4cfbf904fabc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new vars object.  <a href="#ga5d641ab7093c9ba82cbd4cfbf904fabc"></a><br/></td></tr>
+<tr class="memitem:ga88376207367adb4260ff14e5d9ec76e9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
+<tr class="memdesc:ga88376207367adb4260ff14e5d9ec76e9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a vars object.  <a href="#ga88376207367adb4260ff14e5d9ec76e9"></a><br/></td></tr>
+<tr class="memitem:gaec00fba49ad08d20890e64773bcdbd48"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
+<tr class="memdesc:gaec00fba49ad08d20890e64773bcdbd48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#gaec00fba49ad08d20890e64773bcdbd48"></a><br/></td></tr>
+<tr class="memitem:gad3f1ff7a86c3cd1c9f9f62cfa8814437"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gad3f1ff7a86c3cd1c9f9f62cfa8814437"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a vars object.  <a href="#gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br/></td></tr>
+<tr class="memitem:gacf237afcbc26436ebedac5b11f469fdf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr class="memdesc:gacf237afcbc26436ebedac5b11f469fdf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#gacf237afcbc26436ebedac5b11f469fdf"></a><br/></td></tr>
+<tr class="memitem:ga188d298a8739b84fcb965f211fc7dc4e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr class="memdesc:ga188d298a8739b84fcb965f211fc7dc4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga188d298a8739b84fcb965f211fc7dc4e"></a><br/></td></tr>
+<tr class="memitem:ga20c45707399ef6fdf6ee8c8209b5c7c0"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga20c45707399ef6fdf6ee8c8209b5c7c0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#ga20c45707399ef6fdf6ee8c8209b5c7c0"></a><br/></td></tr>
+<tr class="memitem:ga7eb2a1c4b892efd5507fcd4b7a434cea"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr class="memdesc:ga7eb2a1c4b892efd5507fcd4b7a434cea"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga7eb2a1c4b892efd5507fcd4b7a434cea"></a><br/></td></tr>
+<tr class="memitem:ga5a842b31f0a572d8e64f1a5616e25a99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr class="memdesc:ga5a842b31f0a572d8e64f1a5616e25a99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga5a842b31f0a572d8e64f1a5616e25a99"></a><br/></td></tr>
+<tr class="memitem:ga2bac9212773ecf603b7667bd0268c23e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga2bac9212773ecf603b7667bd0268c23e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#ga2bac9212773ecf603b7667bd0268c23e"></a><br/></td></tr>
+<tr class="memitem:ga3b0cc83e87247854ecafd46a6e446bcb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga3b0cc83e87247854ecafd46a6e446bcb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the left edge of the image.  <a href="#ga3b0cc83e87247854ecafd46a6e446bcb"></a><br/></td></tr>
+<tr class="memitem:ga5c02ee2422d86e4bcdcae613c70c9e1e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga5c02ee2422d86e4bcdcae613c70c9e1e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the left edge of the image.  <a href="#ga5c02ee2422d86e4bcdcae613c70c9e1e"></a><br/></td></tr>
+<tr class="memitem:ga557b5ad44d3b1da8392496681624ad8b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga557b5ad44d3b1da8392496681624ad8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the top edge of the image.  <a href="#ga557b5ad44d3b1da8392496681624ad8b"></a><br/></td></tr>
+<tr class="memitem:ga292132b97b20a6d034e22f4146d36131"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga292132b97b20a6d034e22f4146d36131"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the top edge of the image.  <a href="#ga292132b97b20a6d034e22f4146d36131"></a><br/></td></tr>
+<tr class="memitem:ga3a852ce7e42d7f8e0cef6c7d399e0491"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga3a852ce7e42d7f8e0cef6c7d399e0491"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the width of the image.  <a href="#ga3a852ce7e42d7f8e0cef6c7d399e0491"></a><br/></td></tr>
+<tr class="memitem:ga1c54d99b94c69a67eb4ae0349a4720e7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga1c54d99b94c69a67eb4ae0349a4720e7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the width edge of the image.  <a href="#ga1c54d99b94c69a67eb4ae0349a4720e7"></a><br/></td></tr>
+<tr class="memitem:ga8ce73c5efa41f005936d5f84c44c6667"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga8ce73c5efa41f005936d5f84c44c6667"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the height of the image.  <a href="#ga8ce73c5efa41f005936d5f84c44c6667"></a><br/></td></tr>
+<tr class="memitem:ga8731a92f5d3047e00ba33577821d5aec"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga8731a92f5d3047e00ba33577821d5aec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the height of the image.  <a href="#ga8731a92f5d3047e00ba33577821d5aec"></a><br/></td></tr>
+<tr class="memitem:ga639be0da07c3e5b7dc6d68ac2aa999e9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga639be0da07c3e5b7dc6d68ac2aa999e9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page width.  <a href="#ga639be0da07c3e5b7dc6d68ac2aa999e9"></a><br/></td></tr>
+<tr class="memitem:gaad2d305eed993707d22263b54578a39b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gaad2d305eed993707d22263b54578a39b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page width.  <a href="#gaad2d305eed993707d22263b54578a39b"></a><br/></td></tr>
+<tr class="memitem:ga83326bacb8b92149af1b70457b23bc8f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga83326bacb8b92149af1b70457b23bc8f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page height.  <a href="#ga83326bacb8b92149af1b70457b23bc8f"></a><br/></td></tr>
+<tr class="memitem:gac0c4928fa488bb95e73ba9b8aa932584"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gac0c4928fa488bb95e73ba9b8aa932584"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page height.  <a href="#gac0c4928fa488bb95e73ba9b8aa932584"></a><br/></td></tr>
+<tr class="memitem:ga075ffc274f0d2d2b6edd8326de1d7142"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
+<tr class="memdesc:ga075ffc274f0d2d2b6edd8326de1d7142"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print output information.  <a href="#ga075ffc274f0d2d2b6edd8326de1d7142"></a><br/></td></tr>
+<tr class="memitem:ga7c6c7c547d0c973ac801362db5ca4879"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga7c6c7c547d0c973ac801362db5ca4879"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga7c6c7c547d0c973ac801362db5ca4879"></a><br/></td></tr>
+<tr class="memitem:ga82f6a7514840de82c9ed7edd30f16b5d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
+<tr class="memdesc:ga82f6a7514840de82c9ed7edd30f16b5d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#ga82f6a7514840de82c9ed7edd30f16b5d"></a><br/></td></tr>
+<tr class="memitem:ga2f246d3af2be9e108abe423691e16049"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga2f246d3af2be9e108abe423691e16049"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga2f246d3af2be9e108abe423691e16049"></a><br/></td></tr>
+<tr class="memitem:gac2b3408200a9676e6c6063cc0ae2f4bd"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
+<tr class="memdesc:gac2b3408200a9676e6c6063cc0ae2f4bd"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output data.  <a href="#gac2b3408200a9676e6c6063cc0ae2f4bd"></a><br/></td></tr>
+<tr class="memitem:ga7042b05e0df5b32206d54397429bbac5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga7042b05e0df5b32206d54397429bbac5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the output data.  <a href="#ga7042b05e0df5b32206d54397429bbac5"></a><br/></td></tr>
+<tr class="memitem:ga8b30fbadf3475c59101af9d7d37c33b7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
+<tr class="memdesc:ga8b30fbadf3475c59101af9d7d37c33b7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the error data.  <a href="#ga8b30fbadf3475c59101af9d7d37c33b7"></a><br/></td></tr>
+<tr class="memitem:gad08bdcd721d37f52993c1862e25ebaf7"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gad08bdcd721d37f52993c1862e25ebaf7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error data.  <a href="#gad08bdcd721d37f52993c1862e25ebaf7"></a><br/></td></tr>
+<tr class="memitem:ga086303d36b835d539e75f16187e99e8f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
+<tr class="memdesc:ga086303d36b835d539e75f16187e99e8f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#ga086303d36b835d539e75f16187e99e8f"></a><br/></td></tr>
+<tr class="memitem:gadb632ed2afb82e30c6f1583a69d4a8ce"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb632ed2afb82e30c6f1583a69d4a8ce">stp_copy_vars_from</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *to, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *from)</td></tr>
+<tr class="memdesc:gadb632ed2afb82e30c6f1583a69d4a8ce"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy settings from one vars object to another, not modifying anything unset in the source.  <a href="#gadb632ed2afb82e30c6f1583a69d4a8ce"></a><br/></td></tr>
+<tr class="memitem:ga12e8bb617e5c90da99d6d74519664634"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga12e8bb617e5c90da99d6d74519664634"><td class="mdescLeft">&#160;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#ga12e8bb617e5c90da99d6d74519664634"></a><br/></td></tr>
+<tr class="memitem:ga7a94856ce75482a5edb6153fe8916a54"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga7a94856ce75482a5edb6153fe8916a54"><td class="mdescLeft">&#160;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#ga7a94856ce75482a5edb6153fe8916a54"></a><br/></td></tr>
+<tr class="memitem:gadcd8062af7b643c734f53c545694d258"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr class="memdesc:gadcd8062af7b643c734f53c545694d258"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name.  <a href="#gadcd8062af7b643c734f53c545694d258"></a><br/></td></tr>
+<tr class="memitem:ga70d69ef7dec383004bf4570e57b76e18"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr class="memdesc:ga70d69ef7dec383004bf4570e57b76e18"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#ga70d69ef7dec383004bf4570e57b76e18"></a><br/></td></tr>
+<tr class="memitem:ga3ffaadbe73187aa1f298c4eaa80ea82e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga3ffaadbe73187aa1f298c4eaa80ea82e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#ga3ffaadbe73187aa1f298c4eaa80ea82e"></a><br/></td></tr>
+<tr class="memitem:ga404bf7f1b3632178d559f6980478a312"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
+<tr class="memdesc:ga404bf7f1b3632178d559f6980478a312"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a parameter_list.  <a href="#ga404bf7f1b3632178d559f6980478a312"></a><br/></td></tr>
+<tr class="memitem:ga8f4f06610d1f58bae9e70e632919c405"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr class="memdesc:ga8f4f06610d1f58bae9e70e632919c405"><td class="mdescLeft">&#160;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#ga8f4f06610d1f58bae9e70e632919c405"></a><br/></td></tr>
+<tr class="memitem:ga92be87a573b883584e5a036743c1bb7d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga92be87a573b883584e5a036743c1bb7d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#ga92be87a573b883584e5a036743c1bb7d"></a><br/></td></tr>
+<tr class="memitem:ga4b62bc6d0133704b3a2568b1654b6678"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
+<tr class="memdesc:ga4b62bc6d0133704b3a2568b1654b6678"><td class="mdescLeft">&#160;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#ga4b62bc6d0133704b3a2568b1654b6678"></a><br/></td></tr>
+<tr class="memitem:ga0b8991bd1a91e2cac7d0b355b1186c8e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memdesc:ga0b8991bd1a91e2cac7d0b355b1186c8e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#ga0b8991bd1a91e2cac7d0b355b1186c8e"></a><br/></td></tr>
+<tr class="memitem:gad598d95a82767e05c958ccd44534c51d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memdesc:gad598d95a82767e05c958ccd44534c51d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter description.  <a href="#gad598d95a82767e05c958ccd44534c51d"></a><br/></td></tr>
+<tr class="memitem:ga6ce39557b61706421232b5f1ac604b1b"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memdesc:ga6ce39557b61706421232b5f1ac604b1b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#ga6ce39557b61706421232b5f1ac604b1b"></a><br/></td></tr>
+<tr class="memitem:gaa147483996fa118516ddb36fe3366aa9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaa147483996fa118516ddb36fe3366aa9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="#gaa147483996fa118516ddb36fe3366aa9"></a><br/></td></tr>
+<tr class="memitem:gafe6c8b3d86ca16239a63ce9d2ef57f48"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:gafe6c8b3d86ca16239a63ce9d2ef57f48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="#gafe6c8b3d86ca16239a63ce9d2ef57f48"></a><br/></td></tr>
+<tr class="memitem:ga537f2ba6c74c9562b2f6883d7e36c59f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:ga537f2ba6c74c9562b2f6883d7e36c59f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="#ga537f2ba6c74c9562b2f6883d7e36c59f"></a><br/></td></tr>
+<tr class="memitem:ga6f7816adbce50ca9e2fdacad35282e6a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga6f7816adbce50ca9e2fdacad35282e6a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="#ga6f7816adbce50ca9e2fdacad35282e6a"></a><br/></td></tr>
+<tr class="memitem:gaf3a3283247deaad7d1ac19818aa4b796"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr class="memdesc:gaf3a3283247deaad7d1ac19818aa4b796"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a float parameter.  <a href="#gaf3a3283247deaad7d1ac19818aa4b796"></a><br/></td></tr>
+<tr class="memitem:ga70eded5d0df4677dd4b357b4b934f75a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga70eded5d0df4677dd4b357b4b934f75a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an integer parameter.  <a href="#ga70eded5d0df4677dd4b357b4b934f75a"></a><br/></td></tr>
+<tr class="memitem:ga6ca7898c212230cdbdc70ada2efb1417"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga6ca7898c212230cdbdc70ada2efb1417"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a dimension parameter.  <a href="#ga6ca7898c212230cdbdc70ada2efb1417"></a><br/></td></tr>
+<tr class="memitem:ga2167971895eea887eaaa656ed075beff"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga2167971895eea887eaaa656ed075beff"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a boolean parameter.  <a href="#ga2167971895eea887eaaa656ed075beff"></a><br/></td></tr>
+<tr class="memitem:gafe5f1f6364b89437664b2bbc55288025"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
+<tr class="memdesc:gafe5f1f6364b89437664b2bbc55288025"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a curve parameter.  <a href="#gafe5f1f6364b89437664b2bbc55288025"></a><br/></td></tr>
+<tr class="memitem:ga88f25e09f9a4b76aca7ba8316cbf9c8b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
+<tr class="memdesc:ga88f25e09f9a4b76aca7ba8316cbf9c8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an array parameter.  <a href="#ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br/></td></tr>
+<tr class="memitem:ga0155de75bf2aa95ab45a3319539cda56"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga0155de75bf2aa95ab45a3319539cda56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a raw parameter.  <a href="#ga0155de75bf2aa95ab45a3319539cda56"></a><br/></td></tr>
+<tr class="memitem:ga227ec3e75a78a5c3dd01c85dbc1e7004"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr class="memdesc:ga227ec3e75a78a5c3dd01c85dbc1e7004"><td class="mdescLeft">&#160;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#ga227ec3e75a78a5c3dd01c85dbc1e7004"></a><br/></td></tr>
+<tr class="memitem:gaf299bd0827a4d86aca59fb0d9015a866"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaf299bd0827a4d86aca59fb0d9015a866"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="#gaf299bd0827a4d86aca59fb0d9015a866"></a><br/></td></tr>
+<tr class="memitem:gaa5d6d8858b266517f5899196b062d00d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:gaa5d6d8858b266517f5899196b062d00d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="#gaa5d6d8858b266517f5899196b062d00d"></a><br/></td></tr>
+<tr class="memitem:gaf5e225475c66f966f4ba8d8c88374186"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaf5e225475c66f966f4ba8d8c88374186"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="#gaf5e225475c66f966f4ba8d8c88374186"></a><br/></td></tr>
+<tr class="memitem:ga217eece123630113cfcf8181d475fb53"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga217eece123630113cfcf8181d475fb53"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga217eece123630113cfcf8181d475fb53"></a><br/></td></tr>
+<tr class="memitem:gae52dbb466422a18dec110220c45fe64e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr class="memdesc:gae52dbb466422a18dec110220c45fe64e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default float parameter.  <a href="#gae52dbb466422a18dec110220c45fe64e"></a><br/></td></tr>
+<tr class="memitem:ga3c0418772a82144f317dc973f01a8d55"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga3c0418772a82144f317dc973f01a8d55"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default integer parameter.  <a href="#ga3c0418772a82144f317dc973f01a8d55"></a><br/></td></tr>
+<tr class="memitem:gab6f1820cadd75a4311bfc49b01de447b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:gab6f1820cadd75a4311bfc49b01de447b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#gab6f1820cadd75a4311bfc49b01de447b"></a><br/></td></tr>
+<tr class="memitem:ga81d5f09980407b4310dada2a68fc4b09"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga81d5f09980407b4310dada2a68fc4b09"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#ga81d5f09980407b4310dada2a68fc4b09"></a><br/></td></tr>
+<tr class="memitem:gafe38044cc067b2c2afa3da469d1cb860"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
+<tr class="memdesc:gafe38044cc067b2c2afa3da469d1cb860"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default curve parameter.  <a href="#gafe38044cc067b2c2afa3da469d1cb860"></a><br/></td></tr>
+<tr class="memitem:ga63e7ff7b4c3e1d092f95c6234f21e39f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
+<tr class="memdesc:ga63e7ff7b4c3e1d092f95c6234f21e39f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default array parameter.  <a href="#ga63e7ff7b4c3e1d092f95c6234f21e39f"></a><br/></td></tr>
+<tr class="memitem:ga8159b3f5bea06a99711921f0201f5e0f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga8159b3f5bea06a99711921f0201f5e0f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default raw parameter.  <a href="#ga8159b3f5bea06a99711921f0201f5e0f"></a><br/></td></tr>
+<tr class="memitem:gab5b21e5606b8ca755c5eac7774260efa"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab5b21e5606b8ca755c5eac7774260efa"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a string parameter.  <a href="#gab5b21e5606b8ca755c5eac7774260efa"></a><br/></td></tr>
+<tr class="memitem:ga2021992d89c92b10138fb012a9554a08"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga2021992d89c92b10138fb012a9554a08"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a file parameter.  <a href="#ga2021992d89c92b10138fb012a9554a08"></a><br/></td></tr>
+<tr class="memitem:ga365412d9c176fd3ac9375ded3f22ddb3"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga365412d9c176fd3ac9375ded3f22ddb3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a float parameter.  <a href="#ga365412d9c176fd3ac9375ded3f22ddb3"></a><br/></td></tr>
+<tr class="memitem:ga7c0d95ba35aba0786bfc5f918efa79fc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga7c0d95ba35aba0786bfc5f918efa79fc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an integer parameter.  <a href="#ga7c0d95ba35aba0786bfc5f918efa79fc"></a><br/></td></tr>
+<tr class="memitem:ga3c8d1333086ca5a01a3439f94d9f94d3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga3c8d1333086ca5a01a3439f94d9f94d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a dimension parameter.  <a href="#ga3c8d1333086ca5a01a3439f94d9f94d3"></a><br/></td></tr>
+<tr class="memitem:ga8a30b26fa842805384b6ad663cabaea2"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga8a30b26fa842805384b6ad663cabaea2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a boolean parameter.  <a href="#ga8a30b26fa842805384b6ad663cabaea2"></a><br/></td></tr>
+<tr class="memitem:ga553dec81dd8b3e5590d963ba72223557"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga553dec81dd8b3e5590d963ba72223557"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve parameter.  <a href="#ga553dec81dd8b3e5590d963ba72223557"></a><br/></td></tr>
+<tr class="memitem:gac50c216c2d5cd56a9704f48d4338b179"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gac50c216c2d5cd56a9704f48d4338b179"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an array parameter.  <a href="#gac50c216c2d5cd56a9704f48d4338b179"></a><br/></td></tr>
+<tr class="memitem:ga9fff6c14a71f5f8ec28620ef64a92fd5"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga9fff6c14a71f5f8ec28620ef64a92fd5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a raw parameter.  <a href="#ga9fff6c14a71f5f8ec28620ef64a92fd5"></a><br/></td></tr>
+<tr class="memitem:ga9e98ef9a9b1b84a0c0580fe024e35490"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga9e98ef9a9b1b84a0c0580fe024e35490"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a string parameter.  <a href="#ga9e98ef9a9b1b84a0c0580fe024e35490"></a><br/></td></tr>
+<tr class="memitem:ga4fad48e3e6453842559bd872650cb88f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4fad48e3e6453842559bd872650cb88f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a file parameter.  <a href="#ga4fad48e3e6453842559bd872650cb88f"></a><br/></td></tr>
+<tr class="memitem:ga4eccbbe421f8b0c9342b17cef40b263d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4eccbbe421f8b0c9342b17cef40b263d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#ga4eccbbe421f8b0c9342b17cef40b263d"></a><br/></td></tr>
+<tr class="memitem:ga2107c08f37e31f45253f7d75a3773d46"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga2107c08f37e31f45253f7d75a3773d46"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#ga2107c08f37e31f45253f7d75a3773d46"></a><br/></td></tr>
+<tr class="memitem:ga514a21602ae7a8ebe8e5072a5a4b6f89"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga514a21602ae7a8ebe8e5072a5a4b6f89"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#ga514a21602ae7a8ebe8e5072a5a4b6f89"></a><br/></td></tr>
+<tr class="memitem:ga42ebfed8dec2054799e4943a8ca84267"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga42ebfed8dec2054799e4943a8ca84267"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#ga42ebfed8dec2054799e4943a8ca84267"></a><br/></td></tr>
+<tr class="memitem:gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a curve parameter.  <a href="#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br/></td></tr>
+<tr class="memitem:ga7c67cef38cead5f519fd04ae09265b53"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga7c67cef38cead5f519fd04ae09265b53"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear an array parameter.  <a href="#ga7c67cef38cead5f519fd04ae09265b53"></a><br/></td></tr>
+<tr class="memitem:ga11b79add82faf23b0e3c758f9530d95c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga11b79add82faf23b0e3c758f9530d95c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga11b79add82faf23b0e3c758f9530d95c"></a><br/></td></tr>
+<tr class="memitem:ga390f7c2fe642bea08507374a184de233"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga390f7c2fe642bea08507374a184de233"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a parameter.  <a href="#ga390f7c2fe642bea08507374a184de233"></a><br/></td></tr>
+<tr class="memitem:ga110e543418842a6dd79149409620bf13"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga110e543418842a6dd79149409620bf13"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all string parameters.  <a href="#ga110e543418842a6dd79149409620bf13"></a><br/></td></tr>
+<tr class="memitem:ga76c7e033078e6c2fa276ee72ca97c63c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga76c7e033078e6c2fa276ee72ca97c63c"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all file parameters.  <a href="#ga76c7e033078e6c2fa276ee72ca97c63c"></a><br/></td></tr>
+<tr class="memitem:gadec4183ce240188ed18fdc21d9b518f7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gadec4183ce240188ed18fdc21d9b518f7"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all float parameters.  <a href="#gadec4183ce240188ed18fdc21d9b518f7"></a><br/></td></tr>
+<tr class="memitem:gae08d29a439b77219f32d037ab5b191f5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gae08d29a439b77219f32d037ab5b191f5"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all integer parameters.  <a href="#gae08d29a439b77219f32d037ab5b191f5"></a><br/></td></tr>
+<tr class="memitem:ga5cae4a118badc7c52e5f7b7543c83d8e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga5cae4a118badc7c52e5f7b7543c83d8e"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all dimension parameters.  <a href="#ga5cae4a118badc7c52e5f7b7543c83d8e"></a><br/></td></tr>
+<tr class="memitem:ga60f98e23144fd1bf5aa53def670b2c91"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga60f98e23144fd1bf5aa53def670b2c91"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all boolean parameters.  <a href="#ga60f98e23144fd1bf5aa53def670b2c91"></a><br/></td></tr>
+<tr class="memitem:ga1329d614d6cd18fc6c244b020e26b081"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga1329d614d6cd18fc6c244b020e26b081"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all curve parameters.  <a href="#ga1329d614d6cd18fc6c244b020e26b081"></a><br/></td></tr>
+<tr class="memitem:ga16d23d59368e907a29719f0902ea75fe"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga16d23d59368e907a29719f0902ea75fe"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all array parameters.  <a href="#ga16d23d59368e907a29719f0902ea75fe"></a><br/></td></tr>
+<tr class="memitem:ga4d06ccaf72d08800f7eb78b3293f4a00"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga4d06ccaf72d08800f7eb78b3293f4a00"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all raw parameters.  <a href="#ga4d06ccaf72d08800f7eb78b3293f4a00"></a><br/></td></tr>
+<tr class="memitem:ga27864133bc2159d1472cbdfb3b781c27"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga27864133bc2159d1472cbdfb3b781c27"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all parameters.  <a href="#ga27864133bc2159d1472cbdfb3b781c27"></a><br/></td></tr>
+<tr class="memitem:gac9f06e27ce5b6808d30c6fc01558db3b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gac9f06e27ce5b6808d30c6fc01558db3b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#gac9f06e27ce5b6808d30c6fc01558db3b"></a><br/></td></tr>
+<tr class="memitem:ga0628a3f1feb7db7b5b10249a2b4f2412"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0628a3f1feb7db7b5b10249a2b4f2412"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#ga0628a3f1feb7db7b5b10249a2b4f2412"></a><br/></td></tr>
+<tr class="memitem:ga49e5b05ba7bf8ccf6e95cb744f4f0f93"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga49e5b05ba7bf8ccf6e95cb744f4f0f93"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br/></td></tr>
+<tr class="memitem:ga0cc1a26e8c3d502024c55a065fd5629a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0cc1a26e8c3d502024c55a065fd5629a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#ga0cc1a26e8c3d502024c55a065fd5629a"></a><br/></td></tr>
+<tr class="memitem:ga28feceb75f731d6de08d1fdad1fc269e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga28feceb75f731d6de08d1fdad1fc269e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#ga28feceb75f731d6de08d1fdad1fc269e"></a><br/></td></tr>
+<tr class="memitem:ga3b74af22c776ddebd6b70455e196fe1c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga3b74af22c776ddebd6b70455e196fe1c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ga3b74af22c776ddebd6b70455e196fe1c"></a><br/></td></tr>
+<tr class="memitem:ga0486744f97114ba03d4f8f7562d6c739"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0486744f97114ba03d4f8f7562d6c739"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ga0486744f97114ba03d4f8f7562d6c739"></a><br/></td></tr>
+<tr class="memitem:ga4d13479ad3669ec9b8d7dcc109bc8e7d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga4d13479ad3669ec9b8d7dcc109bc8e7d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br/></td></tr>
+<tr class="memitem:ga47b8c3b31693ecdef420160b40b23a0d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga47b8c3b31693ecdef420160b40b23a0d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#ga47b8c3b31693ecdef420160b40b23a0d"></a><br/></td></tr>
+<tr class="memitem:ga5ececd1972a375e1e569ed4a242ed1ed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga5ececd1972a375e1e569ed4a242ed1ed"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a parameter.  <a href="#ga5ececd1972a375e1e569ed4a242ed1ed"></a><br/></td></tr>
+<tr class="memitem:ga8189b61073bfcd0244d5d6f2a2c8ba86"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga8189b61073bfcd0244d5d6f2a2c8ba86"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#ga8189b61073bfcd0244d5d6f2a2c8ba86"></a><br/></td></tr>
+<tr class="memitem:gaa7db6701be5d05e545c79db905e4c7eb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gaa7db6701be5d05e545c79db905e4c7eb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#gaa7db6701be5d05e545c79db905e4c7eb"></a><br/></td></tr>
+<tr class="memitem:gab12bebb419eb1ae8f323aa931e324389"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gab12bebb419eb1ae8f323aa931e324389"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#gab12bebb419eb1ae8f323aa931e324389"></a><br/></td></tr>
+<tr class="memitem:ga4fd7914c01e2e1b34797736dfd2c9b9c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga4fd7914c01e2e1b34797736dfd2c9b9c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#ga4fd7914c01e2e1b34797736dfd2c9b9c"></a><br/></td></tr>
+<tr class="memitem:gac1f2b865c76da441b6c1bd9b5b93aa1f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gac1f2b865c76da441b6c1bd9b5b93aa1f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#gac1f2b865c76da441b6c1bd9b5b93aa1f"></a><br/></td></tr>
+<tr class="memitem:ga23b9c17426210460618c4f95c5f34229"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga23b9c17426210460618c4f95c5f34229"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#ga23b9c17426210460618c4f95c5f34229"></a><br/></td></tr>
+<tr class="memitem:ga6c94a1df4388b142d00d5d30df904b47"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga6c94a1df4388b142d00d5d30df904b47"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#ga6c94a1df4388b142d00d5d30df904b47"></a><br/></td></tr>
+<tr class="memitem:ga5a629e6da1f5008f0db034191ad8b1d5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga5a629e6da1f5008f0db034191ad8b1d5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#ga5a629e6da1f5008f0db034191ad8b1d5"></a><br/></td></tr>
+<tr class="memitem:ga285f05c648724c80bf05af30f87120a3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga285f05c648724c80bf05af30f87120a3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#ga285f05c648724c80bf05af30f87120a3"></a><br/></td></tr>
+<tr class="memitem:gaa416ba26ede5046db94b54b9d846e329"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:gaa416ba26ede5046db94b54b9d846e329"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a parameter is set.  <a href="#gaa416ba26ede5046db94b54b9d846e329"></a><br/></td></tr>
+<tr class="memitem:ga0b7be7ba9f763be692dd833a434ed13d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga0b7be7ba9f763be692dd833a434ed13d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#ga0b7be7ba9f763be692dd833a434ed13d"></a><br/></td></tr>
+<tr class="memitem:ga47e7a69ff8e23eed6188542c5c8bff4f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga47e7a69ff8e23eed6188542c5c8bff4f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#ga47e7a69ff8e23eed6188542c5c8bff4f"></a><br/></td></tr>
+<tr class="memitem:ga4b8f9847f2eebfff53446a9bc235ab68"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4b8f9847f2eebfff53446a9bc235ab68"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#ga4b8f9847f2eebfff53446a9bc235ab68"></a><br/></td></tr>
+<tr class="memitem:gab74fd69c4ef62af7b5ab33c6baf48b8b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab74fd69c4ef62af7b5ab33c6baf48b8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#gab74fd69c4ef62af7b5ab33c6baf48b8b"></a><br/></td></tr>
+<tr class="memitem:ga45f9abd8ac6772ea850344c513f6c436"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga45f9abd8ac6772ea850344c513f6c436"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#ga45f9abd8ac6772ea850344c513f6c436"></a><br/></td></tr>
+<tr class="memitem:gab33cf5376adc63e826cd3dedae33e930"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab33cf5376adc63e826cd3dedae33e930"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#gab33cf5376adc63e826cd3dedae33e930"></a><br/></td></tr>
+<tr class="memitem:gae36bf982c52215f11fe8e392b4b3d705"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gae36bf982c52215f11fe8e392b4b3d705"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#gae36bf982c52215f11fe8e392b4b3d705"></a><br/></td></tr>
+<tr class="memitem:gac9f85c3a8bf99e09150cbf4220e4b983"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gac9f85c3a8bf99e09150cbf4220e4b983"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#gac9f85c3a8bf99e09150cbf4220e4b983"></a><br/></td></tr>
+<tr class="memitem:gab6e41a5edb7474ed7ac26e236e00c80c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab6e41a5edb7474ed7ac26e236e00c80c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#gab6e41a5edb7474ed7ac26e236e00c80c"></a><br/></td></tr>
+<tr class="memitem:ga31b32d5481a838276f23cfa4bc010c03"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga31b32d5481a838276f23cfa4bc010c03"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="#ga31b32d5481a838276f23cfa4bc010c03"></a><br/></td></tr>
+<tr class="memitem:gac9e6d740ffc4cff5dc7d0bf106a3e7df"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr class="memdesc:gac9e6d740ffc4cff5dc7d0bf106a3e7df"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media (paper) size.  <a href="#gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br/></td></tr>
+<tr class="memitem:ga67d1e68ed47e5b554f2021fca1f01978"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memdesc:ga67d1e68ed47e5b554f2021fca1f01978"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#ga67d1e68ed47e5b554f2021fca1f01978"></a><br/></td></tr>
+<tr class="memitem:gad17cadb7fd78bffb759f2213a1a90df6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memdesc:gad17cadb7fd78bffb759f2213a1a90df6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="#gad17cadb7fd78bffb759f2213a1a90df6"></a><br/></td></tr>
+<tr class="memitem:ga0c8ee62453baff3d2c00e0ccae67b049"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr class="memdesc:ga0c8ee62453baff3d2c00e0ccae67b049"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media size limits.  <a href="#ga0c8ee62453baff3d2c00e0ccae67b049"></a><br/></td></tr>
+<tr class="memitem:ga88715b31fcec18778f769ffbc1b55384"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr class="memdesc:ga88715b31fcec18778f769ffbc1b55384"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga88715b31fcec18778f769ffbc1b55384"></a><br/></td></tr>
+<tr class="memitem:gab926417b2f601c78d85df44694cc6d38"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gab926417b2f601c78d85df44694cc6d38"><td class="mdescLeft">&#160;</td><td class="mdescRight">Verify parameters.  <a href="#gab926417b2f601c78d85df44694cc6d38"></a><br/></td></tr>
+<tr class="memitem:gaf63982a6e44f8b62532346d9ceb3d91c"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
+<tr class="memdesc:gaf63982a6e44f8b62532346d9ceb3d91c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get default global settings.  <a href="#gaf63982a6e44f8b62532346d9ceb3d91c"></a><br/></td></tr>
+<tr class="memitem:gadb64d444ebed8ec698ce949f8a1aae4b"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b">stp_parameter_get_category</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category)</td></tr>
+<tr class="memdesc:gadb64d444ebed8ec698ce949f8a1aae4b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the value of a specified category for the specified parameter.  <a href="#gadb64d444ebed8ec698ce949f8a1aae4b"></a><br/></td></tr>
+<tr class="memitem:gaecbbdd337f5b844ae7cc3e035dea8b37"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37">stp_parameter_has_category_value</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category, const char *value)</td></tr>
+<tr class="memdesc:gaecbbdd337f5b844ae7cc3e035dea8b37"><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether a parameter has a category with the specified value.  <a href="#gaecbbdd337f5b844ae7cc3e035dea8b37"></a><br/></td></tr>
+<tr class="memitem:gad87a41146ef226c77cb8dc4993e40863"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863">stp_parameter_get_categories</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc)</td></tr>
+<tr class="memdesc:gad87a41146ef226c77cb8dc4993e40863"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the list of categories and their values for the specified parameter.  <a href="#gad87a41146ef226c77cb8dc4993e40863"></a><br/></td></tr>
+<tr class="memitem:gafd4f81ca2ad497bd21f005344844f9c4"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr class="memitem:ga151b7d922a3e1e5e9d9f0ea8de6ab70a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memitem:ga1666dd1571bdb866a85d4318858893be"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memitem:gabfffe0d654de156874decdc0338216f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gabfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr class="memitem:ga6d04a3c444753f11004ad6259a91e853"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1023ad18d2c97763137909b6191b0940"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
+<tr class="memitem:gaf7d2d5a9897c9ce77bb16f4a1addaa62"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
+<tr class="memitem:ga7f2c578ff7ae28a3db502476aa10137e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc. </p>
 <p>Most of these job options are expressed as parameters which vary according to the model and other options selected.</p>
 <p>The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters. </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ga4f46af65b4df5881b980acba32a05b70"></a><!-- doxytag: member="vars.h::STP_CHANNEL_NONE" ref="ga4f46af65b4df5881b980acba32a05b70" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ga4f46af65b4df5881b980acba32a05b70"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -415,12 +427,11 @@ Functions</h2></td></tr>
           <td class="memname">#define STP_CHANNEL_NONE&#160;&#160;&#160;((unsigned char) -1)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga9fc3819cba14f7f4c5654508a08a1adf"></a><!-- doxytag: member="vars.h::STP_RAW" ref="ga9fc3819cba14f7f4c5654508a08a1adf" args="(x)" -->
+<a class="anchor" id="ga9fc3819cba14f7f4c5654508a08a1adf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -432,12 +443,11 @@ Functions</h2></td></tr>
           <td>&#160;&#160;&#160;{ sizeof((x)), (x) }</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gad888c1f6a36f999ffebfffa7b74f28d2"></a><!-- doxytag: member="vars.h::STP_RAW_STRING" ref="gad888c1f6a36f999ffebfffa7b74f28d2" args="(x)" -->
+<a class="anchor" id="gad888c1f6a36f999ffebfffa7b74f28d2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -449,13 +459,12 @@ Functions</h2></td></tr>
           <td>&#160;&#160;&#160;{ sizeof((x)) - 1, (x) }</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ga4d45b95baae036143e14adfc0014f562"></a><!-- doxytag: member="vars.h::compdata_t" ref="ga4d45b95baae036143e14adfc0014f562" args="" -->
+<a class="anchor" id="ga4d45b95baae036143e14adfc0014f562"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -463,12 +472,11 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_compdata <a class="el" href="group__vars.html#ga4d45b95baae036143e14adfc0014f562">compdata_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga53c035a67629ae3b3eb86b3c09df7774"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="ga53c035a67629ae3b3eb86b3c09df7774" args="" -->
+<a class="anchor" id="ga53c035a67629ae3b3eb86b3c09df7774"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -476,53 +484,49 @@ Functions</h2></td></tr>
           <td class="memname">typedef const void* <a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The constant parameter_list opaque data type. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga25e6aec21fd8f8a65c4c4086d0f3dec0"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="ga25e6aec21fd8f8a65c4c4086d0f3dec0" args=")(void *)" -->
+<a class="anchor" id="ga25e6aec21fd8f8a65c4c4086d0f3dec0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void*(* <a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a>)(void *)</td>
+          <td class="memname">typedef void*(* stp_copy_data_func_t)(void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1ac9aa4c059fbb52307d8522a5f1dc6d"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="ga1ac9aa4c059fbb52307d8522a5f1dc6d" args=")(void *)" -->
+<a class="anchor" id="ga1ac9aa4c059fbb52307d8522a5f1dc6d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(* <a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a>)(void *)</td>
+          <td class="memname">typedef void(* stp_free_data_func_t)(void *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga268c87919653380a22b1f69c78fe6555"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="ga268c87919653380a22b1f69c78fe6555" args=")(void *data, const char *buffer, size_t bytes)" -->
+<a class="anchor" id="ga268c87919653380a22b1f69c78fe6555"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void(* <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)</td>
+          <td class="memname">typedef void(* stp_outfunc_t)(void *data, const char *buffer, size_t bytes)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Output function supplied by the calling application. </p>
 <p>There are two output functions supplied by the caller, one to send output data and one to report errors. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">data</td><td>a pointer to an opaque object owned by the calling application. </td></tr>
     <tr><td class="paramname">buffer</td><td>the data to output. </td></tr>
@@ -533,7 +537,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga40c1035f88ac38d77eddb65195b28595"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="ga40c1035f88ac38d77eddb65195b28595" args="" -->
+<a class="anchor" id="ga40c1035f88ac38d77eddb65195b28595"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -541,14 +545,13 @@ Functions</h2></td></tr>
           <td class="memname">typedef void* <a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The parameter_list opaque data type. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga2d49c94847d18d8b62a214995b14680f"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="ga2d49c94847d18d8b62a214995b14680f" args="" -->
+<a class="anchor" id="ga2d49c94847d18d8b62a214995b14680f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -556,15 +559,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_vars <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The vars opaque data type. </p>
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ga70ebf70dc8e6199d84fc91985c94bae9"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga70ebf70dc8e6199d84fc91985c94bae9" args="" -->
+<a class="anchor" id="ga70ebf70dc8e6199d84fc91985c94bae9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -572,19 +574,18 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Parameter activity. </p>
 <p>Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off". </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f"></a>STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
 <p>Parameter is inactive (unused). </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9a410b7e080ef62fb8896f2f844b1c1e00"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gga70ebf70dc8e6199d84fc91985c94bae9a410b7e080ef62fb8896f2f844b1c1e00" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9a410b7e080ef62fb8896f2f844b1c1e00"></a>STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
 <p>Parameter is set to its default value. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9adbc7323a015e40652fd256e49c8d5b8c"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gga70ebf70dc8e6199d84fc91985c94bae9adbc7323a015e40652fd256e49c8d5b8c" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga70ebf70dc8e6199d84fc91985c94bae9adbc7323a015e40652fd256e49c8d5b8c"></a>STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
 <p>Parameter is active (used). </p>
 </td></tr>
 </table>
@@ -593,7 +594,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4eba7e712c0e17b76e472f26e202d7b8"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga4eba7e712c0e17b76e472f26e202d7b8" args="" -->
+<a class="anchor" id="ga4eba7e712c0e17b76e472f26e202d7b8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -601,22 +602,21 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Parameter class. </p>
 <p>What kind of setting this is, for the purpose of user interface representation. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a"></a>STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
 <p>Printer feature. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8affc6ff4bfbf2873ce55dfc03776bb6d9"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gga4eba7e712c0e17b76e472f26e202d7b8affc6ff4bfbf2873ce55dfc03776bb6d9" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8affc6ff4bfbf2873ce55dfc03776bb6d9"></a>STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
 <p>Output control. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8aa05ce344ff3338e69638d69f9c120d01"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gga4eba7e712c0e17b76e472f26e202d7b8aa05ce344ff3338e69638d69f9c120d01" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8aa05ce344ff3338e69638d69f9c120d01"></a>STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
 <p>Core Gimp-Print parameter. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8a2e17ce7ebc18801c11af7ea0a61e93ca"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gga4eba7e712c0e17b76e472f26e202d7b8a2e17ce7ebc18801c11af7ea0a61e93ca" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga4eba7e712c0e17b76e472f26e202d7b8a2e17ce7ebc18801c11af7ea0a61e93ca"></a>STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
 <p>Invalid class (should never be used). </p>
 </td></tr>
 </table>
@@ -625,7 +625,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaaa9c9265ffe70122bd33659cf2983207"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="gaaa9c9265ffe70122bd33659cf2983207" args="" -->
+<a class="anchor" id="gaaa9c9265ffe70122bd33659cf2983207"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -633,37 +633,36 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Parameter level. </p>
 <p>What "level" a setting is at, for UI design. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ae9d7192607a6e1ec92dfed3f13a3a46f"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="ggaaa9c9265ffe70122bd33659cf2983207ae9d7192607a6e1ec92dfed3f13a3a46f" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ae9d7192607a6e1ec92dfed3f13a3a46f"></a>STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
 <p>Basic parameter, shown by all UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a3130e7060a3b901ea8dcb37d986d47e0"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="ggaaa9c9265ffe70122bd33659cf2983207a3130e7060a3b901ea8dcb37d986d47e0" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a3130e7060a3b901ea8dcb37d986d47e0"></a>STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
 <p>Advanced parameter, shown by advanced UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a3d016c9587f698ee400bc7e66071f06c"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="ggaaa9c9265ffe70122bd33659cf2983207a3d016c9587f698ee400bc7e66071f06c" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a3d016c9587f698ee400bc7e66071f06c"></a>STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
 <p>Advanced1 parameter, shown by advanced UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a59a909a8953b8724d57ce85e2b4306bf"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="ggaaa9c9265ffe70122bd33659cf2983207a59a909a8953b8724d57ce85e2b4306bf" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a59a909a8953b8724d57ce85e2b4306bf"></a>STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
 <p>Advanced2 parameter, shown by advanced UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a1241066935e94def6ab6d524ed1fabae"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="ggaaa9c9265ffe70122bd33659cf2983207a1241066935e94def6ab6d524ed1fabae" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a1241066935e94def6ab6d524ed1fabae"></a>STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
 <p>Advanced3 parameter, shown by advanced UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a6036d5761aa9710a66429c625c334a80"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="ggaaa9c9265ffe70122bd33659cf2983207a6036d5761aa9710a66429c625c334a80" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207a6036d5761aa9710a66429c625c334a80"></a>STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
 <p>Advanced4 parameter, shown by advanced UIs. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ab2bc3be82f619147d9a45564fd53a4a0"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="ggaaa9c9265ffe70122bd33659cf2983207ab2bc3be82f619147d9a45564fd53a4a0" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ab2bc3be82f619147d9a45564fd53a4a0"></a>STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
 <p>Parameters used only within Gimp-Print. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ae478f67e409adabc8679d3801604861d"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="ggaaa9c9265ffe70122bd33659cf2983207ae478f67e409adabc8679d3801604861d" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ae478f67e409adabc8679d3801604861d"></a>STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
 <p>Parameters used only outside Gimp-Print. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ab8bf539d78e56f06f463d00f7a3b56b3"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="ggaaa9c9265ffe70122bd33659cf2983207ab8bf539d78e56f06f463d00f7a3b56b3" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggaaa9c9265ffe70122bd33659cf2983207ab8bf539d78e56f06f463d00f7a3b56b3"></a>STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
 <p>Invalid level (should never be used). </p>
 </td></tr>
 </table>
@@ -672,7 +671,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga9b3d4f47a44c0c8c9b150cddc56d2a91"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga9b3d4f47a44c0c8c9b150cddc56d2a91" args="" -->
+<a class="anchor" id="ga9b3d4f47a44c0c8c9b150cddc56d2a91"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -680,40 +679,39 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Parameter types. </p>
 <p>The following types are permitted for a printer setting. Not all are currently implemented. </p>
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a7a6f3e019c8a92ddecd34c71013acde0"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91a7a6f3e019c8a92ddecd34c71013acde0" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a7a6f3e019c8a92ddecd34c71013acde0"></a>STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
 <p>Single string choice from a list. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91aae2cac85ef78157b53c7a79706dc0f70"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91aae2cac85ef78157b53c7a79706dc0f70" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91aae2cac85ef78157b53c7a79706dc0f70"></a>STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
 <p>Integer. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91af97ef629defc99977bd1cb35daabe0c1"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91af97ef629defc99977bd1cb35daabe0c1" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91af97ef629defc99977bd1cb35daabe0c1"></a>STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
 <p>Boolean. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91ae0dc60c8435ce0b1355bd5a134395f0c"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91ae0dc60c8435ce0b1355bd5a134395f0c" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91ae0dc60c8435ce0b1355bd5a134395f0c"></a>STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
 <p>Floating point number. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a0d283c33f755969ded0751bbfc5d1912"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91a0d283c33f755969ded0751bbfc5d1912" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a0d283c33f755969ded0751bbfc5d1912"></a>STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
 <p>Curve. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8224a918efbef96fffaa90e31654f7ff"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8224a918efbef96fffaa90e31654f7ff" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8224a918efbef96fffaa90e31654f7ff"></a>STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
 <p>Filename (NYI, need to consider security). </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a33bb02d9ae5b2169d2f75da7684b04e9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91a33bb02d9ae5b2169d2f75da7684b04e9" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a33bb02d9ae5b2169d2f75da7684b04e9"></a>STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
 <p>Raw, opaque data. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8789c2b5cc718eafca6d1d0022cfe3f3"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8789c2b5cc718eafca6d1d0022cfe3f3" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91a8789c2b5cc718eafca6d1d0022cfe3f3"></a>STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
 <p>Array. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91aaa6f89008bf237c6f0aa2f0ee176e8b7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91aaa6f89008bf237c6f0aa2f0ee176e8b7" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91aaa6f89008bf237c6f0aa2f0ee176e8b7"></a>STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
 <p>Linear dimension. </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91ad053047279b4c82034d26c4aa4c818d5"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gga9b3d4f47a44c0c8c9b150cddc56d2a91ad053047279b4c82034d26c4aa4c818d5" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="gga9b3d4f47a44c0c8c9b150cddc56d2a91ad053047279b4c82034d26c4aa4c818d5"></a>STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
 <p>Invalid type (should never be used). </p>
 </td></tr>
 </table>
@@ -722,7 +720,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac061852de3627383cd415cd80a979e02"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="gac061852de3627383cd415cd80a979e02" args="" -->
+<a class="anchor" id="gac061852de3627383cd415cd80a979e02"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -730,14 +728,13 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967"></a><!-- doxytag: member="PARAMETER_BAD" ref="ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967"></a>PARAMETER_BAD</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616"></a><!-- doxytag: member="PARAMETER_OK" ref="ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616"></a>PARAMETER_OK</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a5cb96da6c2e3ae7187e85a1ef6e41fc6"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="ggac061852de3627383cd415cd80a979e02a5cb96da6c2e3ae7187e85a1ef6e41fc6" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ggac061852de3627383cd415cd80a979e02a5cb96da6c2e3ae7187e85a1ef6e41fc6"></a>PARAMETER_INACTIVE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -746,7 +743,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="gafd4f81ca2ad497bd21f005344844f9c4"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="gafd4f81ca2ad497bd21f005344844f9c4" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" -->
+<a class="anchor" id="gafd4f81ca2ad497bd21f005344844f9c4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -786,12 +783,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga5a629e6da1f5008f0db034191ad8b1d5"></a><!-- doxytag: member="vars.h::stp_check_array_parameter" ref="ga5a629e6da1f5008f0db034191ad8b1d5" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga5a629e6da1f5008f0db034191ad8b1d5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -819,11 +815,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if an array parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -834,7 +829,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga23b9c17426210460618c4f95c5f34229"></a><!-- doxytag: member="vars.h::stp_check_boolean_parameter" ref="ga23b9c17426210460618c4f95c5f34229" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga23b9c17426210460618c4f95c5f34229"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -862,11 +857,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a boolean parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -877,7 +871,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga6c94a1df4388b142d00d5d30df904b47"></a><!-- doxytag: member="vars.h::stp_check_curve_parameter" ref="ga6c94a1df4388b142d00d5d30df904b47" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga6c94a1df4388b142d00d5d30df904b47"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -905,11 +899,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a curve parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -920,7 +913,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac1f2b865c76da441b6c1bd9b5b93aa1f"></a><!-- doxytag: member="vars.h::stp_check_dimension_parameter" ref="gac1f2b865c76da441b6c1bd9b5b93aa1f" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="gac1f2b865c76da441b6c1bd9b5b93aa1f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -948,11 +941,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a dimension parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -963,7 +955,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaa7db6701be5d05e545c79db905e4c7eb"></a><!-- doxytag: member="vars.h::stp_check_file_parameter" ref="gaa7db6701be5d05e545c79db905e4c7eb" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="gaa7db6701be5d05e545c79db905e4c7eb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -991,11 +983,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a file parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1006,7 +997,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab12bebb419eb1ae8f323aa931e324389"></a><!-- doxytag: member="vars.h::stp_check_float_parameter" ref="gab12bebb419eb1ae8f323aa931e324389" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="gab12bebb419eb1ae8f323aa931e324389"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1034,11 +1025,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a float parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1049,7 +1039,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4fd7914c01e2e1b34797736dfd2c9b9c"></a><!-- doxytag: member="vars.h::stp_check_int_parameter" ref="ga4fd7914c01e2e1b34797736dfd2c9b9c" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga4fd7914c01e2e1b34797736dfd2c9b9c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1077,11 +1067,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if an integer parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1092,7 +1081,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaa416ba26ede5046db94b54b9d846e329"></a><!-- doxytag: member="vars.h::stp_check_parameter" ref="gaa416ba26ede5046db94b54b9d846e329" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)" -->
+<a class="anchor" id="gaa416ba26ede5046db94b54b9d846e329"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1126,11 +1115,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1142,7 +1130,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga285f05c648724c80bf05af30f87120a3"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="ga285f05c648724c80bf05af30f87120a3" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga285f05c648724c80bf05af30f87120a3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1170,11 +1158,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a raw parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1185,7 +1172,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga8189b61073bfcd0244d5d6f2a2c8ba86"></a><!-- doxytag: member="vars.h::stp_check_string_parameter" ref="ga8189b61073bfcd0244d5d6f2a2c8ba86" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga8189b61073bfcd0244d5d6f2a2c8ba86"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1213,11 +1200,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check if a string parameter is set. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1228,7 +1214,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7c67cef38cead5f519fd04ae09265b53"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="ga7c67cef38cead5f519fd04ae09265b53" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga7c67cef38cead5f519fd04ae09265b53"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1250,12 +1236,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear an array parameter. </p>
 <p>The parameter is set to NULL. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1265,7 +1250,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga42ebfed8dec2054799e4943a8ca84267"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="ga42ebfed8dec2054799e4943a8ca84267" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga42ebfed8dec2054799e4943a8ca84267"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1287,11 +1272,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear (remove) a boolean parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1301,7 +1285,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="gaf52a0b0c3b0e0fee1fc46516b1bc0c4e" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1323,12 +1307,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear a curve parameter. </p>
 <p>The parameter is set to NULL. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1338,7 +1321,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga514a21602ae7a8ebe8e5072a5a4b6f89"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="ga514a21602ae7a8ebe8e5072a5a4b6f89" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga514a21602ae7a8ebe8e5072a5a4b6f89"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1360,11 +1343,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear (remove) a dimension parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1374,7 +1356,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4fad48e3e6453842559bd872650cb88f"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="ga4fad48e3e6453842559bd872650cb88f" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga4fad48e3e6453842559bd872650cb88f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1396,12 +1378,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear a file parameter. </p>
 <p>The parameter is set to NULL. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1411,7 +1392,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4eccbbe421f8b0c9342b17cef40b263d"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="ga4eccbbe421f8b0c9342b17cef40b263d" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga4eccbbe421f8b0c9342b17cef40b263d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1433,11 +1414,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear (remove) a float parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1447,7 +1427,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga2107c08f37e31f45253f7d75a3773d46"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="ga2107c08f37e31f45253f7d75a3773d46" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga2107c08f37e31f45253f7d75a3773d46"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1469,11 +1449,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear (remove) an integer parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1483,7 +1462,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga390f7c2fe642bea08507374a184de233"></a><!-- doxytag: member="vars.h::stp_clear_parameter" ref="ga390f7c2fe642bea08507374a184de233" args="(stp_vars_t *v, const char *parameter, stp_parameter_type_t type)" -->
+<a class="anchor" id="ga390f7c2fe642bea08507374a184de233"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1511,11 +1490,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear a parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1526,7 +1504,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga11b79add82faf23b0e3c758f9530d95c"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="ga11b79add82faf23b0e3c758f9530d95c" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga11b79add82faf23b0e3c758f9530d95c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1548,12 +1526,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear a raw parameter. </p>
 <p>The parameter is set to NULL. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1563,7 +1540,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga9e98ef9a9b1b84a0c0580fe024e35490"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="ga9e98ef9a9b1b84a0c0580fe024e35490" args="(stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga9e98ef9a9b1b84a0c0580fe024e35490"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1585,12 +1562,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Clear a string parameter. </p>
 <p>The parameter is set to NULL. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -1600,7 +1576,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaf7d2d5a9897c9ce77bb16f4a1addaa62"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="gaf7d2d5a9897c9ce77bb16f4a1addaa62" args="(stp_vars_t *vd, const stp_vars_t *vs)" -->
+<a class="anchor" id="gaf7d2d5a9897c9ce77bb16f4a1addaa62"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1622,12 +1598,46 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
+</div><div class="memdoc">
+
 </div>
-<div class="memdoc">
+</div>
+<a class="anchor" id="gadb632ed2afb82e30c6f1583a69d4a8ce"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_copy_vars_from </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td>
+          <td class="paramname"><em>to</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td>
+          <td class="paramname"><em>from</em>&#160;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+<p>Copy settings from one vars object to another, not modifying anything unset in the source. </p>
+<dl class="params"><dt>Parameters:</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">to</td><td>the destination vars. </td></tr>
+    <tr><td class="paramname">from</td><td>the vars to merge into user. </td></tr>
+  </table>
+  </dd>
+</dl>
 
 </div>
 </div>
-<a class="anchor" id="gaf63982a6e44f8b62532346d9ceb3d91c"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="gaf63982a6e44f8b62532346d9ceb3d91c" args="(void)" -->
+<a class="anchor" id="gaf63982a6e44f8b62532346d9ceb3d91c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1639,16 +1649,15 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get default global settings. </p>
 <p>The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the default settings. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the default settings. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0b8991bd1a91e2cac7d0b355b1186c8e"></a><!-- doxytag: member="vars.h::stp_describe_parameter" ref="ga0b8991bd1a91e2cac7d0b355b1186c8e" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<a class="anchor" id="ga0b8991bd1a91e2cac7d0b355b1186c8e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1676,12 +1685,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Describe a parameter in detail. </p>
 <p>All of the parameter fields will be populated. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">name</td><td>the name of the parameter. </td></tr>
@@ -1692,7 +1700,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga88715b31fcec18778f769ffbc1b55384"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="ga88715b31fcec18778f769ffbc1b55384" args="(const stp_vars_t *v, int *x, int *y)" -->
+<a class="anchor" id="ga88715b31fcec18778f769ffbc1b55384"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1720,12 +1728,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Retrieve the printing resolution of the selected resolution. </p>
 <p>If the resolution is invalid, -1 will be returned in both x and y. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">x</td><td>a pointer to a int to store the horizontal resolution in. </td></tr>
@@ -1736,7 +1743,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga151b7d922a3e1e5e9d9f0ea8de6ab70a"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="ga151b7d922a3e1e5e9d9f0ea8de6ab70a" args="(stp_vars_t *v, const char *name)" -->
+<a class="anchor" id="ga151b7d922a3e1e5e9d9f0ea8de6ab70a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1758,12 +1765,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga7f2c578ff7ae28a3db502476aa10137e"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="ga7f2c578ff7ae28a3db502476aa10137e" args="(stp_parameter_t *desc, const stp_parameter_t *param)" -->
+<a class="anchor" id="ga7f2c578ff7ae28a3db502476aa10137e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1785,12 +1791,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gac50c216c2d5cd56a9704f48d4338b179"></a><!-- doxytag: member="vars.h::stp_get_array_parameter" ref="gac50c216c2d5cd56a9704f48d4338b179" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gac50c216c2d5cd56a9704f48d4338b179"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1812,22 +1817,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get an array parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the array, or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the array, or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gac9f85c3a8bf99e09150cbf4220e4b983"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="gac9f85c3a8bf99e09150cbf4220e4b983" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gac9f85c3a8bf99e09150cbf4220e4b983"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1849,22 +1853,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of an array parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga8a30b26fa842805384b6ad663cabaea2"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="ga8a30b26fa842805384b6ad663cabaea2" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga8a30b26fa842805384b6ad663cabaea2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1886,22 +1889,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a boolean parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the boolean value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the boolean value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab33cf5376adc63e826cd3dedae33e930"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="gab33cf5376adc63e826cd3dedae33e930" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gab33cf5376adc63e826cd3dedae33e930"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1923,22 +1925,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a boolean parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2bac9212773ecf603b7667bd0268c23e"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="ga2bac9212773ecf603b7667bd0268c23e" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga2bac9212773ecf603b7667bd0268c23e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1950,15 +1951,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the name of the color conversion routine. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the name of the color conversion routine (must not be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the name of the color conversion routine (must not be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga1666dd1571bdb866a85d4318858893be"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="ga1666dd1571bdb866a85d4318858893be" args="(const stp_vars_t *v, const char *name)" -->
+<a class="anchor" id="ga1666dd1571bdb866a85d4318858893be"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1980,12 +1980,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga553dec81dd8b3e5590d963ba72223557"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter" ref="ga553dec81dd8b3e5590d963ba72223557" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga553dec81dd8b3e5590d963ba72223557"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2007,22 +2006,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a curve parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the curve, or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the curve, or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gae36bf982c52215f11fe8e392b4b3d705"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="gae36bf982c52215f11fe8e392b4b3d705" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gae36bf982c52215f11fe8e392b4b3d705"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2044,22 +2042,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a curve parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3c8d1333086ca5a01a3439f94d9f94d3"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="ga3c8d1333086ca5a01a3439f94d9f94d3" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga3c8d1333086ca5a01a3439f94d9f94d3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2081,22 +2078,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a dimension parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the dimension (integer) value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the dimension (integer) value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga45f9abd8ac6772ea850344c513f6c436"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="ga45f9abd8ac6772ea850344c513f6c436" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga45f9abd8ac6772ea850344c513f6c436"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2118,22 +2114,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a dimension parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga20c45707399ef6fdf6ee8c8209b5c7c0"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="ga20c45707399ef6fdf6ee8c8209b5c7c0" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga20c45707399ef6fdf6ee8c8209b5c7c0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2145,15 +2140,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the name of the printer driver. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the name of the printer driver (must not be freed). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the name of the printer driver (must not be freed). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad08bdcd721d37f52993c1862e25ebaf7"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="gad08bdcd721d37f52993c1862e25ebaf7" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gad08bdcd721d37f52993c1862e25ebaf7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2165,21 +2159,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the error data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the output data. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2f246d3af2be9e108abe423691e16049"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="ga2f246d3af2be9e108abe423691e16049" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga2f246d3af2be9e108abe423691e16049"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2191,21 +2184,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the function used to print output information. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the outfunc. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga2021992d89c92b10138fb012a9554a08"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="ga2021992d89c92b10138fb012a9554a08" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga2021992d89c92b10138fb012a9554a08"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2227,22 +2219,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a file parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the filename, or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the filename, or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga47e7a69ff8e23eed6188542c5c8bff4f"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="ga47e7a69ff8e23eed6188542c5c8bff4f" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga47e7a69ff8e23eed6188542c5c8bff4f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2264,22 +2255,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a file parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga365412d9c176fd3ac9375ded3f22ddb3"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="ga365412d9c176fd3ac9375ded3f22ddb3" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga365412d9c176fd3ac9375ded3f22ddb3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2301,22 +2291,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a float parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the float value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the float value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga4b8f9847f2eebfff53446a9bc235ab68"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="ga4b8f9847f2eebfff53446a9bc235ab68" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga4b8f9847f2eebfff53446a9bc235ab68"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2338,22 +2327,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a float parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga8731a92f5d3047e00ba33577821d5aec"></a><!-- doxytag: member="vars.h::stp_get_height" ref="ga8731a92f5d3047e00ba33577821d5aec" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga8731a92f5d3047e00ba33577821d5aec"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2365,15 +2353,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the height of the image. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the left edge. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga67d1e68ed47e5b554f2021fca1f01978"></a><!-- doxytag: member="vars.h::stp_get_imageable_area" ref="ga67d1e68ed47e5b554f2021fca1f01978" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<a class="anchor" id="ga67d1e68ed47e5b554f2021fca1f01978"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2413,15 +2400,14 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the imagable area of the page. </p>
 <p>Retrieve the boundaries of the printable area of the page. In combination with the media size, this can be used to determine the actual printable region, which callers can use to place the image precisely. The dimensions are relative to the top left of the physical page.</p>
 <p>If a customizable page size is used (see stp_printer_get_media_size), the actual desired width and/or height must be filled in using stp_set_page_width and/or stp_set_page_height. If these are not filled in, the margins will be returned.</p>
 <p>Returned values may be negative if a printer is capable of full bleed by printing beyond the physical boundaries of the page.</p>
 <p>If the media size stored in V is invalid, the return values will be indeterminate. It is up to the user to specify legal values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">left</td><td>a pointer to a int to store the left edge in. </td></tr>
@@ -2434,7 +2420,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7c0d95ba35aba0786bfc5f918efa79fc"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="ga7c0d95ba35aba0786bfc5f918efa79fc" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga7c0d95ba35aba0786bfc5f918efa79fc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2456,22 +2442,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get an integer parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the integer value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the integer value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab74fd69c4ef62af7b5ab33c6baf48b8b"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="gab74fd69c4ef62af7b5ab33c6baf48b8b" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gab74fd69c4ef62af7b5ab33c6baf48b8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2493,22 +2478,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of an integer parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga5c02ee2422d86e4bcdcae613c70c9e1e"></a><!-- doxytag: member="vars.h::stp_get_left" ref="ga5c02ee2422d86e4bcdcae613c70c9e1e" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga5c02ee2422d86e4bcdcae613c70c9e1e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2520,15 +2504,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the left edge of the image. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the left edge. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad17cadb7fd78bffb759f2213a1a90df6"></a><!-- doxytag: member="vars.h::stp_get_maximum_imageable_area" ref="gad17cadb7fd78bffb759f2213a1a90df6" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<a class="anchor" id="gad17cadb7fd78bffb759f2213a1a90df6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2568,15 +2551,14 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the maximum imagable area of the page. </p>
 <p>Retrieve the maximum (regardless of settings other than page sise) boundaries of the printable area of the page. In combination with the media size, this can be used to determine the actual printable region, which callers can use to place the image precisely. The dimensions are relative to the top left of the physical page.</p>
 <p>If a customizable page size is used (see stp_printer_get_media_size), the actual desired width and/or height must be filled in using stp_set_page_width and/or stp_set_page_height. If these are not filled in, the margins will be returned.</p>
 <p>Returned values may be negative if a printer is capable of full bleed by printing beyond the physical boundaries of the page.</p>
 <p>If the media size stored in V is invalid, the return values will be indeterminate. It is up to the user to specify legal values. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">left</td><td>a pointer to a int to store the left edge in. </td></tr>
@@ -2589,7 +2571,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="gac9e6d740ffc4cff5dc7d0bf106a3e7df" args="(const stp_vars_t *v, int *width, int *height)" -->
+<a class="anchor" id="gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2617,12 +2599,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the media (paper) size. </p>
 <p>Retrieve the media size of the media type set in V, expressed in units of 1/72". If the media size is invalid, width and height will be set to -1. Values of 0 for width or height indicate that the dimension is variable, so that custom page sizes or roll paper can be used. In this case, the size limit should be used to determine maximum and minimum values permitted. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">width</td><td>a pointer to an int to store the media width in. </td></tr>
@@ -2633,7 +2614,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7042b05e0df5b32206d54397429bbac5"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="ga7042b05e0df5b32206d54397429bbac5" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga7042b05e0df5b32206d54397429bbac5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2645,21 +2626,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the output data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the output data. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga7c6c7c547d0c973ac801362db5ca4879"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="ga7c6c7c547d0c973ac801362db5ca4879" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga7c6c7c547d0c973ac801362db5ca4879"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2671,21 +2651,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the function used to print output information. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the outfunc. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gac0c4928fa488bb95e73ba9b8aa932584"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="gac0c4928fa488bb95e73ba9b8aa932584" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gac0c4928fa488bb95e73ba9b8aa932584"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2697,15 +2676,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the page height. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the page height. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the page height. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaad2d305eed993707d22263b54578a39b"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="gaad2d305eed993707d22263b54578a39b" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gaad2d305eed993707d22263b54578a39b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2717,15 +2695,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the page width. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the page width. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the page width. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga31b32d5481a838276f23cfa4bc010c03"></a><!-- doxytag: member="vars.h::stp_get_parameter_active" ref="ga31b32d5481a838276f23cfa4bc010c03" args="(const stp_vars_t *v, const char *parameter, stp_parameter_type_t type)" -->
+<a class="anchor" id="ga31b32d5481a838276f23cfa4bc010c03"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2753,11 +2730,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -2768,7 +2744,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga12e8bb617e5c90da99d6d74519664634"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="ga12e8bb617e5c90da99d6d74519664634" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga12e8bb617e5c90da99d6d74519664634"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2780,22 +2756,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List the available parameters for the currently chosen settings. </p>
 <p>This does not fill in the bounds and defaults; it merely provides a list of settings. To fill in detailed information for a setting, use stp_describe_parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e" title="Destroy a parameter_list.">stp_parameter_list_destroy()</a>). </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e" title="Destroy a parameter_list.">stp_parameter_list_destroy()</a>). </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga9fff6c14a71f5f8ec28620ef64a92fd5"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter" ref="ga9fff6c14a71f5f8ec28620ef64a92fd5" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga9fff6c14a71f5f8ec28620ef64a92fd5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2817,22 +2792,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a raw parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the raw data, or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the raw data, or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gab6e41a5edb7474ed7ac26e236e00c80c"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="gab6e41a5edb7474ed7ac26e236e00c80c" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gab6e41a5edb7474ed7ac26e236e00c80c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2854,22 +2828,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a raw parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0c8ee62453baff3d2c00e0ccae67b049"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="ga0c8ee62453baff3d2c00e0ccae67b049" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" -->
+<a class="anchor" id="ga0c8ee62453baff3d2c00e0ccae67b049"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2909,12 +2882,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the media size limits. </p>
 <p>Retrieve the minimum and maximum size limits for custom media sizes with the current printer settings. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">max_width</td><td>a pointer to a int to store the maximum width in. </td></tr>
@@ -2927,7 +2899,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab5b21e5606b8ca755c5eac7774260efa"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="gab5b21e5606b8ca755c5eac7774260efa" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="gab5b21e5606b8ca755c5eac7774260efa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2949,22 +2921,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get a string parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the string, or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the string, or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga0b7be7ba9f763be692dd833a434ed13d"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="ga0b7be7ba9f763be692dd833a434ed13d" args="(const stp_vars_t *v, const char *parameter)" -->
+<a class="anchor" id="ga0b7be7ba9f763be692dd833a434ed13d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -2986,22 +2957,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the activity status of a string parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the activity status. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga292132b97b20a6d034e22f4146d36131"></a><!-- doxytag: member="vars.h::stp_get_top" ref="ga292132b97b20a6d034e22f4146d36131" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga292132b97b20a6d034e22f4146d36131"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3013,15 +2983,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the top edge of the image. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the left edge. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6d04a3c444753f11004ad6259a91e853"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga6d04a3c444753f11004ad6259a91e853" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga6d04a3c444753f11004ad6259a91e853"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3033,12 +3002,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga1c54d99b94c69a67eb4ae0349a4720e7"></a><!-- doxytag: member="vars.h::stp_get_width" ref="ga1c54d99b94c69a67eb4ae0349a4720e7" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga1c54d99b94c69a67eb4ae0349a4720e7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3050,15 +3018,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the width edge of the image. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the left edge. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga16d23d59368e907a29719f0902ea75fe"></a><!-- doxytag: member="vars.h::stp_list_array_parameters" ref="ga16d23d59368e907a29719f0902ea75fe" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga16d23d59368e907a29719f0902ea75fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3070,12 +3037,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all array parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3084,7 +3050,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga60f98e23144fd1bf5aa53def670b2c91"></a><!-- doxytag: member="vars.h::stp_list_boolean_parameters" ref="ga60f98e23144fd1bf5aa53def670b2c91" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga60f98e23144fd1bf5aa53def670b2c91"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3096,12 +3062,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all boolean parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3110,7 +3075,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga1329d614d6cd18fc6c244b020e26b081"></a><!-- doxytag: member="vars.h::stp_list_curve_parameters" ref="ga1329d614d6cd18fc6c244b020e26b081" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga1329d614d6cd18fc6c244b020e26b081"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3122,12 +3087,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all curve parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3136,7 +3100,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga5cae4a118badc7c52e5f7b7543c83d8e"></a><!-- doxytag: member="vars.h::stp_list_dimension_parameters" ref="ga5cae4a118badc7c52e5f7b7543c83d8e" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga5cae4a118badc7c52e5f7b7543c83d8e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3148,12 +3112,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all dimension parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3162,7 +3125,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga76c7e033078e6c2fa276ee72ca97c63c"></a><!-- doxytag: member="vars.h::stp_list_file_parameters" ref="ga76c7e033078e6c2fa276ee72ca97c63c" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga76c7e033078e6c2fa276ee72ca97c63c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3174,12 +3137,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all file parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3188,7 +3150,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gadec4183ce240188ed18fdc21d9b518f7"></a><!-- doxytag: member="vars.h::stp_list_float_parameters" ref="gadec4183ce240188ed18fdc21d9b518f7" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gadec4183ce240188ed18fdc21d9b518f7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3200,12 +3162,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all float parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3214,7 +3175,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gae08d29a439b77219f32d037ab5b191f5"></a><!-- doxytag: member="vars.h::stp_list_int_parameters" ref="gae08d29a439b77219f32d037ab5b191f5" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="gae08d29a439b77219f32d037ab5b191f5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3226,12 +3187,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all integer parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3240,7 +3200,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga27864133bc2159d1472cbdfb3b781c27"></a><!-- doxytag: member="vars.h::stp_list_parameters" ref="ga27864133bc2159d1472cbdfb3b781c27" args="(const stp_vars_t *v, stp_parameter_type_t type)" -->
+<a class="anchor" id="ga27864133bc2159d1472cbdfb3b781c27"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3262,12 +3222,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">type</td><td>the type of the parameter. </td></tr>
@@ -3277,7 +3236,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4d06ccaf72d08800f7eb78b3293f4a00"></a><!-- doxytag: member="vars.h::stp_list_raw_parameters" ref="ga4d06ccaf72d08800f7eb78b3293f4a00" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga4d06ccaf72d08800f7eb78b3293f4a00"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3289,12 +3248,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all raw parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3303,7 +3261,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga110e543418842a6dd79149409620bf13"></a><!-- doxytag: member="vars.h::stp_list_string_parameters" ref="ga110e543418842a6dd79149409620bf13" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="ga110e543418842a6dd79149409620bf13"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3315,12 +3273,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List all string parameters. </p>
 <p>The return value must be freed after use. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
@@ -3329,7 +3286,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga086303d36b835d539e75f16187e99e8f"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="ga086303d36b835d539e75f16187e99e8f" args="(stp_vars_t *user, const stp_vars_t *print)" -->
+<a class="anchor" id="ga086303d36b835d539e75f16187e99e8f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3351,12 +3308,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Merge defaults for a printer with user-chosen settings. </p>
 <dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>This is likely to go away. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">user</td><td>the destination vars. </td></tr>
     <tr><td class="paramname">print</td><td>the vars to merge into user. </td></tr>
@@ -3366,7 +3322,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gad598d95a82767e05c958ccd44534c51d"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="gad598d95a82767e05c958ccd44534c51d" args="(stp_parameter_t *description)" -->
+<a class="anchor" id="gad598d95a82767e05c958ccd44534c51d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3378,12 +3334,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a parameter description. </p>
 <p>This must be called even if the <a class="el" href="structstp__parameter__t.html" title="Parameter description.">stp_parameter_t</a> was not allocated with malloc, since some members are dynamically allocated. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">description</td><td>the parameter description to destroy. </td></tr>
   </table>
@@ -3392,7 +3347,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gadcd8062af7b643c734f53c545694d258"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="gadcd8062af7b643c734f53c545694d258" args="(stp_const_parameter_list_t list, const char *name)" -->
+<a class="anchor" id="gadcd8062af7b643c734f53c545694d258"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3414,22 +3369,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find a parameter by its name. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the parameter_list to use. </td></tr>
     <tr><td class="paramname">name</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga6ce39557b61706421232b5f1ac604b1b"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="ga6ce39557b61706421232b5f1ac604b1b" args="(const stp_vars_t *v, const char *name)" -->
+<a class="anchor" id="ga6ce39557b61706421232b5f1ac604b1b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3451,22 +3405,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find a parameter by its name from a vars object. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">name</td><td>the name of the parameter. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad87a41146ef226c77cb8dc4993e40863"></a><!-- doxytag: member="vars.h::stp_parameter_get_categories" ref="gad87a41146ef226c77cb8dc4993e40863" args="(const stp_vars_t *v, const stp_parameter_t *desc)" -->
+<a class="anchor" id="gad87a41146ef226c77cb8dc4993e40863"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3488,22 +3441,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the list of categories and their values for the specified parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">desc</td><td>the parameter description to use (must already be described) </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the list of categories. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the list of categories. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gadb64d444ebed8ec698ce949f8a1aae4b"></a><!-- doxytag: member="vars.h::stp_parameter_get_category" ref="gadb64d444ebed8ec698ce949f8a1aae4b" args="(const stp_vars_t *v, const stp_parameter_t *desc, const char *category)" -->
+<a class="anchor" id="gadb64d444ebed8ec698ce949f8a1aae4b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3531,11 +3483,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Get the value of a specified category for the specified parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">desc</td><td>the parameter description to use (must already be described) </td></tr>
@@ -3543,11 +3494,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the value of the category or NULL. String must be freed by caller. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the value of the category or NULL. String must be freed by caller. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaecbbdd337f5b844ae7cc3e035dea8b37"></a><!-- doxytag: member="vars.h::stp_parameter_has_category_value" ref="gaecbbdd337f5b844ae7cc3e035dea8b37" args="(const stp_vars_t *v, const stp_parameter_t *desc, const char *category, const char *value)" -->
+<a class="anchor" id="gaecbbdd337f5b844ae7cc3e035dea8b37"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3581,12 +3532,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Determine whether a parameter has a category with the specified value. </p>
 <p>If a null value is passed in, return whether the parameter has the category at all. Return -1 if any other error condition (null vars, desc, or category). </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">desc</td><td>the parameter description to use (must already be described) </td></tr>
@@ -3595,11 +3545,11 @@ Functions</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>whether the parameter has the category with the specified value. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>whether the parameter has the category with the specified value. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga8f4f06610d1f58bae9e70e632919c405"></a><!-- doxytag: member="vars.h::stp_parameter_list_add_param" ref="ga8f4f06610d1f58bae9e70e632919c405" args="(stp_parameter_list_t list, const stp_parameter_t *item)" -->
+<a class="anchor" id="ga8f4f06610d1f58bae9e70e632919c405"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3621,11 +3571,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Add a parameter to a parameter_list. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the parameter_list to use. </td></tr>
     <tr><td class="paramname">item</td><td>the parameter to add. </td></tr>
@@ -3635,7 +3584,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4b62bc6d0133704b3a2568b1654b6678"></a><!-- doxytag: member="vars.h::stp_parameter_list_append" ref="ga4b62bc6d0133704b3a2568b1654b6678" args="(stp_parameter_list_t list, stp_const_parameter_list_t append)" -->
+<a class="anchor" id="ga4b62bc6d0133704b3a2568b1654b6678"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3657,11 +3606,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Append one parameter_list to another. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the destination list (to append to). </td></tr>
     <tr><td class="paramname">append</td><td>the list of paramters to append. Each item that does not already exist in list will be appended. </td></tr>
@@ -3671,7 +3619,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga92be87a573b883584e5a036743c1bb7d"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="ga92be87a573b883584e5a036743c1bb7d" args="(stp_const_parameter_list_t list)" -->
+<a class="anchor" id="ga92be87a573b883584e5a036743c1bb7d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3683,22 +3631,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate a parameter_list. </p>
 <p>A new parameter_list will be created, and then the contents of source will be copied into it. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the source parameter_list. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the parameter_list. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the parameter_list. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga7a94856ce75482a5edb6153fe8916a54"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="ga7a94856ce75482a5edb6153fe8916a54" args="(stp_const_parameter_list_t list)" -->
+<a class="anchor" id="ga7a94856ce75482a5edb6153fe8916a54"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3710,21 +3657,20 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>List the number of available parameters for the currently chosen settings. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the parameter_list to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the number of parameters. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the number of parameters. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga404bf7f1b3632178d559f6980478a312"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="ga404bf7f1b3632178d559f6980478a312" args="(void)" -->
+<a class="anchor" id="ga404bf7f1b3632178d559f6980478a312"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3736,15 +3682,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a parameter_list. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created parameter_list. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created parameter_list. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga3ffaadbe73187aa1f298c4eaa80ea82e"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="ga3ffaadbe73187aa1f298c4eaa80ea82e" args="(stp_parameter_list_t list)" -->
+<a class="anchor" id="ga3ffaadbe73187aa1f298c4eaa80ea82e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3756,12 +3701,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a parameter_list. </p>
 <p>It is an error to destroy the parameter_list more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the parameter_list to destroy. </td></tr>
   </table>
@@ -3770,7 +3714,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga70d69ef7dec383004bf4570e57b76e18"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="ga70d69ef7dec383004bf4570e57b76e18" args="(stp_const_parameter_list_t list, size_t item)" -->
+<a class="anchor" id="ga70d69ef7dec383004bf4570e57b76e18"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3792,22 +3736,21 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Find a parameter by its index number. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">list</td><td>the parameter_list to use. </td></tr>
     <tr><td class="paramname">item</td><td>the index number of the parameter (must not be greater than stp_parameter_list_count - 1). </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="ga227ec3e75a78a5c3dd01c85dbc1e7004"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="ga227ec3e75a78a5c3dd01c85dbc1e7004" args="(stp_vars_t *v, const char *parameter, double scale)" -->
+<a class="anchor" id="ga227ec3e75a78a5c3dd01c85dbc1e7004"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3835,11 +3778,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Multiply the value of a float parameter by a scaling factor. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -3850,7 +3792,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a><!-- doxytag: member="vars.h::stp_set_array_parameter" ref="ga88f25e09f9a4b76aca7ba8316cbf9c8b" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" -->
+<a class="anchor" id="ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3878,11 +3820,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set an array parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -3893,7 +3834,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="ga4d13479ad3669ec9b8d7dcc109bc8e7d" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3921,11 +3862,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of an array parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -3936,7 +3876,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga2167971895eea887eaaa656ed075beff"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="ga2167971895eea887eaaa656ed075beff" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="ga2167971895eea887eaaa656ed075beff"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -3964,11 +3904,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a boolean parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -3979,7 +3918,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga3b74af22c776ddebd6b70455e196fe1c"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="ga3b74af22c776ddebd6b70455e196fe1c" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga3b74af22c776ddebd6b70455e196fe1c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4007,11 +3946,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a boolean parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4022,7 +3960,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga7eb2a1c4b892efd5507fcd4b7a434cea"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="ga7eb2a1c4b892efd5507fcd4b7a434cea" args="(stp_vars_t *v, const char *val)" -->
+<a class="anchor" id="ga7eb2a1c4b892efd5507fcd4b7a434cea"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4044,11 +3982,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the name of the color conversion routine, if not the default. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the name to set. </td></tr>
@@ -4058,7 +3995,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga5a842b31f0a572d8e64f1a5616e25a99"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="ga5a842b31f0a572d8e64f1a5616e25a99" args="(stp_vars_t *v, const char *val, int bytes)" -->
+<a class="anchor" id="ga5a842b31f0a572d8e64f1a5616e25a99"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4086,11 +4023,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the name of the color conversion routine, if not the default. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the name to set. </td></tr>
@@ -4101,7 +4037,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gafe5f1f6364b89437664b2bbc55288025"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter" ref="gafe5f1f6364b89437664b2bbc55288025" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" -->
+<a class="anchor" id="gafe5f1f6364b89437664b2bbc55288025"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4129,11 +4065,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a curve parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4144,7 +4079,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga0486744f97114ba03d4f8f7562d6c739"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="ga0486744f97114ba03d4f8f7562d6c739" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga0486744f97114ba03d4f8f7562d6c739"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4172,11 +4107,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a curveparameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4187,7 +4121,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga63e7ff7b4c3e1d092f95c6234f21e39f"></a><!-- doxytag: member="vars.h::stp_set_default_array_parameter" ref="ga63e7ff7b4c3e1d092f95c6234f21e39f" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" -->
+<a class="anchor" id="ga63e7ff7b4c3e1d092f95c6234f21e39f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4215,12 +4149,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default array parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4231,7 +4164,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga81d5f09980407b4310dada2a68fc4b09"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="ga81d5f09980407b4310dada2a68fc4b09" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="ga81d5f09980407b4310dada2a68fc4b09"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4259,12 +4192,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default boolean parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4275,7 +4207,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gafe38044cc067b2c2afa3da469d1cb860"></a><!-- doxytag: member="vars.h::stp_set_default_curve_parameter" ref="gafe38044cc067b2c2afa3da469d1cb860" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" -->
+<a class="anchor" id="gafe38044cc067b2c2afa3da469d1cb860"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4303,12 +4235,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default curve parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4319,7 +4250,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab6f1820cadd75a4311bfc49b01de447b"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="gab6f1820cadd75a4311bfc49b01de447b" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="gab6f1820cadd75a4311bfc49b01de447b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4347,12 +4278,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default dimension parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4363,7 +4293,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaf5e225475c66f966f4ba8d8c88374186"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter" ref="gaf5e225475c66f966f4ba8d8c88374186" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<a class="anchor" id="gaf5e225475c66f966f4ba8d8c88374186"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4391,12 +4321,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default file parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4407,7 +4336,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga217eece123630113cfcf8181d475fb53"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter_n" ref="ga217eece123630113cfcf8181d475fb53" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<a class="anchor" id="ga217eece123630113cfcf8181d475fb53"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4441,12 +4370,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default file parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4458,7 +4386,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gae52dbb466422a18dec110220c45fe64e"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="gae52dbb466422a18dec110220c45fe64e" args="(stp_vars_t *v, const char *parameter, double value)" -->
+<a class="anchor" id="gae52dbb466422a18dec110220c45fe64e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4486,12 +4414,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default float parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4502,7 +4429,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga3c0418772a82144f317dc973f01a8d55"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="ga3c0418772a82144f317dc973f01a8d55" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="ga3c0418772a82144f317dc973f01a8d55"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4530,12 +4457,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default integer parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4546,7 +4472,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga8159b3f5bea06a99711921f0201f5e0f"></a><!-- doxytag: member="vars.h::stp_set_default_raw_parameter" ref="ga8159b3f5bea06a99711921f0201f5e0f" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" -->
+<a class="anchor" id="ga8159b3f5bea06a99711921f0201f5e0f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4580,12 +4506,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default raw parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4597,7 +4522,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaf299bd0827a4d86aca59fb0d9015a866"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter" ref="gaf299bd0827a4d86aca59fb0d9015a866" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<a class="anchor" id="gaf299bd0827a4d86aca59fb0d9015a866"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4625,12 +4550,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default string parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4641,7 +4565,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaa5d6d8858b266517f5899196b062d00d"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter_n" ref="gaa5d6d8858b266517f5899196b062d00d" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<a class="anchor" id="gaa5d6d8858b266517f5899196b062d00d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4675,12 +4599,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a default string parameter. </p>
 <p>The value is set if the parameter is not already set. This avoids having to check if the parameter is set prior to setting it, if you do not want to override the existing value. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4692,7 +4615,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga6ca7898c212230cdbdc70ada2efb1417"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="ga6ca7898c212230cdbdc70ada2efb1417" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="ga6ca7898c212230cdbdc70ada2efb1417"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4720,11 +4643,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a dimension parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4735,7 +4657,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga28feceb75f731d6de08d1fdad1fc269e"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="ga28feceb75f731d6de08d1fdad1fc269e" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga28feceb75f731d6de08d1fdad1fc269e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4763,11 +4685,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a dimension parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4778,7 +4699,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gacf237afcbc26436ebedac5b11f469fdf"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="gacf237afcbc26436ebedac5b11f469fdf" args="(stp_vars_t *v, const char *val)" -->
+<a class="anchor" id="gacf237afcbc26436ebedac5b11f469fdf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4800,11 +4721,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the name of the printer driver. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the name to set. </td></tr>
@@ -4814,7 +4734,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga188d298a8739b84fcb965f211fc7dc4e"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="ga188d298a8739b84fcb965f211fc7dc4e" args="(stp_vars_t *v, const char *val, int bytes)" -->
+<a class="anchor" id="ga188d298a8739b84fcb965f211fc7dc4e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4842,11 +4762,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the name of the printer driver. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the name to set. </td></tr>
@@ -4857,7 +4776,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga8b30fbadf3475c59101af9d7d37c33b7"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="ga8b30fbadf3475c59101af9d7d37c33b7" args="(stp_vars_t *v, void *val)" -->
+<a class="anchor" id="ga8b30fbadf3475c59101af9d7d37c33b7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4879,11 +4798,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the error data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
@@ -4893,7 +4811,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga82f6a7514840de82c9ed7edd30f16b5d"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="ga82f6a7514840de82c9ed7edd30f16b5d" args="(stp_vars_t *v, stp_outfunc_t val)" -->
+<a class="anchor" id="ga82f6a7514840de82c9ed7edd30f16b5d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4915,12 +4833,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the function used to print error and diagnostic information. </p>
 <p>These must be supplied by the caller. errdata is passed as an arguments to errfunc; typically it will be a file descriptor. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -4930,7 +4847,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga537f2ba6c74c9562b2f6883d7e36c59f"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="ga537f2ba6c74c9562b2f6883d7e36c59f" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<a class="anchor" id="ga537f2ba6c74c9562b2f6883d7e36c59f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -4958,11 +4875,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a file parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -4973,7 +4889,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga0628a3f1feb7db7b5b10249a2b4f2412"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="ga0628a3f1feb7db7b5b10249a2b4f2412" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga0628a3f1feb7db7b5b10249a2b4f2412"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5001,11 +4917,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a file parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5016,7 +4931,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga6f7816adbce50ca9e2fdacad35282e6a"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_n" ref="ga6f7816adbce50ca9e2fdacad35282e6a" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<a class="anchor" id="ga6f7816adbce50ca9e2fdacad35282e6a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5050,11 +4965,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a file parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5066,7 +4980,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaf3a3283247deaad7d1ac19818aa4b796"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="gaf3a3283247deaad7d1ac19818aa4b796" args="(stp_vars_t *v, const char *parameter, double value)" -->
+<a class="anchor" id="gaf3a3283247deaad7d1ac19818aa4b796"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5094,11 +5008,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a float parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5109,7 +5022,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="ga49e5b05ba7bf8ccf6e95cb744f4f0f93" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5137,11 +5050,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a float parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5152,7 +5064,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga8ce73c5efa41f005936d5f84c44c6667"></a><!-- doxytag: member="vars.h::stp_set_height" ref="ga8ce73c5efa41f005936d5f84c44c6667" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga8ce73c5efa41f005936d5f84c44c6667"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5174,11 +5086,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the height of the image. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5188,7 +5099,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga70eded5d0df4677dd4b357b4b934f75a"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="ga70eded5d0df4677dd4b357b4b934f75a" args="(stp_vars_t *v, const char *parameter, int value)" -->
+<a class="anchor" id="ga70eded5d0df4677dd4b357b4b934f75a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5216,11 +5127,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set an integer parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5231,7 +5141,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga0cc1a26e8c3d502024c55a065fd5629a"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="ga0cc1a26e8c3d502024c55a065fd5629a" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga0cc1a26e8c3d502024c55a065fd5629a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5259,11 +5169,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of an integer parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5274,7 +5183,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga3b0cc83e87247854ecafd46a6e446bcb"></a><!-- doxytag: member="vars.h::stp_set_left" ref="ga3b0cc83e87247854ecafd46a6e446bcb" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga3b0cc83e87247854ecafd46a6e446bcb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5296,11 +5205,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the left edge of the image. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5310,7 +5218,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac2b3408200a9676e6c6063cc0ae2f4bd"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="gac2b3408200a9676e6c6063cc0ae2f4bd" args="(stp_vars_t *v, void *val)" -->
+<a class="anchor" id="gac2b3408200a9676e6c6063cc0ae2f4bd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5332,11 +5240,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the output data. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
@@ -5346,7 +5253,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga075ffc274f0d2d2b6edd8326de1d7142"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="ga075ffc274f0d2d2b6edd8326de1d7142" args="(stp_vars_t *v, stp_outfunc_t val)" -->
+<a class="anchor" id="ga075ffc274f0d2d2b6edd8326de1d7142"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5368,12 +5275,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the function used to print output information. </p>
 <p>These must be supplied by the caller. outdata is passed as an arguments to outfunc; typically it will be a file descriptor. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5383,7 +5289,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga83326bacb8b92149af1b70457b23bc8f"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="ga83326bacb8b92149af1b70457b23bc8f" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga83326bacb8b92149af1b70457b23bc8f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5405,11 +5311,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the page height. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5419,7 +5324,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga639be0da07c3e5b7dc6d68ac2aa999e9"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="ga639be0da07c3e5b7dc6d68ac2aa999e9" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga639be0da07c3e5b7dc6d68ac2aa999e9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5441,11 +5346,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the page width. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5455,7 +5359,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga5ececd1972a375e1e569ed4a242ed1ed"></a><!-- doxytag: member="vars.h::stp_set_parameter_active" ref="ga5ececd1972a375e1e569ed4a242ed1ed" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active, stp_parameter_type_t type)" -->
+<a class="anchor" id="ga5ececd1972a375e1e569ed4a242ed1ed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5489,11 +5393,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5505,7 +5408,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga0155de75bf2aa95ab45a3319539cda56"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="ga0155de75bf2aa95ab45a3319539cda56" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" -->
+<a class="anchor" id="ga0155de75bf2aa95ab45a3319539cda56"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5539,11 +5442,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a raw parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5555,7 +5457,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga47b8c3b31693ecdef420160b40b23a0d"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="ga47b8c3b31693ecdef420160b40b23a0d" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="ga47b8c3b31693ecdef420160b40b23a0d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5583,11 +5485,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a raw parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5598,7 +5499,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gaa147483996fa118516ddb36fe3366aa9"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="gaa147483996fa118516ddb36fe3366aa9" args="(stp_vars_t *v, const char *parameter, const char *value)" -->
+<a class="anchor" id="gaa147483996fa118516ddb36fe3366aa9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5626,11 +5527,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a string parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5641,7 +5541,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gac9f06e27ce5b6808d30c6fc01558db3b"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="gac9f06e27ce5b6808d30c6fc01558db3b" args="(stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" -->
+<a class="anchor" id="gac9f06e27ce5b6808d30c6fc01558db3b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5669,11 +5569,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the activity of a string parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5684,7 +5583,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gafe6c8b3d86ca16239a63ce9d2ef57f48"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_n" ref="gafe6c8b3d86ca16239a63ce9d2ef57f48" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" -->
+<a class="anchor" id="gafe6c8b3d86ca16239a63ce9d2ef57f48"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5718,11 +5617,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set a string parameter. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">parameter</td><td>the name of the parameter. </td></tr>
@@ -5734,7 +5632,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga557b5ad44d3b1da8392496681624ad8b"></a><!-- doxytag: member="vars.h::stp_set_top" ref="ga557b5ad44d3b1da8392496681624ad8b" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga557b5ad44d3b1da8392496681624ad8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5756,11 +5654,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the top edge of the image. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5770,7 +5667,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga1023ad18d2c97763137909b6191b0940"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga1023ad18d2c97763137909b6191b0940" args="(stp_vars_t *v, int value)" -->
+<a class="anchor" id="ga1023ad18d2c97763137909b6191b0940"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5792,12 +5689,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga3a852ce7e42d7f8e0cef6c7d399e0491"></a><!-- doxytag: member="vars.h::stp_set_width" ref="ga3a852ce7e42d7f8e0cef6c7d399e0491" args="(stp_vars_t *v, int val)" -->
+<a class="anchor" id="ga3a852ce7e42d7f8e0cef6c7d399e0491"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5819,11 +5715,10 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Set the width of the image. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
     <tr><td class="paramname">val</td><td>the value to set. </td></tr>
@@ -5833,7 +5728,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga88376207367adb4260ff14e5d9ec76e9"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="ga88376207367adb4260ff14e5d9ec76e9" args="(stp_vars_t *dest, const stp_vars_t *source)" -->
+<a class="anchor" id="ga88376207367adb4260ff14e5d9ec76e9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5855,12 +5750,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy a vars object. </p>
 <p>Both dest and source must be valid vars objects previously created with <a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc" title="Create a new vars object.">stp_vars_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">dest</td><td>the destination vars. </td></tr>
     <tr><td class="paramname">source</td><td>the source vars. </td></tr>
@@ -5870,7 +5764,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ga5d641ab7093c9ba82cbd4cfbf904fabc"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="ga5d641ab7093c9ba82cbd4cfbf904fabc" args="(void)" -->
+<a class="anchor" id="ga5d641ab7093c9ba82cbd4cfbf904fabc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5882,15 +5776,14 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Create a new vars object. </p>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the newly created vars object. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the newly created vars object. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gaec00fba49ad08d20890e64773bcdbd48"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="gaec00fba49ad08d20890e64773bcdbd48" args="(const stp_vars_t *source)" -->
+<a class="anchor" id="gaec00fba49ad08d20890e64773bcdbd48"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5902,22 +5795,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Copy and allocate a vars object. </p>
 <p>source must be a valid vars object previously created with <a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc" title="Create a new vars object.">stp_vars_create()</a>. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">source</td><td>the source vars. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>the new copy of the vars. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>the new copy of the vars. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="gad3f1ff7a86c3cd1c9f9f62cfa8814437" args="(stp_vars_t *v)" -->
+<a class="anchor" id="gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5929,12 +5821,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Destroy a vars object. </p>
 <p>It is an error to destroy the vars more than once. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to destroy. </td></tr>
   </table>
@@ -5943,7 +5834,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="gab926417b2f601c78d85df44694cc6d38"></a><!-- doxytag: member="vars.h::stp_verify" ref="gab926417b2f601c78d85df44694cc6d38" args="(stp_vars_t *v)" -->
+<a class="anchor" id="gab926417b2f601c78d85df44694cc6d38"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5955,22 +5846,21 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Verify parameters. </p>
 <p>Verify that the parameters selected are consistent with those allowed by the driver. This must be called prior to printing; failure to do so will result in printing failing. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">v</td><td>the vars to use. </td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success; other status values are reserved. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>0 on failure, 1 on success; other status values are reserved. </dd></dl>
 
 </div>
 </div>
-<a class="anchor" id="gabfffe0d654de156874decdc0338216f4"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="gabfffe0d654de156874decdc0338216f4" args="(const stp_vars_t *v, const char *parameter, int quiet)" -->
+<a class="anchor" id="gabfffe0d654de156874decdc0338216f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -5998,14 +5888,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index 0f81383..89f90b2 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: version</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,53 +35,55 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a> &#124;
 <a href="#var-members">Variables</a>  </div>
   <div class="headertitle">
 <div class="title">version</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 
 <p>Version information.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&#160;&#160;&#160;(5)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&#160;&#160;&#160;(2)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gab860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&#160;&#160;&#160;(7)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&#160;&#160;&#160;(2)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&#160;&#160;&#160;(0)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&#160;&#160;&#160;(8)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gaf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:gadd0b07630653da8e46b91c2c1bafc2b9"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&#160;&#160;&#160;(5)</td></tr>
+<tr class="memitem:ga87507431ad6b7504b129eafad863cb1f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&#160;&#160;&#160;(2)</td></tr>
+<tr class="memitem:gab860ee8cb0b05ea1385e01d130d7358e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gab860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&#160;&#160;&#160;(8)</td></tr>
+<tr class="memitem:ga1969d8a5a74a5c70a978f99aa68d9f4b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&#160;&#160;&#160;(3)</td></tr>
+<tr class="memitem:ga509ecd9be5329eef0f8d49e0b25f63da"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&#160;&#160;&#160;(0)</td></tr>
+<tr class="memitem:ga6485cd073e75e01f9df68ecd67b14372"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&#160;&#160;&#160;(0)</td></tr>
+<tr class="memitem:gaf20320940416f43ed7735137296fa12b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gaf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#ga05a93cb4ac52cc50875b5839c59bcafc"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="var-members"></a>
+<tr class="memitem:ga05a93cb4ac52cc50875b5839c59bcafc"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr class="memdesc:ga05a93cb4ac52cc50875b5839c59bcafc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#ga05a93cb4ac52cc50875b5839c59bcafc"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="var-members"></a>
 Variables</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library major version number.  <a href="#ga4d72666d9093df7a31e7cd448b7cfd1d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library minor version number.  <a href="#ga5efc986430f0d27f5d11236c4bc48079"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library micro version number.  <a href="#ga2c7e65e276ce5af050b3ea9f859f1f89"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#gafc84e89ce8d6d3302270c56ebe01d5ef"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#ga44593f7714544c5886ab34521e05d0bd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#ga1284e8ef76a4c864e85b7b698b91bf0c"></a><br/></td></tr>
+<tr class="memitem:ga4d72666d9093df7a31e7cd448b7cfd1d"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
+<tr class="memdesc:ga4d72666d9093df7a31e7cd448b7cfd1d"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library major version number.  <a href="#ga4d72666d9093df7a31e7cd448b7cfd1d"></a><br/></td></tr>
+<tr class="memitem:ga5efc986430f0d27f5d11236c4bc48079"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
+<tr class="memdesc:ga5efc986430f0d27f5d11236c4bc48079"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library minor version number.  <a href="#ga5efc986430f0d27f5d11236c4bc48079"></a><br/></td></tr>
+<tr class="memitem:ga2c7e65e276ce5af050b3ea9f859f1f89"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
+<tr class="memdesc:ga2c7e65e276ce5af050b3ea9f859f1f89"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library micro version number.  <a href="#ga2c7e65e276ce5af050b3ea9f859f1f89"></a><br/></td></tr>
+<tr class="memitem:gafc84e89ce8d6d3302270c56ebe01d5ef"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
+<tr class="memdesc:gafc84e89ce8d6d3302270c56ebe01d5ef"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#gafc84e89ce8d6d3302270c56ebe01d5ef"></a><br/></td></tr>
+<tr class="memitem:ga44593f7714544c5886ab34521e05d0bd"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
+<tr class="memdesc:ga44593f7714544c5886ab34521e05d0bd"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#ga44593f7714544c5886ab34521e05d0bd"></a><br/></td></tr>
+<tr class="memitem:ga1284e8ef76a4c864e85b7b698b91bf0c"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
+<tr class="memdesc:ga1284e8ef76a4c864e85b7b698b91bf0c"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#ga1284e8ef76a4c864e85b7b698b91bf0c"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <p>Version information. </p>
 <p>Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants. </p>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ga509ecd9be5329eef0f8d49e0b25f63da"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_BINARY_AGE" ref="ga509ecd9be5329eef0f8d49e0b25f63da" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ga509ecd9be5329eef0f8d49e0b25f63da"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -83,12 +91,11 @@ Variables</h2></td></tr>
           <td class="memname">#define STP_BINARY_AGE&#160;&#160;&#160;(0)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gaf20320940416f43ed7735137296fa12b"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_CHECK_VERSION" ref="gaf20320940416f43ed7735137296fa12b" args="(major, minor, micro)" -->
+<a class="anchor" id="gaf20320940416f43ed7735137296fa12b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -116,44 +123,41 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
+</div><div class="memdoc">
+<b>Value:</b><div class="fragment"><div class="line">(<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> &gt;  (major) ||                \</div>
+<div class="line">  (<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \</div>
+<div class="line">   STP_MINOR_VERSION &gt; (minor)) ||              \</div>
+<div class="line">  (<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \</div>
+<div class="line">   <a class="code" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \</div>
+<div class="line">   STP_MICRO_VERSION &gt;= (micro)))</div>
+</div><!-- fragment -->
 </div>
-<div class="memdoc">
-<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> &gt;  (major) ||                \
-  (<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a> &gt; (minor)) ||              \
-  (<a class="code" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \
-   <a class="code" href="group__version.html#gab860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a> &gt;= (micro)))
-</pre></div>
 </div>
-</div>
-<a class="anchor" id="ga1969d8a5a74a5c70a978f99aa68d9f4b"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_CURRENT_INTERFACE" ref="ga1969d8a5a74a5c70a978f99aa68d9f4b" args="" -->
+<a class="anchor" id="ga1969d8a5a74a5c70a978f99aa68d9f4b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_CURRENT_INTERFACE&#160;&#160;&#160;(2)</td>
+          <td class="memname">#define STP_CURRENT_INTERFACE&#160;&#160;&#160;(3)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga6485cd073e75e01f9df68ecd67b14372"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_INTERFACE_AGE" ref="ga6485cd073e75e01f9df68ecd67b14372" args="" -->
+<a class="anchor" id="ga6485cd073e75e01f9df68ecd67b14372"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_INTERFACE_AGE&#160;&#160;&#160;(8)</td>
+          <td class="memname">#define STP_INTERFACE_AGE&#160;&#160;&#160;(0)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gadd0b07630653da8e46b91c2c1bafc2b9"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_MAJOR_VERSION" ref="gadd0b07630653da8e46b91c2c1bafc2b9" args="" -->
+<a class="anchor" id="gadd0b07630653da8e46b91c2c1bafc2b9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -161,25 +165,23 @@ Variables</h2></td></tr>
           <td class="memname">#define STP_MAJOR_VERSION&#160;&#160;&#160;(5)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="gab860ee8cb0b05ea1385e01d130d7358e"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_MICRO_VERSION" ref="gab860ee8cb0b05ea1385e01d130d7358e" args="" -->
+<a class="anchor" id="gab860ee8cb0b05ea1385e01d130d7358e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MICRO_VERSION&#160;&#160;&#160;(7)</td>
+          <td class="memname">#define STP_MICRO_VERSION&#160;&#160;&#160;(8)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ga87507431ad6b7504b129eafad863cb1f"></a><!-- doxytag: member="gutenprint&#45;version.h::STP_MINOR_VERSION" ref="ga87507431ad6b7504b129eafad863cb1f" args="" -->
+<a class="anchor" id="ga87507431ad6b7504b129eafad863cb1f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -187,13 +189,12 @@ Variables</h2></td></tr>
           <td class="memname">#define STP_MINOR_VERSION&#160;&#160;&#160;(2)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ga05a93cb4ac52cc50875b5839c59bcafc"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_check_version" ref="ga05a93cb4ac52cc50875b5839c59bcafc" args="(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)" -->
+<a class="anchor" id="ga05a93cb4ac52cc50875b5839c59bcafc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -221,11 +222,10 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Check whether the library provides the requested version. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">required_major</td><td>the minimum major revision. </td></tr>
     <tr><td class="paramname">required_minor</td><td>the minimum minor revision. </td></tr>
@@ -233,104 +233,101 @@ Variables</h2></td></tr>
   </table>
   </dd>
 </dl>
-<dl class="return"><dt><b>Returns:</b></dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new. </dd></dl>
+<dl class="section return"><dt>Returns:</dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new. </dd></dl>
 
 </div>
 </div>
 <hr/><h2>Variable Documentation</h2>
-<a class="anchor" id="ga44593f7714544c5886ab34521e05d0bd"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_binary_age" ref="ga44593f7714544c5886ab34521e05d0bd" args="" -->
+<a class="anchor" id="ga44593f7714544c5886ab34521e05d0bd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#ga44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td>
+          <td class="memname">const unsigned int stp_binary_age</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library ABI binary age number (number of forward-compatible revisions). </p>
 
 </div>
 </div>
-<a class="anchor" id="gafc84e89ce8d6d3302270c56ebe01d5ef"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_current_interface" ref="gafc84e89ce8d6d3302270c56ebe01d5ef" args="" -->
+<a class="anchor" id="gafc84e89ce8d6d3302270c56ebe01d5ef"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td>
+          <td class="memname">const unsigned int stp_current_interface</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library ABI revision number (number of incompatible revisions). </p>
 
 </div>
 </div>
-<a class="anchor" id="ga1284e8ef76a4c864e85b7b698b91bf0c"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_interface_age" ref="ga1284e8ef76a4c864e85b7b698b91bf0c" args="" -->
+<a class="anchor" id="ga1284e8ef76a4c864e85b7b698b91bf0c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td>
+          <td class="memname">const unsigned int stp_interface_age</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library ABI interface age number (number of revisions of this ABI). </p>
 
 </div>
 </div>
-<a class="anchor" id="ga4d72666d9093df7a31e7cd448b7cfd1d"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_major_version" ref="ga4d72666d9093df7a31e7cd448b7cfd1d" args="" -->
+<a class="anchor" id="ga4d72666d9093df7a31e7cd448b7cfd1d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td>
+          <td class="memname">const unsigned int stp_major_version</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library major version number. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga2c7e65e276ce5af050b3ea9f859f1f89"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_micro_version" ref="ga2c7e65e276ce5af050b3ea9f859f1f89" args="" -->
+<a class="anchor" id="ga2c7e65e276ce5af050b3ea9f859f1f89"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td>
+          <td class="memname">const unsigned int stp_micro_version</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library micro version number. </p>
 
 </div>
 </div>
-<a class="anchor" id="ga5efc986430f0d27f5d11236c4bc48079"></a><!-- doxytag: member="gutenprint&#45;version.h::stp_minor_version" ref="ga5efc986430f0d27f5d11236c4bc48079" args="" -->
+<a class="anchor" id="ga5efc986430f0d27f5d11236c4bc48079"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned int <a class="el" href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td>
+          <td class="memname">const unsigned int stp_minor_version</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The library minor version number. </p>
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 f7b879c..e76381f 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl-internal.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,34 +41,41 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a>  </div>
+<a href="#define-members">Macros</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/gutenprint-intl-internal.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprint-intl-internal.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Internationalisation functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;locale.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga5f80e8482ab93869489531a8c7ce7006"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga83b8be0887dede025766d25e2bb884c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:gad24abc7110e1bdf384dc2ef2b63e5d07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:ga115dd6a6dd9d7a249f6374a7c06deef5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:gadd6dfc1077058ff26d79cdb18099d58a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
+<tr class="memitem:ga32a3cf3d9dd914f5aeeca5423c157934"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga75278405e7f034d2b1af80bfd94675fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Internationalisation functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index 2a6fe28..a44cb86 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,34 +41,41 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a>  </div>
+<a href="#define-members">Macros</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/gutenprint-intl.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprint-intl.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Internationalisation functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;locale.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga5f80e8482ab93869489531a8c7ce7006"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5f80e8482ab93869489531a8c7ce7006">textdomain</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga83b8be0887dede025766d25e2bb884c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga83b8be0887dede025766d25e2bb884c6">gettext</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:gad24abc7110e1bdf384dc2ef2b63e5d07"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gad24abc7110e1bdf384dc2ef2b63e5d07">dgettext</a>(Domain, Message)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:ga115dd6a6dd9d7a249f6374a7c06deef5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga115dd6a6dd9d7a249f6374a7c06deef5">dcgettext</a>(Domain, Message, Type)&#160;&#160;&#160;(Message)</td></tr>
+<tr class="memitem:gadd6dfc1077058ff26d79cdb18099d58a"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gadd6dfc1077058ff26d79cdb18099d58a">bindtextdomain</a>(Domain, Directory)&#160;&#160;&#160;(Domain)</td></tr>
+<tr class="memitem:ga32a3cf3d9dd914f5aeeca5423c157934"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga32a3cf3d9dd914f5aeeca5423c157934">_</a>(String)&#160;&#160;&#160;(String)</td></tr>
+<tr class="memitem:ga75278405e7f034d2b1af80bfd94675fe"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga75278405e7f034d2b1af80bfd94675fe">N_</a>(String)&#160;&#160;&#160;(String)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Internationalisation functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index 3be20c9..8c2cfe3 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-module.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,13 +41,17 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a>  </div>
+<a href="#define-members">Macros</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/gutenprint-module.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprint-module.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Gutenprint module header.  
@@ -57,15 +67,15 @@
 <code>#include &lt;<a class="el" href="weave_8h.html">gutenprint/weave.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="xml_8h.html">gutenprint/xml.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#a38fcab54351f45a3968822e2747aff6b">STP_MODULE</a>&#160;&#160;&#160;1</td></tr>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a38fcab54351f45a3968822e2747aff6b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#a38fcab54351f45a3968822e2747aff6b">STP_MODULE</a>&#160;&#160;&#160;1</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Gutenprint module header. </p>
 <p>This header includes all of the public headers used by modules. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a38fcab54351f45a3968822e2747aff6b"></a><!-- doxytag: member="gutenprint&#45;module.h::STP_MODULE" ref="a38fcab54351f45a3968822e2747aff6b" args="" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a38fcab54351f45a3968822e2747aff6b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -73,14 +83,16 @@ Defines</h2></td></tr>
           <td class="memname">#define STP_MODULE&#160;&#160;&#160;1</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index 4f3abd4..45969c6 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-version.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,53 +41,62 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a> &#124;
 <a href="#var-members">Variables</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/gutenprint-version.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprint-version.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Version functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&#160;&#160;&#160;(5)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&#160;&#160;&#160;(2)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gab860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&#160;&#160;&#160;(7)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&#160;&#160;&#160;(2)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&#160;&#160;&#160;(0)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&#160;&#160;&#160;(8)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gaf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:gadd0b07630653da8e46b91c2c1bafc2b9"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gadd0b07630653da8e46b91c2c1bafc2b9">STP_MAJOR_VERSION</a>&#160;&#160;&#160;(5)</td></tr>
+<tr class="memitem:ga87507431ad6b7504b129eafad863cb1f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&#160;&#160;&#160;(2)</td></tr>
+<tr class="memitem:gab860ee8cb0b05ea1385e01d130d7358e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gab860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&#160;&#160;&#160;(8)</td></tr>
+<tr class="memitem:ga1969d8a5a74a5c70a978f99aa68d9f4b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&#160;&#160;&#160;(3)</td></tr>
+<tr class="memitem:ga509ecd9be5329eef0f8d49e0b25f63da"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&#160;&#160;&#160;(0)</td></tr>
+<tr class="memitem:ga6485cd073e75e01f9df68ecd67b14372"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&#160;&#160;&#160;(0)</td></tr>
+<tr class="memitem:gaf20320940416f43ed7735137296fa12b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gaf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="var-members"></a>
+<tr class="memitem:ga05a93cb4ac52cc50875b5839c59bcafc"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr class="memdesc:ga05a93cb4ac52cc50875b5839c59bcafc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#ga05a93cb4ac52cc50875b5839c59bcafc"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="var-members"></a>
 Variables</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#ga44593f7714544c5886ab34521e05d0bd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c"></a><br/></td></tr>
+<tr class="memitem:ga4d72666d9093df7a31e7cd448b7cfd1d"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d">stp_major_version</a></td></tr>
+<tr class="memdesc:ga4d72666d9093df7a31e7cd448b7cfd1d"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#ga4d72666d9093df7a31e7cd448b7cfd1d"></a><br/></td></tr>
+<tr class="memitem:ga5efc986430f0d27f5d11236c4bc48079"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079">stp_minor_version</a></td></tr>
+<tr class="memdesc:ga5efc986430f0d27f5d11236c4bc48079"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#ga5efc986430f0d27f5d11236c4bc48079"></a><br/></td></tr>
+<tr class="memitem:ga2c7e65e276ce5af050b3ea9f859f1f89"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89">stp_micro_version</a></td></tr>
+<tr class="memdesc:ga2c7e65e276ce5af050b3ea9f859f1f89"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#ga2c7e65e276ce5af050b3ea9f859f1f89"></a><br/></td></tr>
+<tr class="memitem:gafc84e89ce8d6d3302270c56ebe01d5ef"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef">stp_current_interface</a></td></tr>
+<tr class="memdesc:gafc84e89ce8d6d3302270c56ebe01d5ef"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#gafc84e89ce8d6d3302270c56ebe01d5ef"></a><br/></td></tr>
+<tr class="memitem:ga44593f7714544c5886ab34521e05d0bd"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga44593f7714544c5886ab34521e05d0bd">stp_binary_age</a></td></tr>
+<tr class="memdesc:ga44593f7714544c5886ab34521e05d0bd"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#ga44593f7714544c5886ab34521e05d0bd"></a><br/></td></tr>
+<tr class="memitem:ga1284e8ef76a4c864e85b7b698b91bf0c"><td class="memItemLeft" align="right" valign="top">const unsigned int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c">stp_interface_age</a></td></tr>
+<tr class="memdesc:ga1284e8ef76a4c864e85b7b698b91bf0c"><td class="mdescLeft">&#160;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#ga1284e8ef76a4c864e85b7b698b91bf0c"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Version functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 37679ae..4d01dc1 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/gutenprint.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,11 +41,15 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
-<div class="title">include/gutenprint/gutenprint.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprint.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Gutenprint master header.  
@@ -56,14 +66,15 @@
 <code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="util_8h.html">gutenprint/util.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br/>
-</div><table class="memberdecls">
-</table>
-<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
+</div><hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Gutenprint master header. </p>
 <p>This header includes all of the public headers. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 3cebf96..870e0a2 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/image.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,54 +41,65 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/image.h File Reference</div>  </div>
-</div>
+<div class="title">image.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Image functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&#160;&#160;&#160;(32)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html">stp_image</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga0b7daa7e9e9b26fea847d71ca9de7c02"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0b7daa7e9e9b26fea847d71ca9de7c02">STP_CHANNEL_LIMIT</a>&#160;&#160;&#160;(32)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:gaae0b5ef92b619849a51cb75d376a90fb"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
+<tr class="memdesc:gaae0b5ef92b619849a51cb75d376a90fb"><td class="mdescLeft">&#160;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
+<tr class="memitem:ga58672e1989d582c14328048b207657c8"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8ab5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gga58672e1989d582c14328048b207657c8a224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga58672e1989d582c14328048b207657c8">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memdesc:ga58672e1989d582c14328048b207657c8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga58672e1989d582c14328048b207657c8">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gad257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gabe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gad257f72ac5272e94ff9314f8ecd24f1e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gad257f72ac5272e94ff9314f8ecd24f1e">stp_image_init</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gaf2fc433dba580b9ec8e69aebc2e65338"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf2fc433dba580b9ec8e69aebc2e65338">stp_image_reset</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gabe86b2ff9a3a0c0e98248990f9be5652"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gabe86b2ff9a3a0c0e98248990f9be5652">stp_image_width</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:gaf9dcdf718ad99df9eb71fc542d5b47e1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gaf9dcdf718ad99df9eb71fc542d5b47e1">stp_image_height</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:ga01d72a16de9e98722859ca651561e8f5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga01d72a16de9e98722859ca651561e8f5">stp_image_get_row</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr class="memitem:ga1643f6b9eb180e98f3c1c267950f18d2"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1643f6b9eb180e98f3c1c267950f18d2">stp_image_get_appname</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:ga7598151354fbeb5f6a8b3f92d1e40ad7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7598151354fbeb5f6a8b3f92d1e40ad7">stp_image_conclude</a> (<a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Image functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 9000871..4ae68cf 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Main Page</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li class="current"><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,15 +35,18 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">libgutenprint API Reference Documentation</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/jquery.js b/doc/gutenprint/html/jquery.js
index c052173..63939e7 100644
--- a/doc/gutenprint/html/jquery.js
+++ b/doc/gutenprint/html/jquery.js
@@ -1,54 +1,8 @@
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){
-var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0)
-{I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function()
-{G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
-/*
- * jQuery UI 1.7.2
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
-jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.2",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/* * jQuery UI Resizable 1.7.2
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	ui.core.js
- */
-(function(c){c.widget("ui.resizable",c.extend({},c.ui.mouse,{_init:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f<k.length;f++){var h=c.trim(k[f]),d="ui-resizable-"+h;var g=c('<div class="ui-resizable-handle '+d+'"></div>');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.parent().append(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).end().remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement)},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return this.options.disabled||!!f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidth<k.width),l=a(k.height)&&h.maxHeight&&(h.maxHeight<k.height),g=a(k.width)&&h.minWidth&&(h.minWidth>k.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e<this._proportionallyResizeElements.length;e++){var g=this._proportionallyResizeElements[e];if(!this.borderDif){var d=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],h=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=c.map(d,function(k,m){var l=parseInt(k,10)||0,n=parseInt(h[m],10)||0;return l+n})}if(c.browser.msie&&!(!(c(f).is(":hidden")||c(f).parents(":hidden").length))){continue}g.css({height:(f.height()-this.borderDif[0]-this.borderDif[2])||0,width:(f.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var e=this.element,h=this.options;this.elementOffset=e.offset();if(this._helper){this.helper=this.helper||c('<div style="overflow:hidden;"></div>');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));c.extend(c.ui.resizable,{version:"1.7.2",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000}});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),g=d.options;_store=function(h){c(h).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(g.alsoResize)=="object"&&!g.alsoResize.parentNode){if(g.alsoResize.length){g.alsoResize=g.alsoResize[0];_store(g.alsoResize)}else{c.each(g.alsoResize,function(h,i){_store(h)})}}else{_store(g.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0))
-{s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);;
-/**
- * jQuery.ScrollTo - Easy element scrolling using jQuery.
- * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com
- * Licensed under GPL license (http://www.opensource.org/licenses/gpl-license.php).
- * Date: 2/8/2008
- * @author Ariel Flesler
- * @version 1.3.2
- */
-;(function($){var o=$.scrollTo=function(a,b,c){o.window().scrollTo(a,b,c)};o.defaults={axis:'y',duration:1};o.window=function(){return $($.browser.safari?'body':'html')};$.fn.scrollTo=function(l,m,n){if(typeof m=='object'){n=m;m=0}n=$.extend({},o.defaults,n);m=m||n.speed||n.duration;n.queue=n.queue&&n.axis.length>1;if(n.queue)m/=2;n.offset=j(n.offset);n.over=j(n.over);return this.each(function(){var a=this,b=$(a),t=l,c,d={},w=b.is('html,body');switch(typeof t){case'number':case'string':if(/^([+-]=)?\d+(px)?$/.test(t)){t=j(t);break}t=$(t,this);case'object':if(t.is||t.style)c=(t=$(t)).offset()}$.each(n.axis.split(''),function(i,f){var P=f=='x'?'Left':'Top',p=P.toLowerCase(),k='scroll'+P,e=a[k],D=f=='x'?'Width':'Height';if(c){d[k]=c[p]+(w?0:e-b.offset()[p]);if(n.margin){d[k]-=parseInt(t.css('margin'+P))||0;d[k]-=parseInt(t.css('border'+P+'Width'))||0}d[k]+=n.offset[p]||0;if(n.over[p])d[k]+=t[D.toLowerCase()]()*n.over[p]}else d[k]=t[p];if(/^\d+$/.test(d[k]))d[k]=d[k]<=0?0:Math.min(d[k],h(D));if(!i&&n.queue){if(e!=d[k])g(n.onAfterFirst);delete d[k]}});g(n.onAfter);function g(a){b.animate(d,m,n.easing,a&&function(){a.call(this,l)})};function h(D){var b=w?$.browser.opera?document.body:document.documentElement:a;return b['scroll'+D]-b['client'+D]}})};function j(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
-
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function()
+{g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d
+&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),
+f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c)
+{if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index b6ef95b..8803cd3 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/list.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,93 +41,101 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/list.h File Reference</div>  </div>
-</div>
+<div class="title">list.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Generic list functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_list_item&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> )(void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#gac09ea139ad36a6e21f30755439afeab5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> )(const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> )(const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga67b4fafe1ab6ead5be7500f88874bdb0"><td class="memItemLeft" align="right" valign="top">typedef struct stp_list_item&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a></td></tr>
+<tr class="memdesc:ga67b4fafe1ab6ead5be7500f88874bdb0"><td class="mdescLeft">&#160;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0"></a><br/></td></tr>
+<tr class="memitem:ga53cf4f01ab7d712f771cb5fb479d2ba7"><td class="memItemLeft" align="right" valign="top">typedef struct stp_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a></td></tr>
+<tr class="memdesc:ga53cf4f01ab7d712f771cb5fb479d2ba7"><td class="mdescLeft">&#160;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7"></a><br/></td></tr>
+<tr class="memitem:gac09ea139ad36a6e21f30755439afeab5"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> )(void *)</td></tr>
+<tr class="memdesc:gac09ea139ad36a6e21f30755439afeab5"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#gac09ea139ad36a6e21f30755439afeab5"></a><br/></td></tr>
+<tr class="memitem:ga8d8084abc24eb4b00290916d5ff44c1f"><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr class="memdesc:ga8d8084abc24eb4b00290916d5ff44c1f"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f"></a><br/></td></tr>
+<tr class="memitem:ga815993ed02f7e9c7b5cb4680f0504d97"><td class="memItemLeft" align="right" valign="top">typedef const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr class="memdesc:ga815993ed02f7e9c7b5cb4680f0504d97"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97"></a><br/></td></tr>
+<tr class="memitem:gae5c7167d6fc957fee0b6aff45bc0b126"><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr class="memdesc:gae5c7167d6fc957fee0b6aff45bc0b126"><td class="mdescLeft">&#160;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#gad185100e8d7969a473e9d42bc8084572"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#gad377973e8b13d02c9c111d970f491993"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#ga729867c847dd8282f74806968c708f28"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> freefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> copyfunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#ga686e92ee802147171e5fc723d0079b8d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> namefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> long_namefunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> sortfunc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#gae726297a82e140672a018e135ffc6a0e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#gad6f6b303b40fa75f22a86391785178cb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br/></td></tr>
+<tr class="memitem:ga55fbb8f7a3920b783b02183c5ea57624"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr class="memdesc:ga55fbb8f7a3920b783b02183c5ea57624"><td class="mdescLeft">&#160;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#ga55fbb8f7a3920b783b02183c5ea57624"></a><br/></td></tr>
+<tr class="memitem:ga3cfea94cd07f50d7d9b4ce384d349fca"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca">stp_list_create</a> (void)</td></tr>
+<tr class="memdesc:ga3cfea94cd07f50d7d9b4ce384d349fca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#ga3cfea94cd07f50d7d9b4ce384d349fca"></a><br/></td></tr>
+<tr class="memitem:ga0ba249dd06efbf5c0af8511ceab671e8"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga0ba249dd06efbf5c0af8511ceab671e8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#ga0ba249dd06efbf5c0af8511ceab671e8"></a><br/></td></tr>
+<tr class="memitem:gae23ef06175b27dd6772d4d4c098999b1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1">stp_list_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae23ef06175b27dd6772d4d4c098999b1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#gae23ef06175b27dd6772d4d4c098999b1"></a><br/></td></tr>
+<tr class="memitem:gad185100e8d7969a473e9d42bc8084572"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad185100e8d7969a473e9d42bc8084572">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gad185100e8d7969a473e9d42bc8084572"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#gad185100e8d7969a473e9d42bc8084572"></a><br/></td></tr>
+<tr class="memitem:gae939f15ee1a6e4c0aaad7a7be7f40b74"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae939f15ee1a6e4c0aaad7a7be7f40b74"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#gae939f15ee1a6e4c0aaad7a7be7f40b74"></a><br/></td></tr>
+<tr class="memitem:gad377973e8b13d02c9c111d970f491993"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad377973e8b13d02c9c111d970f491993">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, int idx)</td></tr>
+<tr class="memdesc:gad377973e8b13d02c9c111d970f491993"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#gad377973e8b13d02c9c111d970f491993"></a><br/></td></tr>
+<tr class="memitem:ga729867c847dd8282f74806968c708f28"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga729867c847dd8282f74806968c708f28">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *name)</td></tr>
+<tr class="memdesc:ga729867c847dd8282f74806968c708f28"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#ga729867c847dd8282f74806968c708f28"></a><br/></td></tr>
+<tr class="memitem:gacc9140df3f4311cd750ba10a1cbf37d1"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr class="memdesc:gacc9140df3f4311cd750ba10a1cbf37d1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#gacc9140df3f4311cd750ba10a1cbf37d1"></a><br/></td></tr>
+<tr class="memitem:gae22741060734c9cbc47656c5ea35c3f3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gae22741060734c9cbc47656c5ea35c3f3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#gae22741060734c9cbc47656c5ea35c3f3"></a><br/></td></tr>
+<tr class="memitem:gae3300d7971c393d119d6fd62e2b578ec"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a> freefunc)</td></tr>
+<tr class="memdesc:gae3300d7971c393d119d6fd62e2b578ec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#gae3300d7971c393d119d6fd62e2b578ec"></a><br/></td></tr>
+<tr class="memitem:gabfc1ef258084a3e1ad959aa3d2f053f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gac09ea139ad36a6e21f30755439afeab5">stp_node_freefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gabfc1ef258084a3e1ad959aa3d2f053f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#gabfc1ef258084a3e1ad959aa3d2f053f4"></a><br/></td></tr>
+<tr class="memitem:ga7e002ed25bbfbad236c1c619841f1ac6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr class="memdesc:ga7e002ed25bbfbad236c1c619841f1ac6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#ga7e002ed25bbfbad236c1c619841f1ac6"></a><br/></td></tr>
+<tr class="memitem:ga686e92ee802147171e5fc723d0079b8d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga8d8084abc24eb4b00290916d5ff44c1f">stp_node_copyfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga686e92ee802147171e5fc723d0079b8d">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga686e92ee802147171e5fc723d0079b8d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#ga686e92ee802147171e5fc723d0079b8d"></a><br/></td></tr>
+<tr class="memitem:ga889af512d87a00d696acc0b6b3fafe78"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> namefunc)</td></tr>
+<tr class="memdesc:ga889af512d87a00d696acc0b6b3fafe78"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#ga889af512d87a00d696acc0b6b3fafe78"></a><br/></td></tr>
+<tr class="memitem:ga50b1ab3c3b6b0ba7c0cf2128e2024369"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga50b1ab3c3b6b0ba7c0cf2128e2024369"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#ga50b1ab3c3b6b0ba7c0cf2128e2024369"></a><br/></td></tr>
+<tr class="memitem:ga5be91978431b0ed48ea7919807bdcb73"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr class="memdesc:ga5be91978431b0ed48ea7919807bdcb73"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#ga5be91978431b0ed48ea7919807bdcb73"></a><br/></td></tr>
+<tr class="memitem:gab99b3ed6da1ea739eed3f2c04fbb7fa7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga815993ed02f7e9c7b5cb4680f0504d97">stp_node_namefunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:gab99b3ed6da1ea739eed3f2c04fbb7fa7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#gab99b3ed6da1ea739eed3f2c04fbb7fa7"></a><br/></td></tr>
+<tr class="memitem:gab1d2486542b858b44b299cfcdf7d8784"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr class="memdesc:gab1d2486542b858b44b299cfcdf7d8784"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#gab1d2486542b858b44b299cfcdf7d8784"></a><br/></td></tr>
+<tr class="memitem:ga4b32e315d3fd23eabeffcc8d931ea454"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#gae5c7167d6fc957fee0b6aff45bc0b126">stp_node_sortfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list)</td></tr>
+<tr class="memdesc:ga4b32e315d3fd23eabeffcc8d931ea454"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#ga4b32e315d3fd23eabeffcc8d931ea454"></a><br/></td></tr>
+<tr class="memitem:gae726297a82e140672a018e135ffc6a0e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gae726297a82e140672a018e135ffc6a0e">stp_list_item_create</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr class="memdesc:gae726297a82e140672a018e135ffc6a0e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#gae726297a82e140672a018e135ffc6a0e"></a><br/></td></tr>
+<tr class="memitem:ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#ga5e36d4f61e00cb3e4c4a759f5e7e9f4b"></a><br/></td></tr>
+<tr class="memitem:gabaa2a241055402438a0cae6f40cf6a78"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:gabaa2a241055402438a0cae6f40cf6a78"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#gabaa2a241055402438a0cae6f40cf6a78"></a><br/></td></tr>
+<tr class="memitem:ga81ab310caf6432ce1e492eaafdb6c0d7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:ga81ab310caf6432ce1e492eaafdb6c0d7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#ga81ab310caf6432ce1e492eaafdb6c0d7"></a><br/></td></tr>
+<tr class="memitem:gad6f6b303b40fa75f22a86391785178cb"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gad6f6b303b40fa75f22a86391785178cb">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item)</td></tr>
+<tr class="memdesc:gad6f6b303b40fa75f22a86391785178cb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#gad6f6b303b40fa75f22a86391785178cb"></a><br/></td></tr>
+<tr class="memitem:gac1e34edcd47ffdc119cdcaf5ad38e1c4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr class="memdesc:gac1e34edcd47ffdc119cdcaf5ad38e1c4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#gac1e34edcd47ffdc119cdcaf5ad38e1c4"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Generic list functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 5fea529..b043a91 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/module.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,7 +41,11 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -43,25 +53,27 @@
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/module.h File Reference</div>  </div>
-</div>
+<div class="title">module.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Module functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html">stp_module_version</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html">stp_module</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html">stp_module_version</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html">stp_module</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a753a8450e5ac6b73134c12b89533f16e">stp_module_version_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__module.html">stp_module</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#ae1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:a753a8450e5ac6b73134c12b89533f16e"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a753a8450e5ac6b73134c12b89533f16e">stp_module_version_t</a></td></tr>
+<tr class="memitem:ae1e92953e8ffaa00cfbf7fc01e51f36d"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__module.html">stp_module</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#ae1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> { <br/>
+<tr class="memitem:ab3da7c3525c26e1d63d7fe1f95da5a42"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> { <br/>
 &#160;&#160;<a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42adbc54c5b64945a0585177cbfe3cf8e8c">STP_MODULE_CLASS_INVALID</a>, 
 <a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42ac250fc9ff4abf739d975edcbe4694030">STP_MODULE_CLASS_MISC</a>, 
 <a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42ab8bfa675fcede245786ec7eb9a220090">STP_MODULE_CLASS_FAMILY</a>, 
@@ -70,46 +82,45 @@ Enumerations</h2></td></tr>
 &#160;&#160;<a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42a904bbf21de98c76882970ca29aee8841">STP_MODULE_CLASS_DITHER</a>
 <br/>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a00007a419775e60142cefd98b1dd3f2c">stp_module_load</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#acdfae1da0f4df678750f59c9eb6123f4">stp_module_exit</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a38df0c9e639b108f785be84d087923e9">stp_module_open</a> (const char *modulename)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a121493dc584ab4e64059e9594673a756">stp_module_init</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#abef0168688427992adb80588beadcb62">stp_module_close</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *module)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a5eee8809d0134f4e7540bc5552bccd7f">stp_module_get_class</a> (<a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> class)</td></tr>
+<tr class="memitem:a00007a419775e60142cefd98b1dd3f2c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a00007a419775e60142cefd98b1dd3f2c">stp_module_load</a> (void)</td></tr>
+<tr class="memitem:acdfae1da0f4df678750f59c9eb6123f4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#acdfae1da0f4df678750f59c9eb6123f4">stp_module_exit</a> (void)</td></tr>
+<tr class="memitem:a38df0c9e639b108f785be84d087923e9"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a38df0c9e639b108f785be84d087923e9">stp_module_open</a> (const char *modulename)</td></tr>
+<tr class="memitem:a121493dc584ab4e64059e9594673a756"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a121493dc584ab4e64059e9594673a756">stp_module_init</a> (void)</td></tr>
+<tr class="memitem:abef0168688427992adb80588beadcb62"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#abef0168688427992adb80588beadcb62">stp_module_close</a> (<a class="el" href="group__list.html#ga67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *module)</td></tr>
+<tr class="memitem:a5eee8809d0134f4e7540bc5552bccd7f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a5eee8809d0134f4e7540bc5552bccd7f">stp_module_get_class</a> (<a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> class)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Module functions. </p>
 </div><hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ae1e92953e8ffaa00cfbf7fc01e51f36d"></a><!-- doxytag: member="module.h::stp_module_t" ref="ae1e92953e8ffaa00cfbf7fc01e51f36d" args="" -->
+<a class="anchor" id="ae1e92953e8ffaa00cfbf7fc01e51f36d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__module.html">stp_module</a>  <a class="el" href="structstp__module.html">stp_module_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__module.html">stp_module</a>  <a class="el" href="module_8h.html#ae1e92953e8ffaa00cfbf7fc01e51f36d">stp_module_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a753a8450e5ac6b73134c12b89533f16e"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a753a8450e5ac6b73134c12b89533f16e" args="" -->
+<a class="anchor" id="a753a8450e5ac6b73134c12b89533f16e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>  <a class="el" href="structstp__module__version.html">stp_module_version_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__module__version.html">stp_module_version</a>  <a class="el" href="module_8h.html#a753a8450e5ac6b73134c12b89533f16e">stp_module_version_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="ab3da7c3525c26e1d63d7fe1f95da5a42" args="" -->
+<a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -117,18 +128,17 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42adbc54c5b64945a0585177cbfe3cf8e8c"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="ab3da7c3525c26e1d63d7fe1f95da5a42adbc54c5b64945a0585177cbfe3cf8e8c" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42adbc54c5b64945a0585177cbfe3cf8e8c"></a>STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42ac250fc9ff4abf739d975edcbe4694030"></a><!-- doxytag: member="STP_MODULE_CLASS_MISC" ref="ab3da7c3525c26e1d63d7fe1f95da5a42ac250fc9ff4abf739d975edcbe4694030" args="" -->STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42ac250fc9ff4abf739d975edcbe4694030"></a>STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42ab8bfa675fcede245786ec7eb9a220090"></a><!-- doxytag: member="STP_MODULE_CLASS_FAMILY" ref="ab3da7c3525c26e1d63d7fe1f95da5a42ab8bfa675fcede245786ec7eb9a220090" args="" -->STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42ab8bfa675fcede245786ec7eb9a220090"></a>STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42a00077e69aa7fcad42f21bf58d3d8edaa"></a><!-- doxytag: member="STP_MODULE_CLASS_COLOR" ref="ab3da7c3525c26e1d63d7fe1f95da5a42a00077e69aa7fcad42f21bf58d3d8edaa" args="" -->STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42a00077e69aa7fcad42f21bf58d3d8edaa"></a>STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42a904bbf21de98c76882970ca29aee8841"></a><!-- doxytag: member="STP_MODULE_CLASS_DITHER" ref="ab3da7c3525c26e1d63d7fe1f95da5a42a904bbf21de98c76882970ca29aee8841" args="" -->STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab3da7c3525c26e1d63d7fe1f95da5a42a904bbf21de98c76882970ca29aee8841"></a>STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -137,7 +147,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="abef0168688427992adb80588beadcb62"></a><!-- doxytag: member="module.h::stp_module_close" ref="abef0168688427992adb80588beadcb62" args="(stp_list_item_t *module)" -->
+<a class="anchor" id="abef0168688427992adb80588beadcb62"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -149,12 +159,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acdfae1da0f4df678750f59c9eb6123f4"></a><!-- doxytag: member="module.h::stp_module_exit" ref="acdfae1da0f4df678750f59c9eb6123f4" args="(void)" -->
+<a class="anchor" id="acdfae1da0f4df678750f59c9eb6123f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -166,12 +175,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5eee8809d0134f4e7540bc5552bccd7f"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="a5eee8809d0134f4e7540bc5552bccd7f" args="(stp_module_class_t class)" -->
+<a class="anchor" id="a5eee8809d0134f4e7540bc5552bccd7f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -183,12 +191,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a121493dc584ab4e64059e9594673a756"></a><!-- doxytag: member="module.h::stp_module_init" ref="a121493dc584ab4e64059e9594673a756" args="(void)" -->
+<a class="anchor" id="a121493dc584ab4e64059e9594673a756"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -200,12 +207,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a00007a419775e60142cefd98b1dd3f2c"></a><!-- doxytag: member="module.h::stp_module_load" ref="a00007a419775e60142cefd98b1dd3f2c" args="(void)" -->
+<a class="anchor" id="a00007a419775e60142cefd98b1dd3f2c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -217,12 +223,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a38df0c9e639b108f785be84d087923e9"></a><!-- doxytag: member="module.h::stp_module_open" ref="a38df0c9e639b108f785be84d087923e9" args="(const char *modulename)" -->
+<a class="anchor" id="a38df0c9e639b108f785be84d087923e9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -234,14 +239,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index ae4cfe7..16c177b 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Modules</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,30 +35,35 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Modules</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here is a list of all modules:</div><ul>
-<li><a class="el" href="group__array.html">array</a></li>
-<li><a class="el" href="group__color.html">color</a></li>
-<li><a class="el" href="group__curve.html">curve</a></li>
-<li><a class="el" href="group__intl__internal.html">intl-internal</a></li>
-<li><a class="el" href="group__intl.html">intl</a></li>
-<li><a class="el" href="group__version.html">version</a></li>
-<li><a class="el" href="group__image.html">image</a></li>
-<li><a class="el" href="group__list.html">list</a></li>
-<li><a class="el" href="group__papersize.html">papersize</a></li>
-<li><a class="el" href="group__printer.html">printer</a></li>
-<li><a class="el" href="group__sequence.html">sequence</a></li>
-<li><a class="el" href="group__util.html">util</a></li>
-<li><a class="el" href="group__vars.html">vars</a></li>
-</ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+<div class="textblock">Here is a list of all modules:</div><div class="directory">
+<table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__array.html" target="_self">array</a></td><td class="desc">The array is a simple "two-dimensional array of numbers" data structure</td></tr>
+<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__color.html" target="_self">color</a></td><td class="desc">The color data type is responsible for providing colour conversion features</td></tr>
+<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__curve.html" target="_self">curve</a></td><td class="desc">The curve type models a linear, spline or gamma curve</td></tr>
+<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__intl__internal.html" target="_self">intl-internal</a></td><td class="desc">Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language</td></tr>
+<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__intl.html" target="_self">intl</a></td><td class="desc">Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language</td></tr>
+<tr id="row_5_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__version.html" target="_self">version</a></td><td class="desc">Version information</td></tr>
+<tr id="row_6_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__image.html" target="_self">image</a></td><td class="desc">The image type is an abstract data type for interfacing with the image creation program</td></tr>
+<tr id="row_7_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__list.html" target="_self">list</a></td><td class="desc">The list data type implements a fast generic doubly-linked list</td></tr>
+<tr id="row_8_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__papersize.html" target="_self">papersize</a></td><td class="desc">The papersize describes the dimensions of a paper</td></tr>
+<tr id="row_9_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__printer.html" target="_self">printer</a></td><td class="desc">The printer type represents a printer model</td></tr>
+<tr id="row_10_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__sequence.html" target="_self">sequence</a></td><td class="desc">The sequence is a simple "vector of numbers" data structure</td></tr>
+<tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="group__util.html" target="_self">util</a></td><td class="desc">Utility functions</td></tr>
+<tr id="row_12_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a class="el" href="group__vars.html" target="_self">vars</a></td><td class="desc">The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc</td></tr>
+</table>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index e9b171b..c16be12 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/mxml.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,17 +41,21 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/mxml.h File Reference</div>  </div>
-</div>
+<div class="title">mxml.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Mini-XML XML parsing functions.  
@@ -56,40 +66,43 @@
 <code>#include &lt;ctype.h&gt;</code><br/>
 <code>#include &lt;errno.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">union &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a0958b60267481400b1037902e060027f">STP_MXML_WRAP</a>&#160;&#160;&#160;70</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af14eeab60ef7298e7fbb04f9f80ec81f">STP_MXML_TAB</a>&#160;&#160;&#160;8</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ae7115822f446a7b9bde7ce872bd73d83">STP_MXML_NO_CALLBACK</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4d9598080b3b0381f5c94518a885e867">STP_MXML_NO_PARENT</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7c552ec507bb896f89f002de30a21378">STP_MXML_DESCEND</a>&#160;&#160;&#160;1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#adf7d31182924f15ecbeae9b6c0f35ca2">STP_MXML_NO_DESCEND</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#abff818057f8c875f4152aa49ed5c046b">STP_MXML_DESCEND_FIRST</a>&#160;&#160;&#160;-1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a60a753631e81e819a2dad91834b0a7f5">STP_MXML_WS_BEFORE_OPEN</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4e7558f3b8bc4d9b3e39c57108b11cea">STP_MXML_WS_AFTER_OPEN</a>&#160;&#160;&#160;1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aa8d71b9879129c853422282b2b728131">STP_MXML_WS_BEFORE_CLOSE</a>&#160;&#160;&#160;2</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a010da4f7fffd4a3b3eec433031d466f9">STP_MXML_WS_AFTER_CLOSE</a>&#160;&#160;&#160;3</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1920c86773f4394ebd778b6e6b8f1aba">STP_MXML_ADD_BEFORE</a>&#160;&#160;&#160;0</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aa046bb0b67f278cb7ffdd0be5336b4f3">STP_MXML_ADD_AFTER</a>&#160;&#160;&#160;1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a5c364d2523fb6f7a133df3fdfd7f44d5">STP_MXML_ADD_TO_PARENT</a>&#160;&#160;&#160;NULL</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">union &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a0958b60267481400b1037902e060027f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a0958b60267481400b1037902e060027f">STP_MXML_WRAP</a>&#160;&#160;&#160;70	/* Wrap XML output at this column position */</td></tr>
+<tr class="memitem:af14eeab60ef7298e7fbb04f9f80ec81f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af14eeab60ef7298e7fbb04f9f80ec81f">STP_MXML_TAB</a>&#160;&#160;&#160;8	/* Tabs every N columns */</td></tr>
+<tr class="memitem:ae7115822f446a7b9bde7ce872bd73d83"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ae7115822f446a7b9bde7ce872bd73d83">STP_MXML_NO_CALLBACK</a>&#160;&#160;&#160;0	/* Don't use a type callback */</td></tr>
+<tr class="memitem:a4d9598080b3b0381f5c94518a885e867"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4d9598080b3b0381f5c94518a885e867">STP_MXML_NO_PARENT</a>&#160;&#160;&#160;0	/* No parent for the node */</td></tr>
+<tr class="memitem:a7c552ec507bb896f89f002de30a21378"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7c552ec507bb896f89f002de30a21378">STP_MXML_DESCEND</a>&#160;&#160;&#160;1	/* Descend when finding/walking */</td></tr>
+<tr class="memitem:adf7d31182924f15ecbeae9b6c0f35ca2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#adf7d31182924f15ecbeae9b6c0f35ca2">STP_MXML_NO_DESCEND</a>&#160;&#160;&#160;0	/* Don't descend when finding/walking */</td></tr>
+<tr class="memitem:abff818057f8c875f4152aa49ed5c046b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#abff818057f8c875f4152aa49ed5c046b">STP_MXML_DESCEND_FIRST</a>&#160;&#160;&#160;-1	/* Descend for first find */</td></tr>
+<tr class="memitem:a60a753631e81e819a2dad91834b0a7f5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a60a753631e81e819a2dad91834b0a7f5">STP_MXML_WS_BEFORE_OPEN</a>&#160;&#160;&#160;0	/* Callback for before open tag */</td></tr>
+<tr class="memitem:a4e7558f3b8bc4d9b3e39c57108b11cea"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4e7558f3b8bc4d9b3e39c57108b11cea">STP_MXML_WS_AFTER_OPEN</a>&#160;&#160;&#160;1	/* Callback for after open tag */</td></tr>
+<tr class="memitem:aa8d71b9879129c853422282b2b728131"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aa8d71b9879129c853422282b2b728131">STP_MXML_WS_BEFORE_CLOSE</a>&#160;&#160;&#160;2	/* Callback for before close tag */</td></tr>
+<tr class="memitem:a010da4f7fffd4a3b3eec433031d466f9"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a010da4f7fffd4a3b3eec433031d466f9">STP_MXML_WS_AFTER_CLOSE</a>&#160;&#160;&#160;3	/* Callback for after close tag */</td></tr>
+<tr class="memitem:a1920c86773f4394ebd778b6e6b8f1aba"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1920c86773f4394ebd778b6e6b8f1aba">STP_MXML_ADD_BEFORE</a>&#160;&#160;&#160;0	/* Add node before specified node */</td></tr>
+<tr class="memitem:aa046bb0b67f278cb7ffdd0be5336b4f3"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aa046bb0b67f278cb7ffdd0be5336b4f3">STP_MXML_ADD_AFTER</a>&#160;&#160;&#160;1	/* Add node after specified node */</td></tr>
+<tr class="memitem:a5c364d2523fb6f7a133df3fdfd7f44d5"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a5c364d2523fb6f7a133df3fdfd7f44d5">STP_MXML_ADD_TO_PARENT</a>&#160;&#160;&#160;NULL	/* Add node relative to parent */</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:a3ff7086c4e8f1557e81c32a61420017e"><td class="memItemLeft" align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td></tr>
+<tr class="memitem:ab271ad8c2bb8d7e6b4b453ffe5589564"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a></td></tr>
+<tr class="memitem:a70e20b752807f49a56b56d80ee470b47"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a></td></tr>
+<tr class="memitem:ab9c0236a2d70c3bcb210a9f6fadf00a3"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td></tr>
+<tr class="memitem:a9a2e2ffccac3c73524e76f3e816d35bf"><td class="memItemLeft" align="right" valign="top">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a></td></tr>
+<tr class="memitem:a8fb80a78e3ac8d8aa9eb14c35326bd82"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a> { <br/>
+<tr class="memitem:af8b58610b5fb382d0f075cb3bcf3b6ba"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a> { <br/>
 &#160;&#160;<a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6baa10846b9327c59bbfee28dd522a0c258e">STP_MXML_ELEMENT</a>, 
 <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6baaeb129c9841502a2f3d095751f4e21a79">STP_MXML_INTEGER</a>, 
 <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6baa4ebe16a2dc2aac2531e09b56051eb47a">STP_MXML_OPAQUE</a>, 
@@ -98,268 +111,251 @@ Enumerations</h2></td></tr>
 &#160;&#160;<a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6baaccc874638f0a0d375e1066d8c82c8be9">STP_MXML_TEXT</a>
 <br/>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab1227e00e25c3b91220a93ff65a978be">stp_mxmlAdd</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int where, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *child, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a72999dc22e850ea456b336f3e802be28">stp_mxmlDelete</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ac60696919428e3b2e34ee8e2eb110962">stp_mxmlElementGetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a6cac6d18e5cddb0847268c46a8d4dbfa">stp_mxmlElementSetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a65c27e9c331c88b3f010f040591cc401">stp_mxmlFindElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a88f8bf556fb254728ab23ce931ee9224">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7fbf0906a36fe755779077efd7126704">stp_mxmlLoadFromFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *file, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4a2465973559fe7815386d0d59d9a8ee">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9430b1f2b1d6b6060d9e358309de3772">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#acefddfa295df71e8617b607d207980eb">stp_mxmlNewInteger</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int integer)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1897cb8faa2141879d45d9fec0463119">stp_mxmlNewOpaque</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1b4b2ee1a0c75a31981d70e35398d6dd">stp_mxmlNewReal</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, double real)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a05bd9944cadbef034730a53ca47c9f6a">stp_mxmlNewText</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7e0322b42cbe0398de7bbe38c4b0a9e6">stp_mxmlRemove</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ade7e653595e3ea46d9f3b5545d0a10ea">stp_mxmlSaveAllocString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1038b1003e9a3fbd8396cdbe989a64c8">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aee3de9dc6a961f11238960d1dd1ea5c3">stp_mxmlSaveToFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a054f6b6df45f2e0072a61c1a438d3ebe">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af478d00f31cfae58314bd6f40531923b">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#acc0525bdade1c9e0e83c154592fe815c">stp_mxmlWalkPrev</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr class="memitem:ab1227e00e25c3b91220a93ff65a978be"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ab1227e00e25c3b91220a93ff65a978be">stp_mxmlAdd</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, int where, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *child, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node)</td></tr>
+<tr class="memitem:a72999dc22e850ea456b336f3e802be28"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a72999dc22e850ea456b336f3e802be28">stp_mxmlDelete</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node)</td></tr>
+<tr class="memitem:ac60696919428e3b2e34ee8e2eb110962"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ac60696919428e3b2e34ee8e2eb110962">stp_mxmlElementGetAttr</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, const char *name)</td></tr>
+<tr class="memitem:a6cac6d18e5cddb0847268c46a8d4dbfa"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a6cac6d18e5cddb0847268c46a8d4dbfa">stp_mxmlElementSetAttr</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
+<tr class="memitem:a65c27e9c331c88b3f010f040591cc401"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a65c27e9c331c88b3f010f040591cc401">stp_mxmlFindElement</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
+<tr class="memitem:a88f8bf556fb254728ab23ce931ee9224"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a88f8bf556fb254728ab23ce931ee9224">stp_mxmlLoadFile</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *))</td></tr>
+<tr class="memitem:a7fbf0906a36fe755779077efd7126704"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7fbf0906a36fe755779077efd7126704">stp_mxmlLoadFromFile</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, const char *file, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *))</td></tr>
+<tr class="memitem:a4a2465973559fe7815386d0d59d9a8ee"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4a2465973559fe7815386d0d59d9a8ee">stp_mxmlLoadString</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *))</td></tr>
+<tr class="memitem:a9430b1f2b1d6b6060d9e358309de3772"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9430b1f2b1d6b6060d9e358309de3772">stp_mxmlNewElement</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
+<tr class="memitem:acefddfa295df71e8617b607d207980eb"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#acefddfa295df71e8617b607d207980eb">stp_mxmlNewInteger</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, int integer)</td></tr>
+<tr class="memitem:a1897cb8faa2141879d45d9fec0463119"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1897cb8faa2141879d45d9fec0463119">stp_mxmlNewOpaque</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
+<tr class="memitem:a1b4b2ee1a0c75a31981d70e35398d6dd"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1b4b2ee1a0c75a31981d70e35398d6dd">stp_mxmlNewReal</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, double real)</td></tr>
+<tr class="memitem:a05bd9944cadbef034730a53ca47c9f6a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a05bd9944cadbef034730a53ca47c9f6a">stp_mxmlNewText</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
+<tr class="memitem:a7e0322b42cbe0398de7bbe38c4b0a9e6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7e0322b42cbe0398de7bbe38c4b0a9e6">stp_mxmlRemove</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node)</td></tr>
+<tr class="memitem:ade7e653595e3ea46d9f3b5545d0a10ea"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#ade7e653595e3ea46d9f3b5545d0a10ea">stp_mxmlSaveAllocString</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int))</td></tr>
+<tr class="memitem:a1038b1003e9a3fbd8396cdbe989a64c8"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1038b1003e9a3fbd8396cdbe989a64c8">stp_mxmlSaveFile</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int))</td></tr>
+<tr class="memitem:aee3de9dc6a961f11238960d1dd1ea5c3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aee3de9dc6a961f11238960d1dd1ea5c3">stp_mxmlSaveToFile</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, const char *fp, int(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int))</td></tr>
+<tr class="memitem:a054f6b6df45f2e0072a61c1a438d3ebe"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a054f6b6df45f2e0072a61c1a438d3ebe">stp_mxmlSaveString</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int))</td></tr>
+<tr class="memitem:af478d00f31cfae58314bd6f40531923b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#af478d00f31cfae58314bd6f40531923b">stp_mxmlWalkNext</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr class="memitem:acc0525bdade1c9e0e83c154592fe815c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#acc0525bdade1c9e0e83c154592fe815c">stp_mxmlWalkPrev</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *top, int descend)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Mini-XML XML parsing functions. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="aa046bb0b67f278cb7ffdd0be5336b4f3"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="aa046bb0b67f278cb7ffdd0be5336b4f3" args="" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="aa046bb0b67f278cb7ffdd0be5336b4f3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_ADD_AFTER&#160;&#160;&#160;1</td>
+          <td class="memname">#define STP_MXML_ADD_AFTER&#160;&#160;&#160;1	/* Add node after specified node */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1920c86773f4394ebd778b6e6b8f1aba"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="a1920c86773f4394ebd778b6e6b8f1aba" args="" -->
+<a class="anchor" id="a1920c86773f4394ebd778b6e6b8f1aba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_ADD_BEFORE&#160;&#160;&#160;0</td>
+          <td class="memname">#define STP_MXML_ADD_BEFORE&#160;&#160;&#160;0	/* Add node before specified node */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5c364d2523fb6f7a133df3fdfd7f44d5"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="a5c364d2523fb6f7a133df3fdfd7f44d5" args="" -->
+<a class="anchor" id="a5c364d2523fb6f7a133df3fdfd7f44d5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_ADD_TO_PARENT&#160;&#160;&#160;NULL</td>
+          <td class="memname">#define STP_MXML_ADD_TO_PARENT&#160;&#160;&#160;NULL	/* Add node relative to parent */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7c552ec507bb896f89f002de30a21378"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="a7c552ec507bb896f89f002de30a21378" args="" -->
+<a class="anchor" id="a7c552ec507bb896f89f002de30a21378"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_DESCEND&#160;&#160;&#160;1</td>
+          <td class="memname">#define STP_MXML_DESCEND&#160;&#160;&#160;1	/* Descend when finding/walking */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="abff818057f8c875f4152aa49ed5c046b"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="abff818057f8c875f4152aa49ed5c046b" args="" -->
+<a class="anchor" id="abff818057f8c875f4152aa49ed5c046b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_DESCEND_FIRST&#160;&#160;&#160;-1</td>
+          <td class="memname">#define STP_MXML_DESCEND_FIRST&#160;&#160;&#160;-1	/* Descend for first find */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae7115822f446a7b9bde7ce872bd73d83"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="ae7115822f446a7b9bde7ce872bd73d83" args="" -->
+<a class="anchor" id="ae7115822f446a7b9bde7ce872bd73d83"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_NO_CALLBACK&#160;&#160;&#160;0</td>
+          <td class="memname">#define STP_MXML_NO_CALLBACK&#160;&#160;&#160;0	/* Don't use a type callback */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="adf7d31182924f15ecbeae9b6c0f35ca2"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="adf7d31182924f15ecbeae9b6c0f35ca2" args="" -->
+<a class="anchor" id="adf7d31182924f15ecbeae9b6c0f35ca2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_NO_DESCEND&#160;&#160;&#160;0</td>
+          <td class="memname">#define STP_MXML_NO_DESCEND&#160;&#160;&#160;0	/* Don't descend when finding/walking */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4d9598080b3b0381f5c94518a885e867"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="a4d9598080b3b0381f5c94518a885e867" args="" -->
+<a class="anchor" id="a4d9598080b3b0381f5c94518a885e867"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_NO_PARENT&#160;&#160;&#160;0</td>
+          <td class="memname">#define STP_MXML_NO_PARENT&#160;&#160;&#160;0	/* No parent for the node */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af14eeab60ef7298e7fbb04f9f80ec81f"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="af14eeab60ef7298e7fbb04f9f80ec81f" args="" -->
+<a class="anchor" id="af14eeab60ef7298e7fbb04f9f80ec81f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_TAB&#160;&#160;&#160;8</td>
+          <td class="memname">#define STP_MXML_TAB&#160;&#160;&#160;8	/* Tabs every N columns */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0958b60267481400b1037902e060027f"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="a0958b60267481400b1037902e060027f" args="" -->
+<a class="anchor" id="a0958b60267481400b1037902e060027f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_WRAP&#160;&#160;&#160;70</td>
+          <td class="memname">#define STP_MXML_WRAP&#160;&#160;&#160;70	/* Wrap XML output at this column position */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a010da4f7fffd4a3b3eec433031d466f9"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="a010da4f7fffd4a3b3eec433031d466f9" args="" -->
+<a class="anchor" id="a010da4f7fffd4a3b3eec433031d466f9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_WS_AFTER_CLOSE&#160;&#160;&#160;3</td>
+          <td class="memname">#define STP_MXML_WS_AFTER_CLOSE&#160;&#160;&#160;3	/* Callback for after close tag */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4e7558f3b8bc4d9b3e39c57108b11cea"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="a4e7558f3b8bc4d9b3e39c57108b11cea" args="" -->
+<a class="anchor" id="a4e7558f3b8bc4d9b3e39c57108b11cea"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_WS_AFTER_OPEN&#160;&#160;&#160;1</td>
+          <td class="memname">#define STP_MXML_WS_AFTER_OPEN&#160;&#160;&#160;1	/* Callback for after open tag */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa8d71b9879129c853422282b2b728131"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="aa8d71b9879129c853422282b2b728131" args="" -->
+<a class="anchor" id="aa8d71b9879129c853422282b2b728131"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_WS_BEFORE_CLOSE&#160;&#160;&#160;2</td>
+          <td class="memname">#define STP_MXML_WS_BEFORE_CLOSE&#160;&#160;&#160;2	/* Callback for before close tag */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a60a753631e81e819a2dad91834b0a7f5"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="a60a753631e81e819a2dad91834b0a7f5" args="" -->
+<a class="anchor" id="a60a753631e81e819a2dad91834b0a7f5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MXML_WS_BEFORE_OPEN&#160;&#160;&#160;0</td>
+          <td class="memname">#define STP_MXML_WS_BEFORE_OPEN&#160;&#160;&#160;0	/* Callback for before open tag */</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="ab271ad8c2bb8d7e6b4b453ffe5589564"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="ab271ad8c2bb8d7e6b4b453ffe5589564" args="" -->
+<a class="anchor" id="ab271ad8c2bb8d7e6b4b453ffe5589564"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>  <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>  <a class="el" href="mxml_8h.html#ab271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a70e20b752807f49a56b56d80ee470b47"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="a70e20b752807f49a56b56d80ee470b47" args="" -->
+<a class="anchor" id="a70e20b752807f49a56b56d80ee470b47"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>  <a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>  <a class="el" href="mxml_8h.html#a70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8fb80a78e3ac8d8aa9eb14c35326bd82"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="a8fb80a78e3ac8d8aa9eb14c35326bd82" args="" -->
+<a class="anchor" id="a8fb80a78e3ac8d8aa9eb14c35326bd82"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a> <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a> <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab9c0236a2d70c3bcb210a9f6fadf00a3"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="ab9c0236a2d70c3bcb210a9f6fadf00a3" args="" -->
+<a class="anchor" id="ab9c0236a2d70c3bcb210a9f6fadf00a3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>  <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>  <a class="el" href="mxml_8h.html#ab9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3ff7086c4e8f1557e81c32a61420017e"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="a3ff7086c4e8f1557e81c32a61420017e" args="" -->
+<a class="anchor" id="a3ff7086c4e8f1557e81c32a61420017e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -367,26 +363,24 @@ Functions</h2></td></tr>
           <td class="memname">typedef enum <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9a2e2ffccac3c73524e76f3e816d35bf"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="a9a2e2ffccac3c73524e76f3e816d35bf" args="" -->
+<a class="anchor" id="a9a2e2ffccac3c73524e76f3e816d35bf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>  <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a></td>
+          <td class="memname">typedef union <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>  <a class="el" href="mxml_8h.html#a9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6ba"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="af8b58610b5fb382d0f075cb3bcf3b6ba" args="" -->
+<a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6ba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -394,18 +388,17 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="mxml_8h.html#af8b58610b5fb382d0f075cb3bcf3b6ba">stp_mxml_type_e</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa10846b9327c59bbfee28dd522a0c258e"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="af8b58610b5fb382d0f075cb3bcf3b6baa10846b9327c59bbfee28dd522a0c258e" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa10846b9327c59bbfee28dd522a0c258e"></a>STP_MXML_ELEMENT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baaeb129c9841502a2f3d095751f4e21a79"></a><!-- doxytag: member="STP_MXML_INTEGER" ref="af8b58610b5fb382d0f075cb3bcf3b6baaeb129c9841502a2f3d095751f4e21a79" args="" -->STP_MXML_INTEGER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baaeb129c9841502a2f3d095751f4e21a79"></a>STP_MXML_INTEGER</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa4ebe16a2dc2aac2531e09b56051eb47a"></a><!-- doxytag: member="STP_MXML_OPAQUE" ref="af8b58610b5fb382d0f075cb3bcf3b6baa4ebe16a2dc2aac2531e09b56051eb47a" args="" -->STP_MXML_OPAQUE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa4ebe16a2dc2aac2531e09b56051eb47a"></a>STP_MXML_OPAQUE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa9411f902a8e7e839252b7a440ef53790"></a><!-- doxytag: member="STP_MXML_REAL" ref="af8b58610b5fb382d0f075cb3bcf3b6baa9411f902a8e7e839252b7a440ef53790" args="" -->STP_MXML_REAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baa9411f902a8e7e839252b7a440ef53790"></a>STP_MXML_REAL</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baaccc874638f0a0d375e1066d8c82c8be9"></a><!-- doxytag: member="STP_MXML_TEXT" ref="af8b58610b5fb382d0f075cb3bcf3b6baaccc874638f0a0d375e1066d8c82c8be9" args="" -->STP_MXML_TEXT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="af8b58610b5fb382d0f075cb3bcf3b6baaccc874638f0a0d375e1066d8c82c8be9"></a>STP_MXML_TEXT</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -414,14 +407,14 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ab1227e00e25c3b91220a93ff65a978be"></a><!-- doxytag: member="mxml.h::stp_mxmlAdd" ref="ab1227e00e25c3b91220a93ff65a978be" args="(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)" -->
+<a class="anchor" id="ab1227e00e25c3b91220a93ff65a978be"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_mxmlAdd </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -433,13 +426,13 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>child</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>&#160;</td>
         </tr>
         <tr>
@@ -448,36 +441,34 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a72999dc22e850ea456b336f3e802be28"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="a72999dc22e850ea456b336f3e802be28" args="(stp_mxml_node_t *node)" -->
+<a class="anchor" id="a72999dc22e850ea456b336f3e802be28"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_mxmlDelete </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac60696919428e3b2e34ee8e2eb110962"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="ac60696919428e3b2e34ee8e2eb110962" args="(stp_mxml_node_t *node, const char *name)" -->
+<a class="anchor" id="ac60696919428e3b2e34ee8e2eb110962"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">const char* stp_mxmlElementGetAttr </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
@@ -492,19 +483,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6cac6d18e5cddb0847268c46a8d4dbfa"></a><!-- doxytag: member="mxml.h::stp_mxmlElementSetAttr" ref="a6cac6d18e5cddb0847268c46a8d4dbfa" args="(stp_mxml_node_t *node, const char *name, const char *value)" -->
+<a class="anchor" id="a6cac6d18e5cddb0847268c46a8d4dbfa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_mxmlElementSetAttr </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
@@ -525,25 +515,24 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a65c27e9c331c88b3f010f040591cc401"></a><!-- doxytag: member="mxml.h::stp_mxmlFindElement" ref="a65c27e9c331c88b3f010f040591cc401" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)" -->
+<a class="anchor" id="a65c27e9c331c88b3f010f040591cc401"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlFindElement </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlFindElement </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -576,19 +565,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a88f8bf556fb254728ab23ce931ee9224"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFile" ref="a88f8bf556fb254728ab23ce931ee9224" args="(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<a class="anchor" id="a88f8bf556fb254728ab23ce931ee9224"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadFile </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlLoadFile </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -600,7 +588,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -609,19 +597,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7fbf0906a36fe755779077efd7126704"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFromFile" ref="a7fbf0906a36fe755779077efd7126704" args="(stp_mxml_node_t *top, const char *file, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<a class="anchor" id="a7fbf0906a36fe755779077efd7126704"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadFromFile </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlLoadFromFile </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -633,7 +620,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -642,19 +629,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4a2465973559fe7815386d0d59d9a8ee"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="a4a2465973559fe7815386d0d59d9a8ee" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" -->
+<a class="anchor" id="a4a2465973559fe7815386d0d59d9a8ee"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlLoadString </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlLoadString </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -666,7 +652,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -675,19 +661,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9430b1f2b1d6b6060d9e358309de3772"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="a9430b1f2b1d6b6060d9e358309de3772" args="(stp_mxml_node_t *parent, const char *name)" -->
+<a class="anchor" id="a9430b1f2b1d6b6060d9e358309de3772"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewElement </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlNewElement </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -702,19 +687,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acefddfa295df71e8617b607d207980eb"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="acefddfa295df71e8617b607d207980eb" args="(stp_mxml_node_t *parent, int integer)" -->
+<a class="anchor" id="acefddfa295df71e8617b607d207980eb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewInteger </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlNewInteger </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -729,19 +713,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1897cb8faa2141879d45d9fec0463119"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="a1897cb8faa2141879d45d9fec0463119" args="(stp_mxml_node_t *parent, const char *opaque)" -->
+<a class="anchor" id="a1897cb8faa2141879d45d9fec0463119"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewOpaque </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlNewOpaque </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -756,19 +739,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1b4b2ee1a0c75a31981d70e35398d6dd"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="a1b4b2ee1a0c75a31981d70e35398d6dd" args="(stp_mxml_node_t *parent, double real)" -->
+<a class="anchor" id="a1b4b2ee1a0c75a31981d70e35398d6dd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewReal </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlNewReal </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -783,19 +765,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a05bd9944cadbef034730a53ca47c9f6a"></a><!-- doxytag: member="mxml.h::stp_mxmlNewText" ref="a05bd9944cadbef034730a53ca47c9f6a" args="(stp_mxml_node_t *parent, int whitespace, const char *string)" -->
+<a class="anchor" id="a05bd9944cadbef034730a53ca47c9f6a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlNewText </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlNewText </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>parent</em>, </td>
         </tr>
         <tr>
@@ -816,42 +797,40 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7e0322b42cbe0398de7bbe38c4b0a9e6"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="a7e0322b42cbe0398de7bbe38c4b0a9e6" args="(stp_mxml_node_t *node)" -->
+<a class="anchor" id="a7e0322b42cbe0398de7bbe38c4b0a9e6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_mxmlRemove </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ade7e653595e3ea46d9f3b5545d0a10ea"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveAllocString" ref="ade7e653595e3ea46d9f3b5545d0a10ea" args="(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))" -->
+<a class="anchor" id="ade7e653595e3ea46d9f3b5545d0a10ea"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">char* stp_mxmlSaveAllocString </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&#160;</td>
+          <td class="paramtype">int(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -860,19 +839,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1038b1003e9a3fbd8396cdbe989a64c8"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveFile" ref="a1038b1003e9a3fbd8396cdbe989a64c8" args="(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))" -->
+<a class="anchor" id="a1038b1003e9a3fbd8396cdbe989a64c8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_mxmlSaveFile </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
@@ -884,7 +862,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&#160;</td>
+          <td class="paramtype">int(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -893,19 +871,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a054f6b6df45f2e0072a61c1a438d3ebe"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveString" ref="a054f6b6df45f2e0072a61c1a438d3ebe" args="(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))" -->
+<a class="anchor" id="a054f6b6df45f2e0072a61c1a438d3ebe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_mxmlSaveString </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
@@ -923,7 +900,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&#160;</td>
+          <td class="paramtype">int(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -932,19 +909,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aee3de9dc6a961f11238960d1dd1ea5c3"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveToFile" ref="aee3de9dc6a961f11238960d1dd1ea5c3" args="(stp_mxml_node_t *node, const char *fp, int(*cb)(stp_mxml_node_t *, int))" -->
+<a class="anchor" id="aee3de9dc6a961f11238960d1dd1ea5c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">int stp_mxmlSaveToFile </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
@@ -956,7 +932,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">int(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int)&#160;</td>
+          <td class="paramtype">int(*)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *, int)&#160;</td>
           <td class="paramname"><em>cb</em>&#160;</td>
         </tr>
         <tr>
@@ -965,25 +941,24 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af478d00f31cfae58314bd6f40531923b"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="af478d00f31cfae58314bd6f40531923b" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" -->
+<a class="anchor" id="af478d00f31cfae58314bd6f40531923b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkNext </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlWalkNext </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -998,25 +973,24 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acc0525bdade1c9e0e83c154592fe815c"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkPrev" ref="acc0525bdade1c9e0e83c154592fe815c" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" -->
+<a class="anchor" id="acc0525bdade1c9e0e83c154592fe815c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_mxmlWalkPrev </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxmlWalkPrev </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>node</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>top</em>, </td>
         </tr>
         <tr>
@@ -1031,14 +1005,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/nav_f.png b/doc/gutenprint/html/nav_f.png
index 1b07a16..72a58a5 100644
--- a/doc/gutenprint/html/nav_f.png
+++ b/doc/gutenprint/html/nav_f.png
diff --git a/doc/gutenprint/html/nav_g.png b/doc/gutenprint/html/nav_g.png
new file mode 100644
index 0000000..2093a23
--- /dev/null
+++ b/doc/gutenprint/html/nav_g.png
diff --git a/doc/gutenprint/html/nav_h.png b/doc/gutenprint/html/nav_h.png
index 01f5fa6..33389b1 100644
--- a/doc/gutenprint/html/nav_h.png
+++ b/doc/gutenprint/html/nav_h.png
diff --git a/doc/gutenprint/html/open.png b/doc/gutenprint/html/open.png
index 7b35d2c..30f75c7 100644
--- a/doc/gutenprint/html/open.png
+++ b/doc/gutenprint/html/open.png
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index 0922e8c..b8e6f1d 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: Related Pages</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -29,19 +35,23 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Related Pages</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here is a list of all related documentation pages:</div><ul>
-<li><a class="el" href="deprecated.html">Deprecated List</a>
-</li>
-</ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+<div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
+<table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><a class="el" href="deprecated.html" target="_self">Deprecated List</a></td><td class="desc"></td></tr>
+</table>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index 7b848d8..6774bb8 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/paper.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,56 +41,65 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/paper.h File Reference</div>  </div>
-</div>
+<div class="title">paper.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Paper size functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<tr class="memitem:ga72e4619e373e38dc02dc452813b7b958"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958adb394159413ade42022509cd3280fef3">PAPERSIZE_ENGLISH_STANDARD</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a6d5868bc6707f8801ce4d584428c2ae8">PAPERSIZE_METRIC_STANDARD</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a00b7e9a18afc172872861b26dbcc8cb8">PAPERSIZE_ENGLISH_EXTENDED</a>, 
 <a class="el" href="group__papersize.html#gga72e4619e373e38dc02dc452813b7b958a62e2906a87fa4bcf32913943fd5b225a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> { <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f">PAPERSIZE_TYPE_STANDARD</a> =  0, 
+<tr class="memdesc:ga72e4619e373e38dc02dc452813b7b958"><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">More...</a><br/></td></tr>
+<tr class="memitem:ga31255c4eebfaaf5cd319e5638a6a3069"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> { <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a99d27f84f91d583c3e465e56c83fff2f">PAPERSIZE_TYPE_STANDARD</a> =  0, 
 <a class="el" href="group__papersize.html#gga31255c4eebfaaf5cd319e5638a6a3069a660290248a563e7590202afd3ba68fb4">PAPERSIZE_TYPE_ENVELOPE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3"></a><br/></td></tr>
+<tr class="memitem:ga84fd0bad33b134217f54fa8c1e6c8b99"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99">stp_known_papersizes</a> (void)</td></tr>
+<tr class="memdesc:ga84fd0bad33b134217f54fa8c1e6c8b99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#ga84fd0bad33b134217f54fa8c1e6c8b99"></a><br/></td></tr>
+<tr class="memitem:ga60f3dee8f26cac05d8d6fcaff1e39630"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr class="memdesc:ga60f3dee8f26cac05d8d6fcaff1e39630"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#ga60f3dee8f26cac05d8d6fcaff1e39630"></a><br/></td></tr>
+<tr class="memitem:ga1484a5e75a2b2921bbe0c9e17deb0b77"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr class="memdesc:ga1484a5e75a2b2921bbe0c9e17deb0b77"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#ga1484a5e75a2b2921bbe0c9e17deb0b77"></a><br/></td></tr>
+<tr class="memitem:ga879cd515ca2eb5fd8cd76ae62f4bfa4e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e">stp_get_papersize_by_size_exact</a> (int length, int width)</td></tr>
+<tr class="memdesc:ga879cd515ca2eb5fd8cd76ae62f4bfa4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by size if an exact match is found.  <a href="group__papersize.html#ga879cd515ca2eb5fd8cd76ae62f4bfa4e"></a><br/></td></tr>
+<tr class="memitem:gab2e9f694a3b90aeaaa14d6af3b5fe75a"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:gab2e9f694a3b90aeaaa14d6af3b5fe75a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#gab2e9f694a3b90aeaaa14d6af3b5fe75a"></a><br/></td></tr>
+<tr class="memitem:ga33c0be56646361b1ce85a9d338336dd3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr class="memdesc:ga33c0be56646361b1ce85a9d338336dd3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default paper dimensions for the current configuration.  <a href="group__papersize.html#ga33c0be56646361b1ce85a9d338336dd3"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Paper size functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 153f622..04ebf0f 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/path.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,30 +41,34 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/path.h File Reference</div>  </div>
-</div>
+<div class="title">path.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Simple directory path functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#ab1754e7b09717741f4bdc7a4b973d4a5">stp_path_search</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#af08851d96a1197c5ce39f7dc812cef3f">stp_path_split</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *path)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a26017fec6cd9c9e44bc58b4cac9b9c35">stpi_data_path</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a037cae76d9cb1916ec7fa711a127fe54">stpi_list_files_on_data_path</a> (const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a17eca69c41eb6cca959ab47e3c1a3aa2">stpi_path_merge</a> (const char *path, const char *file)</td></tr>
+<tr class="memitem:ab1754e7b09717741f4bdc7a4b973d4a5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#ab1754e7b09717741f4bdc7a4b973d4a5">stp_path_search</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
+<tr class="memitem:af08851d96a1197c5ce39f7dc812cef3f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#af08851d96a1197c5ce39f7dc812cef3f">stp_path_split</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *list, const char *path)</td></tr>
+<tr class="memitem:a26017fec6cd9c9e44bc58b4cac9b9c35"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a26017fec6cd9c9e44bc58b4cac9b9c35">stpi_data_path</a> (void)</td></tr>
+<tr class="memitem:a037cae76d9cb1916ec7fa711a127fe54"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a037cae76d9cb1916ec7fa711a127fe54">stpi_list_files_on_data_path</a> (const char *name)</td></tr>
+<tr class="memitem:a17eca69c41eb6cca959ab47e3c1a3aa2"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a17eca69c41eb6cca959ab47e3c1a3aa2">stpi_path_merge</a> (const char *path, const char *file)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Simple directory path functions. </p>
 </div><hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ab1754e7b09717741f4bdc7a4b973d4a5"></a><!-- doxytag: member="path.h::stp_path_search" ref="ab1754e7b09717741f4bdc7a4b973d4a5" args="(stp_list_t *dirlist, const char *suffix)" -->
+<a class="anchor" id="ab1754e7b09717741f4bdc7a4b973d4a5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -80,12 +90,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af08851d96a1197c5ce39f7dc812cef3f"></a><!-- doxytag: member="path.h::stp_path_split" ref="af08851d96a1197c5ce39f7dc812cef3f" args="(stp_list_t *list, const char *path)" -->
+<a class="anchor" id="af08851d96a1197c5ce39f7dc812cef3f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -107,12 +116,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a26017fec6cd9c9e44bc58b4cac9b9c35"></a><!-- doxytag: member="path.h::stpi_data_path" ref="a26017fec6cd9c9e44bc58b4cac9b9c35" args="(void)" -->
+<a class="anchor" id="a26017fec6cd9c9e44bc58b4cac9b9c35"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -124,12 +132,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a037cae76d9cb1916ec7fa711a127fe54"></a><!-- doxytag: member="path.h::stpi_list_files_on_data_path" ref="a037cae76d9cb1916ec7fa711a127fe54" args="(const char *name)" -->
+<a class="anchor" id="a037cae76d9cb1916ec7fa711a127fe54"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -141,12 +148,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a17eca69c41eb6cca959ab47e3c1a3aa2"></a><!-- doxytag: member="path.h::stpi_path_merge" ref="a17eca69c41eb6cca959ab47e3c1a3aa2" args="(const char *path, const char *file)" -->
+<a class="anchor" id="a17eca69c41eb6cca959ab47e3c1a3aa2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -168,14 +174,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index bb97b4f..a9f9996 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/printers.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,15 +41,19 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/printers.h File Reference</div>  </div>
-</div>
+<div class="title">printers.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Printer functions.  
@@ -52,75 +62,80 @@
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_printer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:gacddc2ce7fa4e0a68fcc30c123503738f"><td class="memItemLeft" align="right" valign="top">typedef struct stp_printer&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a></td></tr>
+<tr class="memdesc:gacddc2ce7fa4e0a68fcc30c123503738f"><td class="mdescLeft">&#160;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f"></a><br/></td></tr>
+<tr class="memitem:ga66a5e7cf2b1743a46bd78cb851e1d0a4"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstp__family.html">stp_family</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga66a5e7cf2b1743a46bd78cb851e1d0a4">stp_family_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155">stp_get_printer_by_device_id</a> (const char *device_id)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its IEEE 1284 device ID.  <a href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8">stp_get_printer_by_foomatic_id</a> (const char *foomatic_id)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its foomatic ID.  <a href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354">stp_printer_get_device_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's IEEE 1284 device ID, if known.  <a href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41">stp_printer_get_foomatic_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's foomatic ID.  <a href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="group__printer.html#gaf5084888feed9878811ac491cb5313ee"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#ga6065874cbb246875925e14d8801898cc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve options that need to be passed to the underlying print system.  <a href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga6a76f8f76106eddd51af4b1593b4f3af"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af">stp_printer_model_count</a> (void)</td></tr>
+<tr class="memdesc:ga6a76f8f76106eddd51af4b1593b4f3af"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#ga6a76f8f76106eddd51af4b1593b4f3af"></a><br/></td></tr>
+<tr class="memitem:ga440501ca226e0a9ac1335c7e52ee55a6"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr class="memdesc:ga440501ca226e0a9ac1335c7e52ee55a6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#ga440501ca226e0a9ac1335c7e52ee55a6"></a><br/></td></tr>
+<tr class="memitem:ga6bd5abd876100c17fc9029659fed92f4"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr class="memdesc:ga6bd5abd876100c17fc9029659fed92f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#ga6bd5abd876100c17fc9029659fed92f4"></a><br/></td></tr>
+<tr class="memitem:gae45de9ef94fb609c2a54f1d80144552e"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr class="memdesc:gae45de9ef94fb609c2a54f1d80144552e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#gae45de9ef94fb609c2a54f1d80144552e"></a><br/></td></tr>
+<tr class="memitem:gadce65b83e3dd0ffcb75591ed3ba81155"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155">stp_get_printer_by_device_id</a> (const char *device_id)</td></tr>
+<tr class="memdesc:gadce65b83e3dd0ffcb75591ed3ba81155"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its IEEE 1284 device ID.  <a href="group__printer.html#gadce65b83e3dd0ffcb75591ed3ba81155"></a><br/></td></tr>
+<tr class="memitem:gacd449b7863a5fcddb6bdb602079448f8"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8">stp_get_printer_by_foomatic_id</a> (const char *foomatic_id)</td></tr>
+<tr class="memdesc:gacd449b7863a5fcddb6bdb602079448f8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model by its foomatic ID.  <a href="group__printer.html#gacd449b7863a5fcddb6bdb602079448f8"></a><br/></td></tr>
+<tr class="memitem:gac649c4b3d0a93f26f99deb4b081305c1"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gac649c4b3d0a93f26f99deb4b081305c1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#gac649c4b3d0a93f26f99deb4b081305c1"></a><br/></td></tr>
+<tr class="memitem:ga41094e69b71eb930e770bd2cf8bbf795"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr class="memdesc:ga41094e69b71eb930e770bd2cf8bbf795"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#ga41094e69b71eb930e770bd2cf8bbf795"></a><br/></td></tr>
+<tr class="memitem:ga11804fb9b8d87ed1f2a3acbd39f5f85a"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga11804fb9b8d87ed1f2a3acbd39f5f85a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#ga11804fb9b8d87ed1f2a3acbd39f5f85a"></a><br/></td></tr>
+<tr class="memitem:gac345b8cf8cd78da98fdb4c6b2d9cf7ca"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gac345b8cf8cd78da98fdb4c6b2d9cf7ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#gac345b8cf8cd78da98fdb4c6b2d9cf7ca"></a><br/></td></tr>
+<tr class="memitem:ga7bbd6440baa533d99616eccb5f449354"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354">stp_printer_get_device_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga7bbd6440baa533d99616eccb5f449354"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's IEEE 1284 device ID, if known.  <a href="group__printer.html#ga7bbd6440baa533d99616eccb5f449354"></a><br/></td></tr>
+<tr class="memitem:ga487b74bf101a842f30b5941b8db4769a"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga487b74bf101a842f30b5941b8db4769a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#ga487b74bf101a842f30b5941b8db4769a"></a><br/></td></tr>
+<tr class="memitem:gab99dd05c42aed848d1567f2b346fb4f4"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gab99dd05c42aed848d1567f2b346fb4f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#gab99dd05c42aed848d1567f2b346fb4f4"></a><br/></td></tr>
+<tr class="memitem:gaac52d241cc86a10965046afc0a8c8a41"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41">stp_printer_get_foomatic_id</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaac52d241cc86a10965046afc0a8c8a41"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's foomatic ID.  <a href="group__printer.html#gaac52d241cc86a10965046afc0a8c8a41"></a><br/></td></tr>
+<tr class="memitem:gaae84d3fb263c4a171b7b63b6d93a940e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaae84d3fb263c4a171b7b63b6d93a940e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#gaae84d3fb263c4a171b7b63b6d93a940e"></a><br/></td></tr>
+<tr class="memitem:ga4f6859e0f21ed2062075d6b9f680a202"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:ga4f6859e0f21ed2062075d6b9f680a202"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#ga4f6859e0f21ed2062075d6b9f680a202"></a><br/></td></tr>
+<tr class="memitem:gaf5084888feed9878811ac491cb5313ee"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaf5084888feed9878811ac491cb5313ee">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gaf5084888feed9878811ac491cb5313ee"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameters to their defaults.  <a href="group__printer.html#gaf5084888feed9878811ac491cb5313ee"></a><br/></td></tr>
+<tr class="memitem:gac2ed6f27e4db29ceaa74a1b9bd6a78cf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf">stp_set_printer_defaults_soft</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#gacddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *p)</td></tr>
+<tr class="memdesc:gac2ed6f27e4db29ceaa74a1b9bd6a78cf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a vars object to use a particular driver, and set any unset parameters to their defaults.  <a href="group__printer.html#gac2ed6f27e4db29ceaa74a1b9bd6a78cf"></a><br/></td></tr>
+<tr class="memitem:ga6065874cbb246875925e14d8801898cc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6065874cbb246875925e14d8801898cc">stp_print</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:ga6065874cbb246875925e14d8801898cc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#ga6065874cbb246875925e14d8801898cc"></a><br/></td></tr>
+<tr class="memitem:ga31ef7bcc34dda5d3fd46b2d04fcb0c64"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64">stp_start_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:ga31ef7bcc34dda5d3fd46b2d04fcb0c64"><td class="mdescLeft">&#160;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#ga31ef7bcc34dda5d3fd46b2d04fcb0c64"></a><br/></td></tr>
+<tr class="memitem:gae61d056dd504facc72ff56d7f16eb23c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c">stp_end_job</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memdesc:gae61d056dd504facc72ff56d7f16eb23c"><td class="mdescLeft">&#160;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#gae61d056dd504facc72ff56d7f16eb23c"></a><br/></td></tr>
+<tr class="memitem:gaae7a50e6175eed1b84d2e20c924b33ca"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca">stp_get_external_options</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gaae7a50e6175eed1b84d2e20c924b33ca"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve options that need to be passed to the underlying print system.  <a href="group__printer.html#gaae7a50e6175eed1b84d2e20c924b33ca"></a><br/></td></tr>
+<tr class="memitem:ga2057c5fcfc31d8b4cf7f3291cf3c0cf4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2057c5fcfc31d8b4cf7f3291cf3c0cf4">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga5b5cb603c9432c03ea459b57a2039bdc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5b5cb603c9432c03ea459b57a2039bdc">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1c6d389f49a185ca24546107bd6f4993"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1c6d389f49a185ca24546107bd6f4993">stp_family_register</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
+<tr class="memitem:ga67e5c18254f7ad0b0fd77b4cc2265405"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga67e5c18254f7ad0b0fd77b4cc2265405">stp_family_unregister</a> (<a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *family)</td></tr>
+<tr class="memitem:ga381f3a4f132a00d6d2e2a9b54f9ed675"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga381f3a4f132a00d6d2e2a9b54f9ed675">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr class="memitem:ga09bf7aebf0385f7b5aac537a13b6e3ed"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga09bf7aebf0385f7b5aac537a13b6e3ed">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga07bc634c85950526155b711aac42c6a0"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga07bc634c85950526155b711aac42c6a0">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:ga50b48bab8d6d1734c3a0f6622d65582e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga50b48bab8d6d1734c3a0f6622d65582e">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Printer functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index 3bfdf87..9dc3ccb 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/sequence.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,91 +41,99 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/sequence.h File Reference</div>  </div>
-</div>
+<div class="title">sequence.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Sequence functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_sequence&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:ga327a46aa1d782a4cd53abf306068e272"><td class="memItemLeft" align="right" valign="top">typedef struct stp_sequence&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a></td></tr>
+<tr class="memdesc:ga327a46aa1d782a4cd53abf306068e272"><td class="mdescLeft">&#160;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a sequence.  <a href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a sequence.  <a href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26">stp_sequence_reverse</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a sequence.  <a href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gade64193f944aaba0365a96691d479974">stp_sequence_create_reverse</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a sequence.  <a href="group__sequence.html#gade64193f944aaba0365a96691d479974"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#ga44bf5a48231675305718162559205fb6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#ga35972a289b95891699ade61246882ab4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3"></a><br/></td></tr>
+<tr class="memitem:ga9f0233f39d6a27c796bb283c80974618"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618">stp_sequence_create</a> (void)</td></tr>
+<tr class="memdesc:ga9f0233f39d6a27c796bb283c80974618"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#ga9f0233f39d6a27c796bb283c80974618"></a><br/></td></tr>
+<tr class="memitem:ga3d571f155c1d00e7794b8299a41c5099"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:ga3d571f155c1d00e7794b8299a41c5099"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#ga3d571f155c1d00e7794b8299a41c5099"></a><br/></td></tr>
+<tr class="memitem:ga28087c76e1106ca11c2d247956e3a3c3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
+<tr class="memdesc:ga28087c76e1106ca11c2d247956e3a3c3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a sequence.  <a href="group__sequence.html#ga28087c76e1106ca11c2d247956e3a3c3"></a><br/></td></tr>
+<tr class="memitem:gab03a34a03ffd4163f51126916d737df7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gab03a34a03ffd4163f51126916d737df7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a sequence.  <a href="group__sequence.html#gab03a34a03ffd4163f51126916d737df7"></a><br/></td></tr>
+<tr class="memitem:ga51f0d093b1b7c1bafe068dcbf172ac26"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26">stp_sequence_reverse</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *source)</td></tr>
+<tr class="memdesc:ga51f0d093b1b7c1bafe068dcbf172ac26"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse a sequence.  <a href="group__sequence.html#ga51f0d093b1b7c1bafe068dcbf172ac26"></a><br/></td></tr>
+<tr class="memitem:gade64193f944aaba0365a96691d479974"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gade64193f944aaba0365a96691d479974">stp_sequence_create_reverse</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gade64193f944aaba0365a96691d479974"><td class="mdescLeft">&#160;</td><td class="mdescRight">Reverse and allocate a sequence.  <a href="group__sequence.html#gade64193f944aaba0365a96691d479974"></a><br/></td></tr>
+<tr class="memitem:ga1720509809473bc33e6f11b277c78bf6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr class="memdesc:ga1720509809473bc33e6f11b277c78bf6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#ga1720509809473bc33e6f11b277c78bf6"></a><br/></td></tr>
+<tr class="memitem:ga14ad64c63f45a2716ff8d9ceaf00697d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr class="memdesc:ga14ad64c63f45a2716ff8d9ceaf00697d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#ga14ad64c63f45a2716ff8d9ceaf00697d"></a><br/></td></tr>
+<tr class="memitem:ga999021f2caf1a9d0d6d133123031ce17"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr class="memdesc:ga999021f2caf1a9d0d6d133123031ce17"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#ga999021f2caf1a9d0d6d133123031ce17"></a><br/></td></tr>
+<tr class="memitem:gae0af31b854e61e0e047b3ba6dc6ec528"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr class="memdesc:gae0af31b854e61e0e047b3ba6dc6ec528"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#gae0af31b854e61e0e047b3ba6dc6ec528"></a><br/></td></tr>
+<tr class="memitem:gafa512afc64116f673ae2061d04a5ef90"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence)</td></tr>
+<tr class="memdesc:gafa512afc64116f673ae2061d04a5ef90"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#gafa512afc64116f673ae2061d04a5ef90"></a><br/></td></tr>
+<tr class="memitem:ga44bf5a48231675305718162559205fb6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga44bf5a48231675305718162559205fb6">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr class="memdesc:ga44bf5a48231675305718162559205fb6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#ga44bf5a48231675305718162559205fb6"></a><br/></td></tr>
+<tr class="memitem:ga5bb962248581af2c3c54193442d9c82f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr class="memdesc:ga5bb962248581af2c3c54193442d9c82f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#ga5bb962248581af2c3c54193442d9c82f"></a><br/></td></tr>
+<tr class="memitem:ga755c8a35e2e9e83a1dfac4f6138c4122"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr class="memdesc:ga755c8a35e2e9e83a1dfac4f6138c4122"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#ga755c8a35e2e9e83a1dfac4f6138c4122"></a><br/></td></tr>
+<tr class="memitem:ga42c76060886da02cb4a7d843ffe6d21c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr class="memdesc:ga42c76060886da02cb4a7d843ffe6d21c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#ga42c76060886da02cb4a7d843ffe6d21c"></a><br/></td></tr>
+<tr class="memitem:gaa79c5f747a80ab2ad9d09b09e0330cc7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr class="memdesc:gaa79c5f747a80ab2ad9d09b09e0330cc7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#gaa79c5f747a80ab2ad9d09b09e0330cc7"></a><br/></td></tr>
+<tr class="memitem:ga35972a289b95891699ade61246882ab4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga35972a289b95891699ade61246882ab4">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr class="memdesc:ga35972a289b95891699ade61246882ab4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#ga35972a289b95891699ade61246882ab4"></a><br/></td></tr>
+<tr class="memitem:gaaa76cdc9094ee3c05c49a782fea64478"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr class="memdesc:gaaa76cdc9094ee3c05c49a782fea64478"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#gaaa76cdc9094ee3c05c49a782fea64478"></a><br/></td></tr>
+<tr class="memitem:ga3e274a2095f2e6986892384ee89e1255"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr class="memdesc:ga3e274a2095f2e6986892384ee89e1255"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#ga3e274a2095f2e6986892384ee89e1255"></a><br/></td></tr>
+<tr class="memitem:ga9d3e18b8e576b5c00531dac444397051"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr class="memdesc:ga9d3e18b8e576b5c00531dac444397051"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#ga9d3e18b8e576b5c00531dac444397051"></a><br/></td></tr>
+<tr class="memitem:ga497c32dec3d745a2602c5e97819de21d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr class="memdesc:ga497c32dec3d745a2602c5e97819de21d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#ga497c32dec3d745a2602c5e97819de21d"></a><br/></td></tr>
+<tr class="memitem:ga572ecad03d772a255481bb8b6d79106f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr class="memdesc:ga572ecad03d772a255481bb8b6d79106f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#ga572ecad03d772a255481bb8b6d79106f"></a><br/></td></tr>
+<tr class="memitem:ga317d484a67a2b775bee27f3dfe67fed4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr class="memdesc:ga317d484a67a2b775bee27f3dfe67fed4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#ga317d484a67a2b775bee27f3dfe67fed4"></a><br/></td></tr>
+<tr class="memitem:gaff096d5b027157151c65978b95d4e29e"><td class="memItemLeft" align="right" valign="top">const float *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:gaff096d5b027157151c65978b95d4e29e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#gaff096d5b027157151c65978b95d4e29e"></a><br/></td></tr>
+<tr class="memitem:ga039d9054cfd0f7d5a892a7fec3f734f4"><td class="memItemLeft" align="right" valign="top">const long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga039d9054cfd0f7d5a892a7fec3f734f4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#ga039d9054cfd0f7d5a892a7fec3f734f4"></a><br/></td></tr>
+<tr class="memitem:ga12f54f27144d490893f46dd1b0037b8b"><td class="memItemLeft" align="right" valign="top">const unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga12f54f27144d490893f46dd1b0037b8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#ga12f54f27144d490893f46dd1b0037b8b"></a><br/></td></tr>
+<tr class="memitem:ga01b0bc9e181a097aff3e97254dbfcb14"><td class="memItemLeft" align="right" valign="top">const int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga01b0bc9e181a097aff3e97254dbfcb14"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#ga01b0bc9e181a097aff3e97254dbfcb14"></a><br/></td></tr>
+<tr class="memitem:gae7189582ef9e4d638f909a2b1ee0c1b2"><td class="memItemLeft" align="right" valign="top">const unsigned int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:gae7189582ef9e4d638f909a2b1ee0c1b2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#gae7189582ef9e4d638f909a2b1ee0c1b2"></a><br/></td></tr>
+<tr class="memitem:ga4d1cf137e4a77e9123e2afcdf7d63bec"><td class="memItemLeft" align="right" valign="top">const short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga4d1cf137e4a77e9123e2afcdf7d63bec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#ga4d1cf137e4a77e9123e2afcdf7d63bec"></a><br/></td></tr>
+<tr class="memitem:ga20007077e1d8365a0eddaa922a5967c3"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr class="memdesc:ga20007077e1d8365a0eddaa922a5967c3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#ga20007077e1d8365a0eddaa922a5967c3"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Sequence functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 0588960..15e1ef5 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/string-list.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,45 +41,51 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/string-list.h File Reference</div>  </div>
-</div>
+<div class="title">string-list.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>String list functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">String parameter.  <a href="structstp__param__string__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">String parameter.  <a href="structstp__param__string__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_string_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The string_list opaque data type.  <a href="#a5e3b69c7c2eca2523184cce51ca26543"></a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:a5e3b69c7c2eca2523184cce51ca26543"><td class="memItemLeft" align="right" valign="top">typedef struct stp_string_list&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td></tr>
+<tr class="memdesc:a5e3b69c7c2eca2523184cce51ca26543"><td class="mdescLeft">&#160;</td><td class="mdescRight">The string_list opaque data type.  <a href="#a5e3b69c7c2eca2523184cce51ca26543"></a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ab964b745d73a6d5e2e141f31941bea42">stp_string_list_create</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#aaa57feca43ce7cdf50af1dd8b4dd3a1b">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ae254c1408b96ab6cc373643f1b4d91d0">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, size_t element)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a0b5f5c20933a0f9c50259de3f16dc649">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a9bed3cf935ed01fa9a0066c5e2a47ffb">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6318f71fac5645c37e2d353f0881cc5b">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6aa3d7cf2dabfefb3e3162827d086d3d">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a087298f0cc92cc8864016a2f65a9c012">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a4f78d1a53d017db20fe5b690d9362e7a">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ac776e9cd6ca5690b446cd6e4869978a1">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *value)</td></tr>
+<tr class="memitem:ab964b745d73a6d5e2e141f31941bea42"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ab964b745d73a6d5e2e141f31941bea42">stp_string_list_create</a> (void)</td></tr>
+<tr class="memitem:aaa57feca43ce7cdf50af1dd8b4dd3a1b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#aaa57feca43ce7cdf50af1dd8b4dd3a1b">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
+<tr class="memitem:ae254c1408b96ab6cc373643f1b4d91d0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ae254c1408b96ab6cc373643f1b4d91d0">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, size_t element)</td></tr>
+<tr class="memitem:a0b5f5c20933a0f9c50259de3f16dc649"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a0b5f5c20933a0f9c50259de3f16dc649">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr class="memitem:a9bed3cf935ed01fa9a0066c5e2a47ffb"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a9bed3cf935ed01fa9a0066c5e2a47ffb">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
+<tr class="memitem:a6318f71fac5645c37e2d353f0881cc5b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6318f71fac5645c37e2d353f0881cc5b">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list)</td></tr>
+<tr class="memitem:a6aa3d7cf2dabfefb3e3162827d086d3d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6aa3d7cf2dabfefb3e3162827d086d3d">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
+<tr class="memitem:a087298f0cc92cc8864016a2f65a9c012"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a087298f0cc92cc8864016a2f65a9c012">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr class="memitem:a4f78d1a53d017db20fe5b690d9362e7a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a4f78d1a53d017db20fe5b690d9362e7a">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
+<tr class="memitem:ac776e9cd6ca5690b446cd6e4869978a1"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#ac776e9cd6ca5690b446cd6e4869978a1">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *list, const char *value)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>String list functions. </p>
 </div><hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a5e3b69c7c2eca2523184cce51ca26543"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_t" ref="a5e3b69c7c2eca2523184cce51ca26543" args="" -->
+<a class="anchor" id="a5e3b69c7c2eca2523184cce51ca26543"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -81,15 +93,14 @@ Functions</h2></td></tr>
           <td class="memname">typedef struct stp_string_list <a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>The string_list opaque data type. </p>
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a6aa3d7cf2dabfefb3e3162827d086d3d"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_add_string" ref="a6aa3d7cf2dabfefb3e3162827d086d3d" args="(stp_string_list_t *list, const char *name, const char *text)" -->
+<a class="anchor" id="a6aa3d7cf2dabfefb3e3162827d086d3d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -117,12 +128,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9bed3cf935ed01fa9a0066c5e2a47ffb"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_count" ref="a9bed3cf935ed01fa9a0066c5e2a47ffb" args="(const stp_string_list_t *list)" -->
+<a class="anchor" id="a9bed3cf935ed01fa9a0066c5e2a47ffb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -134,12 +144,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab964b745d73a6d5e2e141f31941bea42"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_create" ref="ab964b745d73a6d5e2e141f31941bea42" args="(void)" -->
+<a class="anchor" id="ab964b745d73a6d5e2e141f31941bea42"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -151,12 +160,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6318f71fac5645c37e2d353f0881cc5b"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_create_copy" ref="a6318f71fac5645c37e2d353f0881cc5b" args="(const stp_string_list_t *list)" -->
+<a class="anchor" id="a6318f71fac5645c37e2d353f0881cc5b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -168,12 +176,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4f78d1a53d017db20fe5b690d9362e7a"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_create_from_params" ref="a4f78d1a53d017db20fe5b690d9362e7a" args="(const stp_param_string_t *list, size_t count)" -->
+<a class="anchor" id="a4f78d1a53d017db20fe5b690d9362e7a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -195,12 +202,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aaa57feca43ce7cdf50af1dd8b4dd3a1b"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_destroy" ref="aaa57feca43ce7cdf50af1dd8b4dd3a1b" args="(stp_string_list_t *list)" -->
+<a class="anchor" id="aaa57feca43ce7cdf50af1dd8b4dd3a1b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -212,12 +218,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0b5f5c20933a0f9c50259de3f16dc649"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_find" ref="a0b5f5c20933a0f9c50259de3f16dc649" args="(const stp_string_list_t *list, const char *name)" -->
+<a class="anchor" id="a0b5f5c20933a0f9c50259de3f16dc649"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -239,12 +244,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac776e9cd6ca5690b446cd6e4869978a1"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_is_present" ref="ac776e9cd6ca5690b446cd6e4869978a1" args="(const stp_string_list_t *list, const char *value)" -->
+<a class="anchor" id="ac776e9cd6ca5690b446cd6e4869978a1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -266,12 +270,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae254c1408b96ab6cc373643f1b4d91d0"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_param" ref="ae254c1408b96ab6cc373643f1b4d91d0" args="(const stp_string_list_t *list, size_t element)" -->
+<a class="anchor" id="ae254c1408b96ab6cc373643f1b4d91d0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -293,12 +296,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a087298f0cc92cc8864016a2f65a9c012"></a><!-- doxytag: member="string&#45;list.h::stp_string_list_remove_string" ref="a087298f0cc92cc8864016a2f65a9c012" args="(stp_string_list_t *list, const char *name)" -->
+<a class="anchor" id="a087298f0cc92cc8864016a2f65a9c012"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -320,14 +322,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index 3e43b8f..e46270f 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: dither_matrix_impl Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,237 +42,225 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">dither_matrix_impl Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="dither_matrix_impl" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a331debb887e076f8b52952ba6cc2b50b">base</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#adb0e7fb4b5e5149f0815af448676df8b">exp</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a063e3b3617c3a9b4883f3b01cd7dfb48">x_size</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a33370af30d4c6cb0e441744c8d1c3686">y_size</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a54645c1c4edad222cf3f5aba03cdfae5">total_size</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#af0728348e6da1cf904204ef88e0a5853">last_x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a16f516218f0c5a31a1eac49e5c57add5">last_x_mod</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ac1a83c82c364098dce631ec7174574be">last_y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ad03881dd78211b5bcb1a62453c060d2e">last_y_mod</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ab744f40c883acc93ad0afbf5f048f27a">index</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a78152fe120c430f6400b731e5c722bd3">i_own</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a665c02056a2d046a15aab462492d9dbc">x_offset</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a844cb19ea61f035bc2a21536f6f392c4">y_offset</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a8c7141e2e35f6cc14896d23d15a81914">fast_mask</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ae28102f9e3d3cfb8eb48d9e69e807f96">matrix</a></td></tr>
+<tr class="memitem:a331debb887e076f8b52952ba6cc2b50b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a331debb887e076f8b52952ba6cc2b50b">base</a></td></tr>
+<tr class="memitem:adb0e7fb4b5e5149f0815af448676df8b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#adb0e7fb4b5e5149f0815af448676df8b">exp</a></td></tr>
+<tr class="memitem:a063e3b3617c3a9b4883f3b01cd7dfb48"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a063e3b3617c3a9b4883f3b01cd7dfb48">x_size</a></td></tr>
+<tr class="memitem:a33370af30d4c6cb0e441744c8d1c3686"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a33370af30d4c6cb0e441744c8d1c3686">y_size</a></td></tr>
+<tr class="memitem:a54645c1c4edad222cf3f5aba03cdfae5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a54645c1c4edad222cf3f5aba03cdfae5">total_size</a></td></tr>
+<tr class="memitem:af0728348e6da1cf904204ef88e0a5853"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#af0728348e6da1cf904204ef88e0a5853">last_x</a></td></tr>
+<tr class="memitem:a16f516218f0c5a31a1eac49e5c57add5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a16f516218f0c5a31a1eac49e5c57add5">last_x_mod</a></td></tr>
+<tr class="memitem:ac1a83c82c364098dce631ec7174574be"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ac1a83c82c364098dce631ec7174574be">last_y</a></td></tr>
+<tr class="memitem:ad03881dd78211b5bcb1a62453c060d2e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ad03881dd78211b5bcb1a62453c060d2e">last_y_mod</a></td></tr>
+<tr class="memitem:ab744f40c883acc93ad0afbf5f048f27a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ab744f40c883acc93ad0afbf5f048f27a">index</a></td></tr>
+<tr class="memitem:a78152fe120c430f6400b731e5c722bd3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a78152fe120c430f6400b731e5c722bd3">i_own</a></td></tr>
+<tr class="memitem:a665c02056a2d046a15aab462492d9dbc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a665c02056a2d046a15aab462492d9dbc">x_offset</a></td></tr>
+<tr class="memitem:a844cb19ea61f035bc2a21536f6f392c4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a844cb19ea61f035bc2a21536f6f392c4">y_offset</a></td></tr>
+<tr class="memitem:a8c7141e2e35f6cc14896d23d15a81914"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#a8c7141e2e35f6cc14896d23d15a81914">fast_mask</a></td></tr>
+<tr class="memitem:ae28102f9e3d3cfb8eb48d9e69e807f96"><td class="memItemLeft" align="right" valign="top">unsigned *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ae28102f9e3d3cfb8eb48d9e69e807f96">matrix</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a331debb887e076f8b52952ba6cc2b50b"></a><!-- doxytag: member="dither_matrix_impl::base" ref="a331debb887e076f8b52952ba6cc2b50b" args="" -->
+<a class="anchor" id="a331debb887e076f8b52952ba6cc2b50b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a331debb887e076f8b52952ba6cc2b50b">dither_matrix_impl::base</a></td>
+          <td class="memname">int dither_matrix_impl::base</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="adb0e7fb4b5e5149f0815af448676df8b"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="adb0e7fb4b5e5149f0815af448676df8b" args="" -->
+<a class="anchor" id="adb0e7fb4b5e5149f0815af448676df8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#adb0e7fb4b5e5149f0815af448676df8b">dither_matrix_impl::exp</a></td>
+          <td class="memname">int dither_matrix_impl::exp</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8c7141e2e35f6cc14896d23d15a81914"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="a8c7141e2e35f6cc14896d23d15a81914" args="" -->
+<a class="anchor" id="a8c7141e2e35f6cc14896d23d15a81914"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structdither__matrix__impl.html#a8c7141e2e35f6cc14896d23d15a81914">dither_matrix_impl::fast_mask</a></td>
+          <td class="memname">unsigned dither_matrix_impl::fast_mask</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a78152fe120c430f6400b731e5c722bd3"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="a78152fe120c430f6400b731e5c722bd3" args="" -->
+<a class="anchor" id="a78152fe120c430f6400b731e5c722bd3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a78152fe120c430f6400b731e5c722bd3">dither_matrix_impl::i_own</a></td>
+          <td class="memname">int dither_matrix_impl::i_own</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab744f40c883acc93ad0afbf5f048f27a"></a><!-- doxytag: member="dither_matrix_impl::index" ref="ab744f40c883acc93ad0afbf5f048f27a" args="" -->
+<a class="anchor" id="ab744f40c883acc93ad0afbf5f048f27a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#ab744f40c883acc93ad0afbf5f048f27a">dither_matrix_impl::index</a></td>
+          <td class="memname">int dither_matrix_impl::index</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af0728348e6da1cf904204ef88e0a5853"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="af0728348e6da1cf904204ef88e0a5853" args="" -->
+<a class="anchor" id="af0728348e6da1cf904204ef88e0a5853"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#af0728348e6da1cf904204ef88e0a5853">dither_matrix_impl::last_x</a></td>
+          <td class="memname">int dither_matrix_impl::last_x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a16f516218f0c5a31a1eac49e5c57add5"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="a16f516218f0c5a31a1eac49e5c57add5" args="" -->
+<a class="anchor" id="a16f516218f0c5a31a1eac49e5c57add5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a16f516218f0c5a31a1eac49e5c57add5">dither_matrix_impl::last_x_mod</a></td>
+          <td class="memname">int dither_matrix_impl::last_x_mod</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac1a83c82c364098dce631ec7174574be"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="ac1a83c82c364098dce631ec7174574be" args="" -->
+<a class="anchor" id="ac1a83c82c364098dce631ec7174574be"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#ac1a83c82c364098dce631ec7174574be">dither_matrix_impl::last_y</a></td>
+          <td class="memname">int dither_matrix_impl::last_y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad03881dd78211b5bcb1a62453c060d2e"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="ad03881dd78211b5bcb1a62453c060d2e" args="" -->
+<a class="anchor" id="ad03881dd78211b5bcb1a62453c060d2e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#ad03881dd78211b5bcb1a62453c060d2e">dither_matrix_impl::last_y_mod</a></td>
+          <td class="memname">int dither_matrix_impl::last_y_mod</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae28102f9e3d3cfb8eb48d9e69e807f96"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="ae28102f9e3d3cfb8eb48d9e69e807f96" args="" -->
+<a class="anchor" id="ae28102f9e3d3cfb8eb48d9e69e807f96"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned* <a class="el" href="structdither__matrix__impl.html#ae28102f9e3d3cfb8eb48d9e69e807f96">dither_matrix_impl::matrix</a></td>
+          <td class="memname">unsigned* dither_matrix_impl::matrix</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a54645c1c4edad222cf3f5aba03cdfae5"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="a54645c1c4edad222cf3f5aba03cdfae5" args="" -->
+<a class="anchor" id="a54645c1c4edad222cf3f5aba03cdfae5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a54645c1c4edad222cf3f5aba03cdfae5">dither_matrix_impl::total_size</a></td>
+          <td class="memname">int dither_matrix_impl::total_size</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a665c02056a2d046a15aab462492d9dbc"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="a665c02056a2d046a15aab462492d9dbc" args="" -->
+<a class="anchor" id="a665c02056a2d046a15aab462492d9dbc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a665c02056a2d046a15aab462492d9dbc">dither_matrix_impl::x_offset</a></td>
+          <td class="memname">int dither_matrix_impl::x_offset</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a063e3b3617c3a9b4883f3b01cd7dfb48"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="a063e3b3617c3a9b4883f3b01cd7dfb48" args="" -->
+<a class="anchor" id="a063e3b3617c3a9b4883f3b01cd7dfb48"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a063e3b3617c3a9b4883f3b01cd7dfb48">dither_matrix_impl::x_size</a></td>
+          <td class="memname">int dither_matrix_impl::x_size</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a844cb19ea61f035bc2a21536f6f392c4"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="a844cb19ea61f035bc2a21536f6f392c4" args="" -->
+<a class="anchor" id="a844cb19ea61f035bc2a21536f6f392c4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a844cb19ea61f035bc2a21536f6f392c4">dither_matrix_impl::y_offset</a></td>
+          <td class="memname">int dither_matrix_impl::y_offset</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a33370af30d4c6cb0e441744c8d1c3686"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="a33370af30d4c6cb0e441744c8d1c3686" args="" -->
+<a class="anchor" id="a33370af30d4c6cb0e441744c8d1c3686"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structdither__matrix__impl.html#a33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl::y_size</a></td>
+          <td class="memname">int dither_matrix_impl::y_size</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 c7a7115..86a09b5 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_cached_curve_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,83 +42,82 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_cached_curve_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_cached_curve_t" -->
+
 <p><code>#include &lt;curve-cache.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#ae9b4170bfafe7d85b36689cbd8eea41e">curve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#a59c26647178724471f383dea6e85f8ae">d_cache</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#ac55d549f6d2f567ba84ecb9e0417f074">s_cache</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#a99b772c3f4db71d58a4ee2315e712f04">count</a></td></tr>
+<tr class="memitem:ae9b4170bfafe7d85b36689cbd8eea41e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#ae9b4170bfafe7d85b36689cbd8eea41e">curve</a></td></tr>
+<tr class="memitem:a59c26647178724471f383dea6e85f8ae"><td class="memItemLeft" align="right" valign="top">const double *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#a59c26647178724471f383dea6e85f8ae">d_cache</a></td></tr>
+<tr class="memitem:ac55d549f6d2f567ba84ecb9e0417f074"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#ac55d549f6d2f567ba84ecb9e0417f074">s_cache</a></td></tr>
+<tr class="memitem:a99b772c3f4db71d58a4ee2315e712f04"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#a99b772c3f4db71d58a4ee2315e712f04">count</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a99b772c3f4db71d58a4ee2315e712f04"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="a99b772c3f4db71d58a4ee2315e712f04" args="" -->
+<a class="anchor" id="a99b772c3f4db71d58a4ee2315e712f04"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">size_t <a class="el" href="structstp__cached__curve__t.html#a99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t::count</a></td>
+          <td class="memname">size_t stp_cached_curve_t::count</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae9b4170bfafe7d85b36689cbd8eea41e"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="ae9b4170bfafe7d85b36689cbd8eea41e" args="" -->
+<a class="anchor" id="ae9b4170bfafe7d85b36689cbd8eea41e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#ae9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t::curve</a></td>
+          <td class="memname"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_cached_curve_t::curve</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a59c26647178724471f383dea6e85f8ae"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="a59c26647178724471f383dea6e85f8ae" args="" -->
+<a class="anchor" id="a59c26647178724471f383dea6e85f8ae"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const double* <a class="el" href="structstp__cached__curve__t.html#a59c26647178724471f383dea6e85f8ae">stp_cached_curve_t::d_cache</a></td>
+          <td class="memname">const double* stp_cached_curve_t::d_cache</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac55d549f6d2f567ba84ecb9e0417f074"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="ac55d549f6d2f567ba84ecb9e0417f074" args="" -->
+<a class="anchor" id="ac55d549f6d2f567ba84ecb9e0417f074"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned short* <a class="el" href="structstp__cached__curve__t.html#ac55d549f6d2f567ba84ecb9e0417f074">stp_cached_curve_t::s_cache</a></td>
+          <td class="memname">const unsigned short* stp_cached_curve_t::s_cache</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 33cab05..c62e608 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_color Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,69 +42,69 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_color Struct Reference<div class="ingroups"><a class="el" href="group__color.html">color</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_color" -->
+
 <p><code>#include &lt;color.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#a23ed4d11629625e2ad24b124c36c7fab">short_name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#ab7c0a627b31ebfb97fd1db2677032479">long_name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#a4442d36d0bcf746130f82ffe6f90147f">colorfuncs</a></td></tr>
+<tr class="memitem:a23ed4d11629625e2ad24b124c36c7fab"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#a23ed4d11629625e2ad24b124c36c7fab">short_name</a></td></tr>
+<tr class="memitem:ab7c0a627b31ebfb97fd1db2677032479"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#ab7c0a627b31ebfb97fd1db2677032479">long_name</a></td></tr>
+<tr class="memitem:a4442d36d0bcf746130f82ffe6f90147f"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#a4442d36d0bcf746130f82ffe6f90147f">colorfuncs</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a4442d36d0bcf746130f82ffe6f90147f"></a><!-- doxytag: member="stp_color::colorfuncs" ref="a4442d36d0bcf746130f82ffe6f90147f" args="" -->
+<a class="anchor" id="a4442d36d0bcf746130f82ffe6f90147f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color.html#a4442d36d0bcf746130f82ffe6f90147f">stp_color::colorfuncs</a></td>
+          <td class="memname">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* stp_color::colorfuncs</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab7c0a627b31ebfb97fd1db2677032479"></a><!-- doxytag: member="stp_color::long_name" ref="ab7c0a627b31ebfb97fd1db2677032479" args="" -->
+<a class="anchor" id="ab7c0a627b31ebfb97fd1db2677032479"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color.html#ab7c0a627b31ebfb97fd1db2677032479">stp_color::long_name</a></td>
+          <td class="memname">const char* stp_color::long_name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a23ed4d11629625e2ad24b124c36c7fab"></a><!-- doxytag: member="stp_color::short_name" ref="a23ed4d11629625e2ad24b124c36c7fab" args="" -->
+<a class="anchor" id="a23ed4d11629625e2ad24b124c36c7fab"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__color.html#a23ed4d11629625e2ad24b124c36c7fab">stp_color::short_name</a></td>
+          <td class="memname">const char* stp_color::short_name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index aa949ed..34d6b6e 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_colorfuncs_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,83 +42,82 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_colorfuncs_t Struct Reference<div class="ingroups"><a class="el" href="group__color.html">color</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_colorfuncs_t" -->
+
 <p><code>#include &lt;color.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#aa10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#af00aab442da969ffa5c6c1e592bad7cd">get_row</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#a14c6ae1a87ba1ba33f88fa71038f9ec9">list_parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#abf691142b608f4f02f33283dd3e67bae">describe_parameter</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memitem:aa10cf47dc6db374ef209d0d96592b1fe"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#aa10cf47dc6db374ef209d0d96592b1fe">init</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr class="memitem:af00aab442da969ffa5c6c1e592bad7cd"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#af00aab442da969ffa5c6c1e592bad7cd">get_row</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr class="memitem:a14c6ae1a87ba1ba33f88fa71038f9ec9"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#a14c6ae1a87ba1ba33f88fa71038f9ec9">list_parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:abf691142b608f4f02f33283dd3e67bae"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#abf691142b608f4f02f33283dd3e67bae">describe_parameter</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="abf691142b608f4f02f33283dd3e67bae"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="abf691142b608f4f02f33283dd3e67bae" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *description)" -->
+<a class="anchor" id="abf691142b608f4f02f33283dd3e67bae"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__colorfuncs__t.html#abf691142b608f4f02f33283dd3e67bae">stp_colorfuncs_t::describe_parameter</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td>
+          <td class="memname">void(* stp_colorfuncs_t::describe_parameter)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af00aab442da969ffa5c6c1e592bad7cd"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="af00aab442da969ffa5c6c1e592bad7cd" args=")(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" -->
+<a class="anchor" id="af00aab442da969ffa5c6c1e592bad7cd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#af00aab442da969ffa5c6c1e592bad7cd">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td>
+          <td class="memname">int(* stp_colorfuncs_t::get_row)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, int row, unsigned *zero_mask)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa10cf47dc6db374ef209d0d96592b1fe"></a><!-- doxytag: member="stp_colorfuncs_t::init" ref="aa10cf47dc6db374ef209d0d96592b1fe" args=")(stp_vars_t *v, stp_image_t *image, size_t steps)" -->
+<a class="anchor" id="aa10cf47dc6db374ef209d0d96592b1fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__colorfuncs__t.html#aa10cf47dc6db374ef209d0d96592b1fe">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td>
+          <td class="memname">int(* stp_colorfuncs_t::init)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image, size_t steps)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a14c6ae1a87ba1ba33f88fa71038f9ec9"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="a14c6ae1a87ba1ba33f88fa71038f9ec9" args=")(const stp_vars_t *v)" -->
+<a class="anchor" id="a14c6ae1a87ba1ba33f88fa71038f9ec9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* <a class="el" href="structstp__colorfuncs__t.html#a14c6ae1a87ba1ba33f88fa71038f9ec9">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
+          <td class="memname"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* stp_colorfuncs_t::list_parameters)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 6702227..1340e19 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_curve_point_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,53 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_curve_point_t Struct Reference<div class="ingroups"><a class="el" href="group__curve.html">curve</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_curve_point_t" -->
+
 <p>Point (x,y) for piecewise curve.  
  <a href="structstp__curve__point__t.html#details">More...</a></p>
 
 <p><code>#include &lt;curve.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#a92b13b94109b1270563a1116dc19b926">x</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Horizontal position.  <a href="#a92b13b94109b1270563a1116dc19b926"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#a132b1e8be20525667ece971d02f60b9d">y</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Vertical position.  <a href="#a132b1e8be20525667ece971d02f60b9d"></a><br/></td></tr>
+<tr class="memitem:a92b13b94109b1270563a1116dc19b926"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#a92b13b94109b1270563a1116dc19b926">x</a></td></tr>
+<tr class="memdesc:a92b13b94109b1270563a1116dc19b926"><td class="mdescLeft">&#160;</td><td class="mdescRight">Horizontal position.  <a href="#a92b13b94109b1270563a1116dc19b926"></a><br/></td></tr>
+<tr class="memitem:a132b1e8be20525667ece971d02f60b9d"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#a132b1e8be20525667ece971d02f60b9d">y</a></td></tr>
+<tr class="memdesc:a132b1e8be20525667ece971d02f60b9d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Vertical position.  <a href="#a132b1e8be20525667ece971d02f60b9d"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Point (x,y) for piecewise curve. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a92b13b94109b1270563a1116dc19b926"></a><!-- doxytag: member="stp_curve_point_t::x" ref="a92b13b94109b1270563a1116dc19b926" args="" -->
+<a class="anchor" id="a92b13b94109b1270563a1116dc19b926"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__curve__point__t.html#a92b13b94109b1270563a1116dc19b926">stp_curve_point_t::x</a></td>
+          <td class="memname">double stp_curve_point_t::x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Horizontal position. </p>
 
 </div>
 </div>
-<a class="anchor" id="a132b1e8be20525667ece971d02f60b9d"></a><!-- doxytag: member="stp_curve_point_t::y" ref="a132b1e8be20525667ece971d02f60b9d" args="" -->
+<a class="anchor" id="a132b1e8be20525667ece971d02f60b9d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__curve__point__t.html#a132b1e8be20525667ece971d02f60b9d">stp_curve_point_t::y</a></td>
+          <td class="memname">double stp_curve_point_t::y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Vertical position. </p>
 
@@ -93,9 +97,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 14a63c8..bc50c66 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_dither_matrix_generic Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,97 +42,95 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_dither_matrix_generic Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_dither_matrix_generic" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a6b8bd1cc589c2195f055e5a57a05e03a">x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#aaaddcac2ca33a3e822ded567bbbecfb9">y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#ab963ddf7c0826bd3cc316c2375f1205b">bytes</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a478d54ddf9ba50e783ddec1532a0eff6">prescaled</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a52acbda296a57a6087852eab62bc62db">data</a></td></tr>
+<tr class="memitem:a6b8bd1cc589c2195f055e5a57a05e03a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a6b8bd1cc589c2195f055e5a57a05e03a">x</a></td></tr>
+<tr class="memitem:aaaddcac2ca33a3e822ded567bbbecfb9"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#aaaddcac2ca33a3e822ded567bbbecfb9">y</a></td></tr>
+<tr class="memitem:ab963ddf7c0826bd3cc316c2375f1205b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#ab963ddf7c0826bd3cc316c2375f1205b">bytes</a></td></tr>
+<tr class="memitem:a478d54ddf9ba50e783ddec1532a0eff6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a478d54ddf9ba50e783ddec1532a0eff6">prescaled</a></td></tr>
+<tr class="memitem:a52acbda296a57a6087852eab62bc62db"><td class="memItemLeft" align="right" valign="top">const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#a52acbda296a57a6087852eab62bc62db">data</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ab963ddf7c0826bd3cc316c2375f1205b"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="ab963ddf7c0826bd3cc316c2375f1205b" args="" -->
+<a class="anchor" id="ab963ddf7c0826bd3cc316c2375f1205b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#ab963ddf7c0826bd3cc316c2375f1205b">stp_dither_matrix_generic::bytes</a></td>
+          <td class="memname">int stp_dither_matrix_generic::bytes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a52acbda296a57a6087852eab62bc62db"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="a52acbda296a57a6087852eab62bc62db" args="" -->
+<a class="anchor" id="a52acbda296a57a6087852eab62bc62db"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const void* <a class="el" href="structstp__dither__matrix__generic.html#a52acbda296a57a6087852eab62bc62db">stp_dither_matrix_generic::data</a></td>
+          <td class="memname">const void* stp_dither_matrix_generic::data</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a478d54ddf9ba50e783ddec1532a0eff6"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="a478d54ddf9ba50e783ddec1532a0eff6" args="" -->
+<a class="anchor" id="a478d54ddf9ba50e783ddec1532a0eff6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#a478d54ddf9ba50e783ddec1532a0eff6">stp_dither_matrix_generic::prescaled</a></td>
+          <td class="memname">int stp_dither_matrix_generic::prescaled</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6b8bd1cc589c2195f055e5a57a05e03a"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="a6b8bd1cc589c2195f055e5a57a05e03a" args="" -->
+<a class="anchor" id="a6b8bd1cc589c2195f055e5a57a05e03a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#a6b8bd1cc589c2195f055e5a57a05e03a">stp_dither_matrix_generic::x</a></td>
+          <td class="memname">int stp_dither_matrix_generic::x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aaaddcac2ca33a3e822ded567bbbecfb9"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="aaaddcac2ca33a3e822ded567bbbecfb9" args="" -->
+<a class="anchor" id="aaaddcac2ca33a3e822ded567bbbecfb9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__generic.html#aaaddcac2ca33a3e822ded567bbbecfb9">stp_dither_matrix_generic::y</a></td>
+          <td class="memname">int stp_dither_matrix_generic::y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 a12c7c1..004d961 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_dither_matrix_normal Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,97 +42,95 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_dither_matrix_normal Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_dither_matrix_normal" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ab9564690be42859d88ea264a29321af3">x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#a410560f5186761cb7430f5b0a804b09c">y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ad72d088edfe3223c2df8fd4fb6178b98">bytes</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#a042561ad856d67506fe81b1bbbffd966">prescaled</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ae67cb37136c5e9d9c4b1a44cd2dab87b">data</a></td></tr>
+<tr class="memitem:ab9564690be42859d88ea264a29321af3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ab9564690be42859d88ea264a29321af3">x</a></td></tr>
+<tr class="memitem:a410560f5186761cb7430f5b0a804b09c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#a410560f5186761cb7430f5b0a804b09c">y</a></td></tr>
+<tr class="memitem:ad72d088edfe3223c2df8fd4fb6178b98"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ad72d088edfe3223c2df8fd4fb6178b98">bytes</a></td></tr>
+<tr class="memitem:a042561ad856d67506fe81b1bbbffd966"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#a042561ad856d67506fe81b1bbbffd966">prescaled</a></td></tr>
+<tr class="memitem:ae67cb37136c5e9d9c4b1a44cd2dab87b"><td class="memItemLeft" align="right" valign="top">const unsigned *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#ae67cb37136c5e9d9c4b1a44cd2dab87b">data</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ad72d088edfe3223c2df8fd4fb6178b98"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="ad72d088edfe3223c2df8fd4fb6178b98" args="" -->
+<a class="anchor" id="ad72d088edfe3223c2df8fd4fb6178b98"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#ad72d088edfe3223c2df8fd4fb6178b98">stp_dither_matrix_normal::bytes</a></td>
+          <td class="memname">int stp_dither_matrix_normal::bytes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae67cb37136c5e9d9c4b1a44cd2dab87b"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="ae67cb37136c5e9d9c4b1a44cd2dab87b" args="" -->
+<a class="anchor" id="ae67cb37136c5e9d9c4b1a44cd2dab87b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#ae67cb37136c5e9d9c4b1a44cd2dab87b">stp_dither_matrix_normal::data</a></td>
+          <td class="memname">const unsigned* stp_dither_matrix_normal::data</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a042561ad856d67506fe81b1bbbffd966"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="a042561ad856d67506fe81b1bbbffd966" args="" -->
+<a class="anchor" id="a042561ad856d67506fe81b1bbbffd966"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#a042561ad856d67506fe81b1bbbffd966">stp_dither_matrix_normal::prescaled</a></td>
+          <td class="memname">int stp_dither_matrix_normal::prescaled</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab9564690be42859d88ea264a29321af3"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="ab9564690be42859d88ea264a29321af3" args="" -->
+<a class="anchor" id="ab9564690be42859d88ea264a29321af3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#ab9564690be42859d88ea264a29321af3">stp_dither_matrix_normal::x</a></td>
+          <td class="memname">int stp_dither_matrix_normal::x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a410560f5186761cb7430f5b0a804b09c"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="a410560f5186761cb7430f5b0a804b09c" args="" -->
+<a class="anchor" id="a410560f5186761cb7430f5b0a804b09c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__normal.html#a410560f5186761cb7430f5b0a804b09c">stp_dither_matrix_normal::y</a></td>
+          <td class="memname">int stp_dither_matrix_normal::y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 b6bf48b..491d0a8 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_dither_matrix_short Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,97 +42,95 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_dither_matrix_short Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_dither_matrix_short" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a81e0b20e763080b79faa837a00cac832">x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a2bbc6c72006541250ba23b48bcab60e8">y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#ad4d85727401505eab74e3e667f4a38f4">bytes</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a755361acae80fa4cba01a1cc71638274">prescaled</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#af4f6b5634ea79cf694782e35a8d7607d">data</a></td></tr>
+<tr class="memitem:a81e0b20e763080b79faa837a00cac832"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a81e0b20e763080b79faa837a00cac832">x</a></td></tr>
+<tr class="memitem:a2bbc6c72006541250ba23b48bcab60e8"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a2bbc6c72006541250ba23b48bcab60e8">y</a></td></tr>
+<tr class="memitem:ad4d85727401505eab74e3e667f4a38f4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#ad4d85727401505eab74e3e667f4a38f4">bytes</a></td></tr>
+<tr class="memitem:a755361acae80fa4cba01a1cc71638274"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#a755361acae80fa4cba01a1cc71638274">prescaled</a></td></tr>
+<tr class="memitem:af4f6b5634ea79cf694782e35a8d7607d"><td class="memItemLeft" align="right" valign="top">const unsigned short *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#af4f6b5634ea79cf694782e35a8d7607d">data</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ad4d85727401505eab74e3e667f4a38f4"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="ad4d85727401505eab74e3e667f4a38f4" args="" -->
+<a class="anchor" id="ad4d85727401505eab74e3e667f4a38f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#ad4d85727401505eab74e3e667f4a38f4">stp_dither_matrix_short::bytes</a></td>
+          <td class="memname">int stp_dither_matrix_short::bytes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af4f6b5634ea79cf694782e35a8d7607d"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="af4f6b5634ea79cf694782e35a8d7607d" args="" -->
+<a class="anchor" id="af4f6b5634ea79cf694782e35a8d7607d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#af4f6b5634ea79cf694782e35a8d7607d">stp_dither_matrix_short::data</a></td>
+          <td class="memname">const unsigned short* stp_dither_matrix_short::data</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a755361acae80fa4cba01a1cc71638274"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="a755361acae80fa4cba01a1cc71638274" args="" -->
+<a class="anchor" id="a755361acae80fa4cba01a1cc71638274"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#a755361acae80fa4cba01a1cc71638274">stp_dither_matrix_short::prescaled</a></td>
+          <td class="memname">int stp_dither_matrix_short::prescaled</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a81e0b20e763080b79faa837a00cac832"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="a81e0b20e763080b79faa837a00cac832" args="" -->
+<a class="anchor" id="a81e0b20e763080b79faa837a00cac832"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#a81e0b20e763080b79faa837a00cac832">stp_dither_matrix_short::x</a></td>
+          <td class="memname">int stp_dither_matrix_short::x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2bbc6c72006541250ba23b48bcab60e8"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="a2bbc6c72006541250ba23b48bcab60e8" args="" -->
+<a class="anchor" id="a2bbc6c72006541250ba23b48bcab60e8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__dither__matrix__short.html#a2bbc6c72006541250ba23b48bcab60e8">stp_dither_matrix_short::y</a></td>
+          <td class="memname">int stp_dither_matrix_short::y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index 038077f..050f575 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_dotsize Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_dotsize Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_dotsize" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#a8d5273395d0e27004f779de0ea81ff23">bit_pattern</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#ad259e8d169a7d140e4964b80790c7ddd">value</a></td></tr>
+<tr class="memitem:a8d5273395d0e27004f779de0ea81ff23"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#a8d5273395d0e27004f779de0ea81ff23">bit_pattern</a></td></tr>
+<tr class="memitem:ad259e8d169a7d140e4964b80790c7ddd"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#ad259e8d169a7d140e4964b80790c7ddd">value</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a8d5273395d0e27004f779de0ea81ff23"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="a8d5273395d0e27004f779de0ea81ff23" args="" -->
+<a class="anchor" id="a8d5273395d0e27004f779de0ea81ff23"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__dotsize.html#a8d5273395d0e27004f779de0ea81ff23">stp_dotsize::bit_pattern</a></td>
+          <td class="memname">unsigned stp_dotsize::bit_pattern</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad259e8d169a7d140e4964b80790c7ddd"></a><!-- doxytag: member="stp_dotsize::value" ref="ad259e8d169a7d140e4964b80790c7ddd" args="" -->
+<a class="anchor" id="ad259e8d169a7d140e4964b80790c7ddd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__dotsize.html#ad259e8d169a7d140e4964b80790c7ddd">stp_dotsize::value</a></td>
+          <td class="memname">double stp_dotsize::value</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 faf6366..906be3a 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_double_bound_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,52 +42,50 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_double_bound_t Struct Reference<div class="ingroups"><a class="el" href="group__vars.html">vars</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_double_bound_t" -->
+
 <p>double_bound (range) parameter.  
  <a href="structstp__double__bound__t.html#details">More...</a></p>
 
 <p><code>#include &lt;vars.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#aa00903ee6e04e01b6b2bb7033e3c76ce">lower</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#a07d734f8f82f059460cee55927b0216c">upper</a></td></tr>
+<tr class="memitem:aa00903ee6e04e01b6b2bb7033e3c76ce"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#aa00903ee6e04e01b6b2bb7033e3c76ce">lower</a></td></tr>
+<tr class="memitem:a07d734f8f82f059460cee55927b0216c"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#a07d734f8f82f059460cee55927b0216c">upper</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>double_bound (range) parameter. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="aa00903ee6e04e01b6b2bb7033e3c76ce"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="aa00903ee6e04e01b6b2bb7033e3c76ce" args="" -->
+<a class="anchor" id="aa00903ee6e04e01b6b2bb7033e3c76ce"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__double__bound__t.html#aa00903ee6e04e01b6b2bb7033e3c76ce">stp_double_bound_t::lower</a></td>
+          <td class="memname">double stp_double_bound_t::lower</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Lower bound. </p>
 
 </div>
 </div>
-<a class="anchor" id="a07d734f8f82f059460cee55927b0216c"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="a07d734f8f82f059460cee55927b0216c" args="" -->
+<a class="anchor" id="a07d734f8f82f059460cee55927b0216c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__double__bound__t.html#a07d734f8f82f059460cee55927b0216c">stp_double_bound_t::upper</a></td>
+          <td class="memname">double stp_double_bound_t::upper</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Upper bound. </p>
 
 </div>
@@ -89,9 +93,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index fd395ed..edf676e 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_family Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_family Struct Reference<div class="ingroups"><a class="el" href="group__printer.html">printer</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_family" -->
+
 <p><code>#include &lt;printers.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#ad29f00ba3565e93c138b00e4a48cde77">printfuncs</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#a6e4f0c216f5ced14a819fbacdb26547d">printer_list</a></td></tr>
+<tr class="memitem:ad29f00ba3565e93c138b00e4a48cde77"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#ad29f00ba3565e93c138b00e4a48cde77">printfuncs</a></td></tr>
+<tr class="memitem:a6e4f0c216f5ced14a819fbacdb26547d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#a6e4f0c216f5ced14a819fbacdb26547d">printer_list</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a6e4f0c216f5ced14a819fbacdb26547d"></a><!-- doxytag: member="stp_family::printer_list" ref="a6e4f0c216f5ced14a819fbacdb26547d" args="" -->
+<a class="anchor" id="a6e4f0c216f5ced14a819fbacdb26547d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* <a class="el" href="structstp__family.html#a6e4f0c216f5ced14a819fbacdb26547d">stp_family::printer_list</a></td>
+          <td class="memname"><a class="el" href="group__list.html#ga53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a>* stp_family::printer_list</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad29f00ba3565e93c138b00e4a48cde77"></a><!-- doxytag: member="stp_family::printfuncs" ref="ad29f00ba3565e93c138b00e4a48cde77" args="" -->
+<a class="anchor" id="ad29f00ba3565e93c138b00e4a48cde77"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#ad29f00ba3565e93c138b00e4a48cde77">stp_family::printfuncs</a></td>
+          <td class="memname">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* stp_family::printfuncs</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 2a857a4..5543aad 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_image Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,88 +42,85 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_image Struct Reference<div class="ingroups"><a class="el" href="group__image.html">image</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_image" -->
+
 <p>The image type is an abstract data type for interfacing with the image creation program.  
  <a href="structstp__image.html#details">More...</a></p>
 
 <p><code>#include &lt;image.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ace69bf25344a814cabea38afa4527086">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#ace69bf25344a814cabea38afa4527086"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a7bb2244368c6b1e07d27afb3dd249ffd">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#a7bb2244368c6b1e07d27afb3dd249ffd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a890033525988e15f4f4a0b4132e5f19b">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#a890033525988e15f4f4a0b4132e5f19b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a4977ad211581999a3f3290983929cce9">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#a4977ad211581999a3f3290983929cce9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a8f7f8fb5826f52b8bd820f422c583350">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#a8f7f8fb5826f52b8bd820f422c583350"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a56636ad7c0dbf0a82284241f796d95cd">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#a56636ad7c0dbf0a82284241f796d95cd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a5d2385711b303e055258c28f42ab7f4c">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#a5d2385711b303e055258c28f42ab7f4c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ab18e6ee35037589bf485213022e2d871">rep</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#ab18e6ee35037589bf485213022e2d871"></a><br/></td></tr>
+<tr class="memitem:ace69bf25344a814cabea38afa4527086"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ace69bf25344a814cabea38afa4527086">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:ace69bf25344a814cabea38afa4527086"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#ace69bf25344a814cabea38afa4527086"></a><br/></td></tr>
+<tr class="memitem:a7bb2244368c6b1e07d27afb3dd249ffd"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a7bb2244368c6b1e07d27afb3dd249ffd">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:a7bb2244368c6b1e07d27afb3dd249ffd"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#a7bb2244368c6b1e07d27afb3dd249ffd"></a><br/></td></tr>
+<tr class="memitem:a890033525988e15f4f4a0b4132e5f19b"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a890033525988e15f4f4a0b4132e5f19b">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:a890033525988e15f4f4a0b4132e5f19b"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#a890033525988e15f4f4a0b4132e5f19b"></a><br/></td></tr>
+<tr class="memitem:a4977ad211581999a3f3290983929cce9"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a4977ad211581999a3f3290983929cce9">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:a4977ad211581999a3f3290983929cce9"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#a4977ad211581999a3f3290983929cce9"></a><br/></td></tr>
+<tr class="memitem:a8f7f8fb5826f52b8bd820f422c583350"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a8f7f8fb5826f52b8bd820f422c583350">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
+<tr class="memdesc:a8f7f8fb5826f52b8bd820f422c583350"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#a8f7f8fb5826f52b8bd820f422c583350"></a><br/></td></tr>
+<tr class="memitem:a56636ad7c0dbf0a82284241f796d95cd"><td class="memItemLeft" align="right" valign="top">const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a56636ad7c0dbf0a82284241f796d95cd">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:a56636ad7c0dbf0a82284241f796d95cd"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#a56636ad7c0dbf0a82284241f796d95cd"></a><br/></td></tr>
+<tr class="memitem:a5d2385711b303e055258c28f42ab7f4c"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#a5d2385711b303e055258c28f42ab7f4c">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr class="memdesc:a5d2385711b303e055258c28f42ab7f4c"><td class="mdescLeft">&#160;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#a5d2385711b303e055258c28f42ab7f4c"></a><br/></td></tr>
+<tr class="memitem:ab18e6ee35037589bf485213022e2d871"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#ab18e6ee35037589bf485213022e2d871">rep</a></td></tr>
+<tr class="memdesc:ab18e6ee35037589bf485213022e2d871"><td class="mdescLeft">&#160;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#ab18e6ee35037589bf485213022e2d871"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The image type is an abstract data type for interfacing with the image creation program. </p>
 <p>It provides callbacks to functions defined within the client application which are called while printing the image. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a5d2385711b303e055258c28f42ab7f4c"></a><!-- doxytag: member="stp_image::conclude" ref="a5d2385711b303e055258c28f42ab7f4c" args=")(struct stp_image *image)" -->
+<a class="anchor" id="a5d2385711b303e055258c28f42ab7f4c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image.html#a5d2385711b303e055258c28f42ab7f4c">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">void(* stp_image::conclude)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback is called at the end of each page. </p>
 
 </div>
 </div>
-<a class="anchor" id="a56636ad7c0dbf0a82284241f796d95cd"></a><!-- doxytag: member="stp_image::get_appname" ref="a56636ad7c0dbf0a82284241f796d95cd" args=")(struct stp_image *image)" -->
+<a class="anchor" id="a56636ad7c0dbf0a82284241f796d95cd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char*(* <a class="el" href="structstp__image.html#a56636ad7c0dbf0a82284241f796d95cd">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">const char*(* stp_image::get_appname)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback returns the name of the application. </p>
 <p>This is embedded in the output by some drivers. </p>
 
 </div>
 </div>
-<a class="anchor" id="a8f7f8fb5826f52b8bd820f422c583350"></a><!-- doxytag: member="stp_image::get_row" ref="a8f7f8fb5826f52b8bd820f422c583350" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" -->
+<a class="anchor" id="a8f7f8fb5826f52b8bd820f422c583350"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#a8f7f8fb5826f52b8bd820f422c583350">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td>
+          <td class="memname"><a class="el" href="group__image.html#ga58672e1989d582c14328048b207657c8">stp_image_status_t</a>(* stp_image::get_row)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback transfers the data from the image to the gimp-print library. </p>
 <p>It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#a890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">image</td><td>the image in use. </td></tr>
     <tr><td class="paramname">data</td><td>a pointer to <a class="el" href="structstp__image.html#a890033525988e15f4f4a0b4132e5f19b" title="This callback returns the width of the image in pixels.">width()</a> bytes of pixel data. </td></tr>
@@ -129,19 +132,18 @@ Data Fields</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a4977ad211581999a3f3290983929cce9"></a><!-- doxytag: member="stp_image::height" ref="a4977ad211581999a3f3290983929cce9" args=")(struct stp_image *image)" -->
+<a class="anchor" id="a4977ad211581999a3f3290983929cce9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__image.html#a4977ad211581999a3f3290983929cce9">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">int(* stp_image::height)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback returns the height of the image in pixels. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">image</td><td>the image in use. </td></tr>
   </table>
@@ -150,20 +152,19 @@ Data Fields</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ace69bf25344a814cabea38afa4527086"></a><!-- doxytag: member="stp_image::init" ref="ace69bf25344a814cabea38afa4527086" args=")(struct stp_image *image)" -->
+<a class="anchor" id="ace69bf25344a814cabea38afa4527086"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image.html#ace69bf25344a814cabea38afa4527086">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">void(* stp_image::init)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback is used to perform any initialization required by the image layer for the image. </p>
 <p>It will be called once per image. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">image</td><td>the image in use. </td></tr>
   </table>
@@ -172,36 +173,34 @@ Data Fields</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ab18e6ee35037589bf485213022e2d871"></a><!-- doxytag: member="stp_image::rep" ref="ab18e6ee35037589bf485213022e2d871" args="" -->
+<a class="anchor" id="ab18e6ee35037589bf485213022e2d871"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__image.html#ab18e6ee35037589bf485213022e2d871">stp_image::rep</a></td>
+          <td class="memname">void* stp_image::rep</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>A pointer to an application-specific state information that might need to be associated with the image object. </p>
 
 </div>
 </div>
-<a class="anchor" id="a7bb2244368c6b1e07d27afb3dd249ffd"></a><!-- doxytag: member="stp_image::reset" ref="a7bb2244368c6b1e07d27afb3dd249ffd" args=")(struct stp_image *image)" -->
+<a class="anchor" id="a7bb2244368c6b1e07d27afb3dd249ffd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__image.html#a7bb2244368c6b1e07d27afb3dd249ffd">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">void(* stp_image::reset)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback is called to reset the image to the beginning. </p>
 <p>It may (in principle) be called multiple times if a page is being printed more than once. </p>
-<dl class="warning"><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image.html#a7bb2244368c6b1e07d27afb3dd249ffd" title="This callback is called to reset the image to the beginning.">reset()</a> call may be removed in the future. </dd></dl>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="section warning"><dt>Warning:</dt><dd>The <a class="el" href="structstp__image.html#a7bb2244368c6b1e07d27afb3dd249ffd" title="This callback is called to reset the image to the beginning.">reset()</a> call may be removed in the future. </dd></dl>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">image</td><td>the image in use. </td></tr>
   </table>
@@ -210,19 +209,18 @@ Data Fields</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="a890033525988e15f4f4a0b4132e5f19b"></a><!-- doxytag: member="stp_image::width" ref="a890033525988e15f4f4a0b4132e5f19b" args=")(struct stp_image *image)" -->
+<a class="anchor" id="a890033525988e15f4f4a0b4132e5f19b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__image.html#a890033525988e15f4f4a0b4132e5f19b">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
+          <td class="memname">int(* stp_image::width)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>This callback returns the width of the image in pixels. </p>
-<dl><dt><b>Parameters:</b></dt><dd>
+<dl class="params"><dt>Parameters:</dt><dd>
   <table class="params">
     <tr><td class="paramname">image</td><td>the image in use. </td></tr>
   </table>
@@ -234,9 +232,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 63337df..75fb892 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_int_bound_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,52 +42,50 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_int_bound_t Struct Reference<div class="ingroups"><a class="el" href="group__vars.html">vars</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_int_bound_t" -->
+
 <p>int_bound (range) parameter.  
  <a href="structstp__int__bound__t.html#details">More...</a></p>
 
 <p><code>#include &lt;vars.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#ac5ae98fad865ad6d4816016e233f5a53">lower</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#aa71bcebaae24712ee7a66955b345de19">upper</a></td></tr>
+<tr class="memitem:ac5ae98fad865ad6d4816016e233f5a53"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#ac5ae98fad865ad6d4816016e233f5a53">lower</a></td></tr>
+<tr class="memitem:aa71bcebaae24712ee7a66955b345de19"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#aa71bcebaae24712ee7a66955b345de19">upper</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>int_bound (range) parameter. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ac5ae98fad865ad6d4816016e233f5a53"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="ac5ae98fad865ad6d4816016e233f5a53" args="" -->
+<a class="anchor" id="ac5ae98fad865ad6d4816016e233f5a53"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__int__bound__t.html#ac5ae98fad865ad6d4816016e233f5a53">stp_int_bound_t::lower</a></td>
+          <td class="memname">int stp_int_bound_t::lower</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Lower bound. </p>
 
 </div>
 </div>
-<a class="anchor" id="aa71bcebaae24712ee7a66955b345de19"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="aa71bcebaae24712ee7a66955b345de19" args="" -->
+<a class="anchor" id="aa71bcebaae24712ee7a66955b345de19"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__int__bound__t.html#aa71bcebaae24712ee7a66955b345de19">stp_int_bound_t::upper</a></td>
+          <td class="memname">int stp_int_bound_t::upper</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Upper bound. </p>
 
 </div>
@@ -89,9 +93,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index d404148..b4fe2ad 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_lineactive_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_lineactive_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_lineactive_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#a266bdeb14e62fb5b17a31746ad511761">ncolors</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#a5bb5843aa2a4817ef84fb83714b200f3">v</a></td></tr>
+<tr class="memitem:a266bdeb14e62fb5b17a31746ad511761"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#a266bdeb14e62fb5b17a31746ad511761">ncolors</a></td></tr>
+<tr class="memitem:a5bb5843aa2a4817ef84fb83714b200f3"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#a5bb5843aa2a4817ef84fb83714b200f3">v</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a266bdeb14e62fb5b17a31746ad511761"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="a266bdeb14e62fb5b17a31746ad511761" args="" -->
+<a class="anchor" id="a266bdeb14e62fb5b17a31746ad511761"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__lineactive__t.html#a266bdeb14e62fb5b17a31746ad511761">stp_lineactive_t::ncolors</a></td>
+          <td class="memname">int stp_lineactive_t::ncolors</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5bb5843aa2a4817ef84fb83714b200f3"></a><!-- doxytag: member="stp_lineactive_t::v" ref="a5bb5843aa2a4817ef84fb83714b200f3" args="" -->
+<a class="anchor" id="a5bb5843aa2a4817ef84fb83714b200f3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__lineactive__t.html#a5bb5843aa2a4817ef84fb83714b200f3">stp_lineactive_t::v</a></td>
+          <td class="memname">char* stp_lineactive_t::v</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index 9edb8fe..c5d0f3d 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_linebounds_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,69 +42,69 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_linebounds_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_linebounds_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#adc4641abb41a9204c258a380aa00b7f4">ncolors</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#ab46a1a4ec130dd043009fb96b0115467">start_pos</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#a9bc2a60779ccf4ac3d90d47441e883ab">end_pos</a></td></tr>
+<tr class="memitem:adc4641abb41a9204c258a380aa00b7f4"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#adc4641abb41a9204c258a380aa00b7f4">ncolors</a></td></tr>
+<tr class="memitem:ab46a1a4ec130dd043009fb96b0115467"><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#ab46a1a4ec130dd043009fb96b0115467">start_pos</a></td></tr>
+<tr class="memitem:a9bc2a60779ccf4ac3d90d47441e883ab"><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#a9bc2a60779ccf4ac3d90d47441e883ab">end_pos</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a9bc2a60779ccf4ac3d90d47441e883ab"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="a9bc2a60779ccf4ac3d90d47441e883ab" args="" -->
+<a class="anchor" id="a9bc2a60779ccf4ac3d90d47441e883ab"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int* <a class="el" href="structstp__linebounds__t.html#a9bc2a60779ccf4ac3d90d47441e883ab">stp_linebounds_t::end_pos</a></td>
+          <td class="memname">int* stp_linebounds_t::end_pos</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="adc4641abb41a9204c258a380aa00b7f4"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="adc4641abb41a9204c258a380aa00b7f4" args="" -->
+<a class="anchor" id="adc4641abb41a9204c258a380aa00b7f4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__linebounds__t.html#adc4641abb41a9204c258a380aa00b7f4">stp_linebounds_t::ncolors</a></td>
+          <td class="memname">int stp_linebounds_t::ncolors</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab46a1a4ec130dd043009fb96b0115467"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="ab46a1a4ec130dd043009fb96b0115467" args="" -->
+<a class="anchor" id="ab46a1a4ec130dd043009fb96b0115467"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int* <a class="el" href="structstp__linebounds__t.html#ab46a1a4ec130dd043009fb96b0115467">stp_linebounds_t::start_pos</a></td>
+          <td class="memname">int* stp_linebounds_t::start_pos</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index b4133ba..a2577b3 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_linebufs_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_linebufs_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_linebufs_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#a5ad1c52050c8d71da5609d2526854696">ncolors</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char **&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#a485ecae7a892476331d31079d33b9891">v</a></td></tr>
+<tr class="memitem:a5ad1c52050c8d71da5609d2526854696"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#a5ad1c52050c8d71da5609d2526854696">ncolors</a></td></tr>
+<tr class="memitem:a485ecae7a892476331d31079d33b9891"><td class="memItemLeft" align="right" valign="top">unsigned char **&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#a485ecae7a892476331d31079d33b9891">v</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a5ad1c52050c8d71da5609d2526854696"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="a5ad1c52050c8d71da5609d2526854696" args="" -->
+<a class="anchor" id="a5ad1c52050c8d71da5609d2526854696"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__linebufs__t.html#a5ad1c52050c8d71da5609d2526854696">stp_linebufs_t::ncolors</a></td>
+          <td class="memname">int stp_linebufs_t::ncolors</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a485ecae7a892476331d31079d33b9891"></a><!-- doxytag: member="stp_linebufs_t::v" ref="a485ecae7a892476331d31079d33b9891" args="" -->
+<a class="anchor" id="a485ecae7a892476331d31079d33b9891"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char** <a class="el" href="structstp__linebufs__t.html#a485ecae7a892476331d31079d33b9891">stp_linebufs_t::v</a></td>
+          <td class="memname">unsigned char** stp_linebufs_t::v</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index eac273b..abf9b06 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_linecount_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_linecount_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_linecount_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#a69275ad8687438976d07950fa65a1728">ncolors</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#a2164f4045d892c45105f5780c80489a4">v</a></td></tr>
+<tr class="memitem:a69275ad8687438976d07950fa65a1728"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#a69275ad8687438976d07950fa65a1728">ncolors</a></td></tr>
+<tr class="memitem:a2164f4045d892c45105f5780c80489a4"><td class="memItemLeft" align="right" valign="top">int *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#a2164f4045d892c45105f5780c80489a4">v</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a69275ad8687438976d07950fa65a1728"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="a69275ad8687438976d07950fa65a1728" args="" -->
+<a class="anchor" id="a69275ad8687438976d07950fa65a1728"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__linecount__t.html#a69275ad8687438976d07950fa65a1728">stp_linecount_t::ncolors</a></td>
+          <td class="memname">int stp_linecount_t::ncolors</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2164f4045d892c45105f5780c80489a4"></a><!-- doxytag: member="stp_linecount_t::v" ref="a2164f4045d892c45105f5780c80489a4" args="" -->
+<a class="anchor" id="a2164f4045d892c45105f5780c80489a4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int* <a class="el" href="structstp__linecount__t.html#a2164f4045d892c45105f5780c80489a4">stp_linecount_t::v</a></td>
+          <td class="memname">int* stp_linecount_t::v</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 4cd6e7a..806b650 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_lineoff_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_lineoff_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_lineoff_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#a97c5a2281b3cddb9c546e8299ea4e2b0">ncolors</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#a88bbe86454fbda432487952640948328">v</a></td></tr>
+<tr class="memitem:a97c5a2281b3cddb9c546e8299ea4e2b0"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#a97c5a2281b3cddb9c546e8299ea4e2b0">ncolors</a></td></tr>
+<tr class="memitem:a88bbe86454fbda432487952640948328"><td class="memItemLeft" align="right" valign="top">unsigned long *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#a88bbe86454fbda432487952640948328">v</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a97c5a2281b3cddb9c546e8299ea4e2b0"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="a97c5a2281b3cddb9c546e8299ea4e2b0" args="" -->
+<a class="anchor" id="a97c5a2281b3cddb9c546e8299ea4e2b0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__lineoff__t.html#a97c5a2281b3cddb9c546e8299ea4e2b0">stp_lineoff_t::ncolors</a></td>
+          <td class="memname">int stp_lineoff_t::ncolors</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a88bbe86454fbda432487952640948328"></a><!-- doxytag: member="stp_lineoff_t::v" ref="a88bbe86454fbda432487952640948328" args="" -->
+<a class="anchor" id="a88bbe86454fbda432487952640948328"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned long* <a class="el" href="structstp__lineoff__t.html#a88bbe86454fbda432487952640948328">stp_lineoff_t::v</a></td>
+          <td class="memname">unsigned long* stp_lineoff_t::v</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index f776789..3232d96 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_module Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,139 +42,134 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_module Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_module" -->
+
 <p><code>#include &lt;module.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a32e2db7046f281afd6748afe111aee76">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ae2038239913d3ddbece919082501c8d0">version</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ab60ac536d9ec7b3a306cddf4c06e18bb">comment</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a4ebc727be1ec8edaaa1b25415a3932e3">class</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a1a96aa2db220972e124717cc6dd03c8e">handle</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#afa7d4259940b8d42a36f14108f504944">init</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ae04ff0565f8ebd56b383917b602ffc4a">fini</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a0e7297a93920d8f6849718d0a32fa2ba">syms</a></td></tr>
+<tr class="memitem:a32e2db7046f281afd6748afe111aee76"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a32e2db7046f281afd6748afe111aee76">name</a></td></tr>
+<tr class="memitem:ae2038239913d3ddbece919082501c8d0"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ae2038239913d3ddbece919082501c8d0">version</a></td></tr>
+<tr class="memitem:ab60ac536d9ec7b3a306cddf4c06e18bb"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ab60ac536d9ec7b3a306cddf4c06e18bb">comment</a></td></tr>
+<tr class="memitem:a4ebc727be1ec8edaaa1b25415a3932e3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a4ebc727be1ec8edaaa1b25415a3932e3">class</a></td></tr>
+<tr class="memitem:a1a96aa2db220972e124717cc6dd03c8e"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a1a96aa2db220972e124717cc6dd03c8e">handle</a></td></tr>
+<tr class="memitem:afa7d4259940b8d42a36f14108f504944"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#afa7d4259940b8d42a36f14108f504944">init</a> )(void)</td></tr>
+<tr class="memitem:ae04ff0565f8ebd56b383917b602ffc4a"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#ae04ff0565f8ebd56b383917b602ffc4a">fini</a> )(void)</td></tr>
+<tr class="memitem:a0e7297a93920d8f6849718d0a32fa2ba"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a0e7297a93920d8f6849718d0a32fa2ba">syms</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a4ebc727be1ec8edaaa1b25415a3932e3"></a><!-- doxytag: member="stp_module::class" ref="a4ebc727be1ec8edaaa1b25415a3932e3" args="" -->
+<a class="anchor" id="a4ebc727be1ec8edaaa1b25415a3932e3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> <a class="el" href="structstp__module.html#a4ebc727be1ec8edaaa1b25415a3932e3">stp_module::class</a></td>
+          <td class="memname"><a class="el" href="module_8h.html#ab3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a> stp_module::class</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab60ac536d9ec7b3a306cddf4c06e18bb"></a><!-- doxytag: member="stp_module::comment" ref="ab60ac536d9ec7b3a306cddf4c06e18bb" args="" -->
+<a class="anchor" id="ab60ac536d9ec7b3a306cddf4c06e18bb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#ab60ac536d9ec7b3a306cddf4c06e18bb">stp_module::comment</a></td>
+          <td class="memname">const char* stp_module::comment</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae04ff0565f8ebd56b383917b602ffc4a"></a><!-- doxytag: member="stp_module::fini" ref="ae04ff0565f8ebd56b383917b602ffc4a" args=")(void)" -->
+<a class="anchor" id="ae04ff0565f8ebd56b383917b602ffc4a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module.html#ae04ff0565f8ebd56b383917b602ffc4a">stp_module::fini</a>)(void)</td>
+          <td class="memname">int(* stp_module::fini)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1a96aa2db220972e124717cc6dd03c8e"></a><!-- doxytag: member="stp_module::handle" ref="a1a96aa2db220972e124717cc6dd03c8e" args="" -->
+<a class="anchor" id="a1a96aa2db220972e124717cc6dd03c8e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module.html#a1a96aa2db220972e124717cc6dd03c8e">stp_module::handle</a></td>
+          <td class="memname">void* stp_module::handle</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afa7d4259940b8d42a36f14108f504944"></a><!-- doxytag: member="stp_module::init" ref="afa7d4259940b8d42a36f14108f504944" args=")(void)" -->
+<a class="anchor" id="afa7d4259940b8d42a36f14108f504944"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__module.html#afa7d4259940b8d42a36f14108f504944">stp_module::init</a>)(void)</td>
+          <td class="memname">int(* stp_module::init)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a32e2db7046f281afd6748afe111aee76"></a><!-- doxytag: member="stp_module::name" ref="a32e2db7046f281afd6748afe111aee76" args="" -->
+<a class="anchor" id="a32e2db7046f281afd6748afe111aee76"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#a32e2db7046f281afd6748afe111aee76">stp_module::name</a></td>
+          <td class="memname">const char* stp_module::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0e7297a93920d8f6849718d0a32fa2ba"></a><!-- doxytag: member="stp_module::syms" ref="a0e7297a93920d8f6849718d0a32fa2ba" args="" -->
+<a class="anchor" id="a0e7297a93920d8f6849718d0a32fa2ba"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void* <a class="el" href="structstp__module.html#a0e7297a93920d8f6849718d0a32fa2ba">stp_module::syms</a></td>
+          <td class="memname">void* stp_module::syms</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae2038239913d3ddbece919082501c8d0"></a><!-- doxytag: member="stp_module::version" ref="ae2038239913d3ddbece919082501c8d0" args="" -->
+<a class="anchor" id="ae2038239913d3ddbece919082501c8d0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__module.html#ae2038239913d3ddbece919082501c8d0">stp_module::version</a></td>
+          <td class="memname">const char* stp_module::version</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index 7be52f7..7d58c21 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_module_version Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_module_version Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_module_version" -->
+
 <p><code>#include &lt;module.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#a15add43e03d0e1624f40c083fa958692">major</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#aeced49a93c5e461fa95f809ad077fced">minor</a></td></tr>
+<tr class="memitem:a15add43e03d0e1624f40c083fa958692"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#a15add43e03d0e1624f40c083fa958692">major</a></td></tr>
+<tr class="memitem:aeced49a93c5e461fa95f809ad077fced"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#aeced49a93c5e461fa95f809ad077fced">minor</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a15add43e03d0e1624f40c083fa958692"></a><!-- doxytag: member="stp_module_version::major" ref="a15add43e03d0e1624f40c083fa958692" args="" -->
+<a class="anchor" id="a15add43e03d0e1624f40c083fa958692"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version.html#a15add43e03d0e1624f40c083fa958692">stp_module_version::major</a></td>
+          <td class="memname">int stp_module_version::major</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aeced49a93c5e461fa95f809ad077fced"></a><!-- doxytag: member="stp_module_version::minor" ref="aeced49a93c5e461fa95f809ad077fced" args="" -->
+<a class="anchor" id="aeced49a93c5e461fa95f809ad077fced"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__module__version.html#aeced49a93c5e461fa95f809ad077fced">stp_module_version::minor</a></td>
+          <td class="memname">int stp_module_version::minor</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 cb31f65..e9df00f 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_mxml_attr_s Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_mxml_attr_s Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_mxml_attr_s" -->
+
 <p><code>#include &lt;mxml.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#a4ea32ac1f797cf7722bf3e8638b21dee">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#a25554324bd8ccf8e9558e4705eda0daa">value</a></td></tr>
+<tr class="memitem:a4ea32ac1f797cf7722bf3e8638b21dee"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#a4ea32ac1f797cf7722bf3e8638b21dee">name</a></td></tr>
+<tr class="memitem:a25554324bd8ccf8e9558e4705eda0daa"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#a25554324bd8ccf8e9558e4705eda0daa">value</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a4ea32ac1f797cf7722bf3e8638b21dee"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="a4ea32ac1f797cf7722bf3e8638b21dee" args="" -->
+<a class="anchor" id="a4ea32ac1f797cf7722bf3e8638b21dee"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#a4ea32ac1f797cf7722bf3e8638b21dee">stp_mxml_attr_s::name</a></td>
+          <td class="memname">char* stp_mxml_attr_s::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a25554324bd8ccf8e9558e4705eda0daa"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="a25554324bd8ccf8e9558e4705eda0daa" args="" -->
+<a class="anchor" id="a25554324bd8ccf8e9558e4705eda0daa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__attr__s.html#a25554324bd8ccf8e9558e4705eda0daa">stp_mxml_attr_s::value</a></td>
+          <td class="memname">char* stp_mxml_attr_s::value</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 003b367..1439050 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_mxml_node_s Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,125 +42,121 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_mxml_node_s Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_mxml_node_s" -->
+
 <p><code>#include &lt;mxml.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#ae1bff9adee67699067516eee014a7510">type</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a8831071db5a4b4df95ea3c5c2e95476b">next</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a2174125dc205e7c760e4e8c9c9048ddf">prev</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a353df68e26a33380dcacda213a741487">parent</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a44550ea8d68a483ccc130c58b66ddd33">child</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a5fb356e73f91b24211882f42cbbe7a08">last_child</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#aad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
+<tr class="memitem:ae1bff9adee67699067516eee014a7510"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#ae1bff9adee67699067516eee014a7510">type</a></td></tr>
+<tr class="memitem:a8831071db5a4b4df95ea3c5c2e95476b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a8831071db5a4b4df95ea3c5c2e95476b">next</a></td></tr>
+<tr class="memitem:a2174125dc205e7c760e4e8c9c9048ddf"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a2174125dc205e7c760e4e8c9c9048ddf">prev</a></td></tr>
+<tr class="memitem:a353df68e26a33380dcacda213a741487"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a353df68e26a33380dcacda213a741487">parent</a></td></tr>
+<tr class="memitem:a44550ea8d68a483ccc130c58b66ddd33"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a44550ea8d68a483ccc130c58b66ddd33">child</a></td></tr>
+<tr class="memitem:a5fb356e73f91b24211882f42cbbe7a08"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#a5fb356e73f91b24211882f42cbbe7a08">last_child</a></td></tr>
+<tr class="memitem:aad44d6b2fe0842de0bbf1312035372cd"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#aad44d6b2fe0842de0bbf1312035372cd">value</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a44550ea8d68a483ccc130c58b66ddd33"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="a44550ea8d68a483ccc130c58b66ddd33" args="" -->
+<a class="anchor" id="a44550ea8d68a483ccc130c58b66ddd33"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#a44550ea8d68a483ccc130c58b66ddd33">stp_mxml_node_s::child</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxml_node_s::child</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5fb356e73f91b24211882f42cbbe7a08"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="a5fb356e73f91b24211882f42cbbe7a08" args="" -->
+<a class="anchor" id="a5fb356e73f91b24211882f42cbbe7a08"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#a5fb356e73f91b24211882f42cbbe7a08">stp_mxml_node_s::last_child</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxml_node_s::last_child</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8831071db5a4b4df95ea3c5c2e95476b"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="a8831071db5a4b4df95ea3c5c2e95476b" args="" -->
+<a class="anchor" id="a8831071db5a4b4df95ea3c5c2e95476b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#a8831071db5a4b4df95ea3c5c2e95476b">stp_mxml_node_s::next</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxml_node_s::next</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a353df68e26a33380dcacda213a741487"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="a353df68e26a33380dcacda213a741487" args="" -->
+<a class="anchor" id="a353df68e26a33380dcacda213a741487"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#a353df68e26a33380dcacda213a741487">stp_mxml_node_s::parent</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxml_node_s::parent</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2174125dc205e7c760e4e8c9c9048ddf"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="a2174125dc205e7c760e4e8c9c9048ddf" args="" -->
+<a class="anchor" id="a2174125dc205e7c760e4e8c9c9048ddf"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#a2174125dc205e7c760e4e8c9c9048ddf">stp_mxml_node_s::prev</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_mxml_node_s::prev</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae1bff9adee67699067516eee014a7510"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="ae1bff9adee67699067516eee014a7510" args="" -->
+<a class="anchor" id="ae1bff9adee67699067516eee014a7510"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#ae1bff9adee67699067516eee014a7510">stp_mxml_node_s::type</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a3ff7086c4e8f1557e81c32a61420017e">stp_mxml_type_t</a> stp_mxml_node_s::type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aad44d6b2fe0842de0bbf1312035372cd"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="aad44d6b2fe0842de0bbf1312035372cd" args="" -->
+<a class="anchor" id="aad44d6b2fe0842de0bbf1312035372cd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#aad44d6b2fe0842de0bbf1312035372cd">stp_mxml_node_s::value</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a9a2e2ffccac3c73524e76f3e816d35bf">stp_mxml_value_t</a> stp_mxml_node_s::value</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 f316086..a64caa1 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_mxml_text_s Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,55 +42,56 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_mxml_text_s Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_mxml_text_s" -->
+
 <p><code>#include &lt;mxml.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#a76bcfbb8c3de4e1c597468d51ef47184">whitespace</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#aef1865e8cab7d5ab175c6e67f122be15">string</a></td></tr>
+<tr class="memitem:a76bcfbb8c3de4e1c597468d51ef47184"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#a76bcfbb8c3de4e1c597468d51ef47184">whitespace</a></td></tr>
+<tr class="memitem:aef1865e8cab7d5ab175c6e67f122be15"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#aef1865e8cab7d5ab175c6e67f122be15">string</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="aef1865e8cab7d5ab175c6e67f122be15"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="aef1865e8cab7d5ab175c6e67f122be15" args="" -->
+<a class="anchor" id="aef1865e8cab7d5ab175c6e67f122be15"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__text__s.html#aef1865e8cab7d5ab175c6e67f122be15">stp_mxml_text_s::string</a></td>
+          <td class="memname">char* stp_mxml_text_s::string</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a76bcfbb8c3de4e1c597468d51ef47184"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="a76bcfbb8c3de4e1c597468d51ef47184" args="" -->
+<a class="anchor" id="a76bcfbb8c3de4e1c597468d51ef47184"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__text__s.html#a76bcfbb8c3de4e1c597468d51ef47184">stp_mxml_text_s::whitespace</a></td>
+          <td class="memname">int stp_mxml_text_s::whitespace</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 abce6bb..937654c 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_mxml_value_s Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,69 +42,69 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_mxml_value_s Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_mxml_value_s" -->
+
 <p><code>#include &lt;mxml.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#a959d5315fd98119aa5d23d2b8d307c58">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#af29b9bbc769c278dad18ff2cb098ef6a">num_attrs</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#a69974b612f59fd3ef1d5db85db2d1a07">attrs</a></td></tr>
+<tr class="memitem:a959d5315fd98119aa5d23d2b8d307c58"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#a959d5315fd98119aa5d23d2b8d307c58">name</a></td></tr>
+<tr class="memitem:af29b9bbc769c278dad18ff2cb098ef6a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#af29b9bbc769c278dad18ff2cb098ef6a">num_attrs</a></td></tr>
+<tr class="memitem:a69974b612f59fd3ef1d5db85db2d1a07"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#ab271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#a69974b612f59fd3ef1d5db85db2d1a07">attrs</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a69974b612f59fd3ef1d5db85db2d1a07"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="a69974b612f59fd3ef1d5db85db2d1a07" args="" -->
+<a class="anchor" id="a69974b612f59fd3ef1d5db85db2d1a07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#a69974b612f59fd3ef1d5db85db2d1a07">stp_mxml_value_s::attrs</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#ab271ad8c2bb8d7e6b4b453ffe5589564">stp_mxml_attr_t</a>* stp_mxml_value_s::attrs</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a959d5315fd98119aa5d23d2b8d307c58"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="a959d5315fd98119aa5d23d2b8d307c58" args="" -->
+<a class="anchor" id="a959d5315fd98119aa5d23d2b8d307c58"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__mxml__value__s.html#a959d5315fd98119aa5d23d2b8d307c58">stp_mxml_value_s::name</a></td>
+          <td class="memname">char* stp_mxml_value_s::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af29b9bbc769c278dad18ff2cb098ef6a"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="af29b9bbc769c278dad18ff2cb098ef6a" args="" -->
+<a class="anchor" id="af29b9bbc769c278dad18ff2cb098ef6a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__mxml__value__s.html#af29b9bbc769c278dad18ff2cb098ef6a">stp_mxml_value_s::num_attrs</a></td>
+          <td class="memname">int stp_mxml_value_s::num_attrs</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index 4694276..9805933 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_papersize_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,208 +42,197 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_papersize_t Struct Reference<div class="ingroups"><a class="el" href="group__papersize.html">papersize</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_papersize_t" -->
+
 <p>The papersize data type.  
  <a href="structstp__papersize__t.html#details">More...</a></p>
 
 <p><code>#include &lt;paper.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a660431e579bf100782f7164b45597982">name</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Short unique name (not translated).  <a href="#a660431e579bf100782f7164b45597982"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a26e8b5d0ce282614f128dd9d4aeaf9f6">text</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#a26e8b5d0ce282614f128dd9d4aeaf9f6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a5cdc973122b8cc2e612d2dee306cbf1d">comment</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Comment.  <a href="#a5cdc973122b8cc2e612d2dee306cbf1d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#aedcca3776ddeb5ed815df3aa112147dd">width</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper width.  <a href="#aedcca3776ddeb5ed815df3aa112147dd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a040d59e39abdef9b12c929734fb7a08c">height</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper height.  <a href="#a040d59e39abdef9b12c929734fb7a08c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a7fc8acdb1d905d6ca4a0b9b247a6c48e">top</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Top margin.  <a href="#a7fc8acdb1d905d6ca4a0b9b247a6c48e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a9ceb7ef01ea56c990eddbef4140b34a0">left</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Left margin.  <a href="#a9ceb7ef01ea56c990eddbef4140b34a0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a9c7fcf4d0bac23817b6f56996fed4043">bottom</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Bottom margin.  <a href="#a9c7fcf4d0bac23817b6f56996fed4043"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a6899599f2f940e95e03545ff71e2b4c5">right</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Right margin.  <a href="#a6899599f2f940e95e03545ff71e2b4c5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a5692b27332297abca9e4715e3e9e3ce8">paper_unit</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="#a5692b27332297abca9e4715e3e9e3ce8"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a35412f4b1f65ab4697a6b2fb640d4576">paper_size_type</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper size type.  <a href="#a35412f4b1f65ab4697a6b2fb640d4576"></a><br/></td></tr>
+<tr class="memitem:a660431e579bf100782f7164b45597982"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a660431e579bf100782f7164b45597982">name</a></td></tr>
+<tr class="memdesc:a660431e579bf100782f7164b45597982"><td class="mdescLeft">&#160;</td><td class="mdescRight">Short unique name (not translated).  <a href="#a660431e579bf100782f7164b45597982"></a><br/></td></tr>
+<tr class="memitem:a26e8b5d0ce282614f128dd9d4aeaf9f6"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a26e8b5d0ce282614f128dd9d4aeaf9f6">text</a></td></tr>
+<tr class="memdesc:a26e8b5d0ce282614f128dd9d4aeaf9f6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#a26e8b5d0ce282614f128dd9d4aeaf9f6"></a><br/></td></tr>
+<tr class="memitem:a5cdc973122b8cc2e612d2dee306cbf1d"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a5cdc973122b8cc2e612d2dee306cbf1d">comment</a></td></tr>
+<tr class="memdesc:a5cdc973122b8cc2e612d2dee306cbf1d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Comment.  <a href="#a5cdc973122b8cc2e612d2dee306cbf1d"></a><br/></td></tr>
+<tr class="memitem:aedcca3776ddeb5ed815df3aa112147dd"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#aedcca3776ddeb5ed815df3aa112147dd">width</a></td></tr>
+<tr class="memdesc:aedcca3776ddeb5ed815df3aa112147dd"><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper width.  <a href="#aedcca3776ddeb5ed815df3aa112147dd"></a><br/></td></tr>
+<tr class="memitem:a040d59e39abdef9b12c929734fb7a08c"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a040d59e39abdef9b12c929734fb7a08c">height</a></td></tr>
+<tr class="memdesc:a040d59e39abdef9b12c929734fb7a08c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper height.  <a href="#a040d59e39abdef9b12c929734fb7a08c"></a><br/></td></tr>
+<tr class="memitem:a7fc8acdb1d905d6ca4a0b9b247a6c48e"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a7fc8acdb1d905d6ca4a0b9b247a6c48e">top</a></td></tr>
+<tr class="memdesc:a7fc8acdb1d905d6ca4a0b9b247a6c48e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Top margin.  <a href="#a7fc8acdb1d905d6ca4a0b9b247a6c48e"></a><br/></td></tr>
+<tr class="memitem:a9ceb7ef01ea56c990eddbef4140b34a0"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a9ceb7ef01ea56c990eddbef4140b34a0">left</a></td></tr>
+<tr class="memdesc:a9ceb7ef01ea56c990eddbef4140b34a0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Left margin.  <a href="#a9ceb7ef01ea56c990eddbef4140b34a0"></a><br/></td></tr>
+<tr class="memitem:a9c7fcf4d0bac23817b6f56996fed4043"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a9c7fcf4d0bac23817b6f56996fed4043">bottom</a></td></tr>
+<tr class="memdesc:a9c7fcf4d0bac23817b6f56996fed4043"><td class="mdescLeft">&#160;</td><td class="mdescRight">Bottom margin.  <a href="#a9c7fcf4d0bac23817b6f56996fed4043"></a><br/></td></tr>
+<tr class="memitem:a6899599f2f940e95e03545ff71e2b4c5"><td class="memItemLeft" align="right" valign="top">unsigned&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a6899599f2f940e95e03545ff71e2b4c5">right</a></td></tr>
+<tr class="memdesc:a6899599f2f940e95e03545ff71e2b4c5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Right margin.  <a href="#a6899599f2f940e95e03545ff71e2b4c5"></a><br/></td></tr>
+<tr class="memitem:a5692b27332297abca9e4715e3e9e3ce8"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a5692b27332297abca9e4715e3e9e3ce8">paper_unit</a></td></tr>
+<tr class="memdesc:a5692b27332297abca9e4715e3e9e3ce8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Units of measurement.  <a href="#a5692b27332297abca9e4715e3e9e3ce8"></a><br/></td></tr>
+<tr class="memitem:a35412f4b1f65ab4697a6b2fb640d4576"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#a35412f4b1f65ab4697a6b2fb640d4576">paper_size_type</a></td></tr>
+<tr class="memdesc:a35412f4b1f65ab4697a6b2fb640d4576"><td class="mdescLeft">&#160;</td><td class="mdescRight">Paper size type.  <a href="#a35412f4b1f65ab4697a6b2fb640d4576"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>The papersize data type. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a9c7fcf4d0bac23817b6f56996fed4043"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="a9c7fcf4d0bac23817b6f56996fed4043" args="" -->
+<a class="anchor" id="a9c7fcf4d0bac23817b6f56996fed4043"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#a9c7fcf4d0bac23817b6f56996fed4043">stp_papersize_t::bottom</a></td>
+          <td class="memname">unsigned stp_papersize_t::bottom</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Bottom margin. </p>
 
 </div>
 </div>
-<a class="anchor" id="a5cdc973122b8cc2e612d2dee306cbf1d"></a><!-- doxytag: member="stp_papersize_t::comment" ref="a5cdc973122b8cc2e612d2dee306cbf1d" args="" -->
+<a class="anchor" id="a5cdc973122b8cc2e612d2dee306cbf1d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#a5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t::comment</a></td>
+          <td class="memname">char* stp_papersize_t::comment</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Comment. </p>
 
 </div>
 </div>
-<a class="anchor" id="a040d59e39abdef9b12c929734fb7a08c"></a><!-- doxytag: member="stp_papersize_t::height" ref="a040d59e39abdef9b12c929734fb7a08c" args="" -->
+<a class="anchor" id="a040d59e39abdef9b12c929734fb7a08c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#a040d59e39abdef9b12c929734fb7a08c">stp_papersize_t::height</a></td>
+          <td class="memname">unsigned stp_papersize_t::height</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Paper height. </p>
 
 </div>
 </div>
-<a class="anchor" id="a9ceb7ef01ea56c990eddbef4140b34a0"></a><!-- doxytag: member="stp_papersize_t::left" ref="a9ceb7ef01ea56c990eddbef4140b34a0" args="" -->
+<a class="anchor" id="a9ceb7ef01ea56c990eddbef4140b34a0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#a9ceb7ef01ea56c990eddbef4140b34a0">stp_papersize_t::left</a></td>
+          <td class="memname">unsigned stp_papersize_t::left</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Left margin. </p>
 
 </div>
 </div>
-<a class="anchor" id="a660431e579bf100782f7164b45597982"></a><!-- doxytag: member="stp_papersize_t::name" ref="a660431e579bf100782f7164b45597982" args="" -->
+<a class="anchor" id="a660431e579bf100782f7164b45597982"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#a660431e579bf100782f7164b45597982">stp_papersize_t::name</a></td>
+          <td class="memname">char* stp_papersize_t::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Short unique name (not translated). </p>
 
 </div>
 </div>
-<a class="anchor" id="a35412f4b1f65ab4697a6b2fb640d4576"></a><!-- doxytag: member="stp_papersize_t::paper_size_type" ref="a35412f4b1f65ab4697a6b2fb640d4576" args="" -->
+<a class="anchor" id="a35412f4b1f65ab4697a6b2fb640d4576"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> <a class="el" href="structstp__papersize__t.html#a35412f4b1f65ab4697a6b2fb640d4576">stp_papersize_t::paper_size_type</a></td>
+          <td class="memname"><a class="el" href="group__papersize.html#ga31255c4eebfaaf5cd319e5638a6a3069">stp_papersize_type_t</a> stp_papersize_t::paper_size_type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Paper size type. </p>
 
 </div>
 </div>
-<a class="anchor" id="a5692b27332297abca9e4715e3e9e3ce8"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="a5692b27332297abca9e4715e3e9e3ce8" args="" -->
+<a class="anchor" id="a5692b27332297abca9e4715e3e9e3ce8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#a5692b27332297abca9e4715e3e9e3ce8">stp_papersize_t::paper_unit</a></td>
+          <td class="memname"><a class="el" href="group__papersize.html#ga72e4619e373e38dc02dc452813b7b958">stp_papersize_unit_t</a> stp_papersize_t::paper_unit</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Units of measurement. </p>
 
 </div>
 </div>
-<a class="anchor" id="a6899599f2f940e95e03545ff71e2b4c5"></a><!-- doxytag: member="stp_papersize_t::right" ref="a6899599f2f940e95e03545ff71e2b4c5" args="" -->
+<a class="anchor" id="a6899599f2f940e95e03545ff71e2b4c5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#a6899599f2f940e95e03545ff71e2b4c5">stp_papersize_t::right</a></td>
+          <td class="memname">unsigned stp_papersize_t::right</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Right margin. </p>
 
 </div>
 </div>
-<a class="anchor" id="a26e8b5d0ce282614f128dd9d4aeaf9f6"></a><!-- doxytag: member="stp_papersize_t::text" ref="a26e8b5d0ce282614f128dd9d4aeaf9f6" args="" -->
+<a class="anchor" id="a26e8b5d0ce282614f128dd9d4aeaf9f6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstp__papersize__t.html#a26e8b5d0ce282614f128dd9d4aeaf9f6">stp_papersize_t::text</a></td>
+          <td class="memname">char* stp_papersize_t::text</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Long descriptive name (translated). </p>
 
 </div>
 </div>
-<a class="anchor" id="a7fc8acdb1d905d6ca4a0b9b247a6c48e"></a><!-- doxytag: member="stp_papersize_t::top" ref="a7fc8acdb1d905d6ca4a0b9b247a6c48e" args="" -->
+<a class="anchor" id="a7fc8acdb1d905d6ca4a0b9b247a6c48e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#a7fc8acdb1d905d6ca4a0b9b247a6c48e">stp_papersize_t::top</a></td>
+          <td class="memname">unsigned stp_papersize_t::top</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Top margin. </p>
 
 </div>
 </div>
-<a class="anchor" id="aedcca3776ddeb5ed815df3aa112147dd"></a><!-- doxytag: member="stp_papersize_t::width" ref="aedcca3776ddeb5ed815df3aa112147dd" args="" -->
+<a class="anchor" id="aedcca3776ddeb5ed815df3aa112147dd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned <a class="el" href="structstp__papersize__t.html#aedcca3776ddeb5ed815df3aa112147dd">stp_papersize_t::width</a></td>
+          <td class="memname">unsigned stp_papersize_t::width</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 <p>Paper width. </p>
 
@@ -246,9 +241,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</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 619451b..6f0d180 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_param_string_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,53 +42,51 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_param_string_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_param_string_t" -->
+
 <p>String parameter.  
  <a href="structstp__param__string__t.html#details">More...</a></p>
 
 <p><code>#include &lt;string-list.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#ac4ccea0dded827b9acdb2d22aa25857b">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#adb032e80e118c233adb9f27544920bd1">text</a></td></tr>
+<tr class="memitem:ac4ccea0dded827b9acdb2d22aa25857b"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#ac4ccea0dded827b9acdb2d22aa25857b">name</a></td></tr>
+<tr class="memitem:adb032e80e118c233adb9f27544920bd1"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#adb032e80e118c233adb9f27544920bd1">text</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>String parameter. </p>
 <p>Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ac4ccea0dded827b9acdb2d22aa25857b"></a><!-- doxytag: member="stp_param_string_t::name" ref="ac4ccea0dded827b9acdb2d22aa25857b" args="" -->
+<a class="anchor" id="ac4ccea0dded827b9acdb2d22aa25857b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__param__string__t.html#ac4ccea0dded827b9acdb2d22aa25857b">stp_param_string_t::name</a></td>
+          <td class="memname">const char* stp_param_string_t::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Option name (key, untranslated). </p>
 
 </div>
 </div>
-<a class="anchor" id="adb032e80e118c233adb9f27544920bd1"></a><!-- doxytag: member="stp_param_string_t::text" ref="adb032e80e118c233adb9f27544920bd1" args="" -->
+<a class="anchor" id="adb032e80e118c233adb9f27544920bd1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char * <a class="el" href="structstp__param__string__t.html#adb032e80e118c233adb9f27544920bd1">stp_param_string_t::text</a></td>
+          <td class="memname">const char * stp_param_string_t::text</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Human-readable (translated) text. </p>
 
 </div>
@@ -90,9 +94,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 5a1a1b4..16bf792 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_parameter_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,402 +42,377 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_parameter_t Struct Reference<div class="ingroups"><a class="el" href="group__vars.html">vars</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_parameter_t" -->
+
 <p>Parameter description.  
  <a href="structstp__parameter__t.html#details">More...</a></p>
 
 <p><code>#include &lt;vars.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a092430e582e7560fb532f546f78ca70c">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a396e4980926c200e9ce4454f19e7311a">text</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a2cb67e4324a017746ca9bfda772aa50f">category</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a9f0637d6b97f0daa3122840eb2bd13db">help</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#aebe5dea02843240fe03461abf007f154">p_type</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a410388e541bdb14fbd0af2984e229217">p_class</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a2a4a1195c06243e08acb03475fb1e7cc">p_level</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#ace4d02e3665f9cdfe83ed7dd559e1c1a">is_mandatory</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a8b1af01f0874c79b6dbc4d0eca432952">is_active</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a79bc0b76d5d5e238ddd205aa4a97ebad">channel</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a56100203c262c60d4cb18c7a49cde27d">verify_this_parameter</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a4421135f9985be49d156cbc9aa74c710">read_only</a></td></tr>
-<tr><td class="memItemLeft" >union {</td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ad64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a12fc8869d3056687e576af63c6fbd675">dbl</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a32ee2ba322a0b7d16520f52ded591cc5">integer</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a29505a2b48cd755e10cedf01f3683d61">dimension</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#abfe1adab94129fefdafe9e64be135fb6">str</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
-<tr><td class="memItemLeft" valign="top">}&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#abb297424036e868212f5086d5c5235fe">bounds</a></td></tr>
-<tr><td class="memItemLeft" >union {</td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ad64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;double&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a222137e14dadb05adfbdde061679ce61">dbl</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a5d8633772783bb1c66ffa66d7f720a9d">dimension</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a3563548500d3ec917d8e1cf88c34f8cd">integer</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a74aaa2515728660657133ca3191e422c">boolean</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;const char *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ae4409d001a6f1b7f8bbf237016900e48">str</a></td></tr>
-<tr><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
-<tr><td class="memItemLeft" valign="top">}&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a79042d88fa0ab284a8e3e4ad7b969f90">deflt</a></td></tr>
+<tr class="memitem:a092430e582e7560fb532f546f78ca70c"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a092430e582e7560fb532f546f78ca70c">name</a></td></tr>
+<tr class="memitem:a396e4980926c200e9ce4454f19e7311a"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a396e4980926c200e9ce4454f19e7311a">text</a></td></tr>
+<tr class="memitem:a2cb67e4324a017746ca9bfda772aa50f"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a2cb67e4324a017746ca9bfda772aa50f">category</a></td></tr>
+<tr class="memitem:a9f0637d6b97f0daa3122840eb2bd13db"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a9f0637d6b97f0daa3122840eb2bd13db">help</a></td></tr>
+<tr class="memitem:aebe5dea02843240fe03461abf007f154"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#aebe5dea02843240fe03461abf007f154">p_type</a></td></tr>
+<tr class="memitem:a410388e541bdb14fbd0af2984e229217"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a410388e541bdb14fbd0af2984e229217">p_class</a></td></tr>
+<tr class="memitem:a2a4a1195c06243e08acb03475fb1e7cc"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a2a4a1195c06243e08acb03475fb1e7cc">p_level</a></td></tr>
+<tr class="memitem:ace4d02e3665f9cdfe83ed7dd559e1c1a"><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#ace4d02e3665f9cdfe83ed7dd559e1c1a">is_mandatory</a></td></tr>
+<tr class="memitem:a8b1af01f0874c79b6dbc4d0eca432952"><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a8b1af01f0874c79b6dbc4d0eca432952">is_active</a></td></tr>
+<tr class="memitem:a79bc0b76d5d5e238ddd205aa4a97ebad"><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a79bc0b76d5d5e238ddd205aa4a97ebad">channel</a></td></tr>
+<tr class="memitem:a56100203c262c60d4cb18c7a49cde27d"><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a56100203c262c60d4cb18c7a49cde27d">verify_this_parameter</a></td></tr>
+<tr class="memitem:a4421135f9985be49d156cbc9aa74c710"><td class="memItemLeft" align="right" valign="top">unsigned char&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a4421135f9985be49d156cbc9aa74c710">read_only</a></td></tr>
+<tr class="memitem:abb297424036e868212f5086d5c5235fe"><td class="memItemLeft" >union {</td></tr>
+<tr class="memitem:a961c3d2bda59bd51442ccd91e3a3c4db"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ad64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
+<tr class="memitem:aaaf1168d0e60e5b0d14d6eac3195d155"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a12fc8869d3056687e576af63c6fbd675">dbl</a></td></tr>
+<tr class="memitem:a1abb03e94bd77eddd2c44e6a177d3415"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a32ee2ba322a0b7d16520f52ded591cc5">integer</a></td></tr>
+<tr class="memitem:a546499b136b121799bc75ad56fd286d5"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a29505a2b48cd755e10cedf01f3683d61">dimension</a></td></tr>
+<tr class="memitem:a665bbcb7f57f89d704be5c987e1c10df"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#abfe1adab94129fefdafe9e64be135fb6">str</a></td></tr>
+<tr class="memitem:a094c908ad9a0a4ea85347626a8b04132"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
+<tr class="memitem:abb297424036e868212f5086d5c5235fe"><td class="memItemLeft" valign="top">}&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#abb297424036e868212f5086d5c5235fe">bounds</a></td></tr>
+<tr class="memitem:a79042d88fa0ab284a8e3e4ad7b969f90"><td class="memItemLeft" >union {</td></tr>
+<tr class="memitem:ada5683dbd1673eb24636556c8dd3a609"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ad64f0c31d200d3d413725621b3ef9133">curve</a></td></tr>
+<tr class="memitem:a493fa67847909678ae85e87e10513e44"><td class="memItemLeft" >&#160;&#160;&#160;double&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a222137e14dadb05adfbdde061679ce61">dbl</a></td></tr>
+<tr class="memitem:a1b8941a7efb86e8f4b2e93f35076a399"><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a5d8633772783bb1c66ffa66d7f720a9d">dimension</a></td></tr>
+<tr class="memitem:a41113c2c977223b166b72c99bca983f0"><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a3563548500d3ec917d8e1cf88c34f8cd">integer</a></td></tr>
+<tr class="memitem:a747a79ce320a5b7658a98ab72581f994"><td class="memItemLeft" >&#160;&#160;&#160;int&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a74aaa2515728660657133ca3191e422c">boolean</a></td></tr>
+<tr class="memitem:a23b79b91bf3204e5236cbbc75af274e1"><td class="memItemLeft" >&#160;&#160;&#160;const char *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#ae4409d001a6f1b7f8bbf237016900e48">str</a></td></tr>
+<tr class="memitem:a288d935eeb30de6487aeba0d4f5d49ee"><td class="memItemLeft" >&#160;&#160;&#160;<a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;&#160;&#160;<a class="el" href="structstp__parameter__t.html#a28aef58241d3a500968ca65df099ee3a">array</a></td></tr>
+<tr class="memitem:a79042d88fa0ab284a8e3e4ad7b969f90"><td class="memItemLeft" valign="top">}&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#a79042d88fa0ab284a8e3e4ad7b969f90">deflt</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Parameter description. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a28aef58241d3a500968ca65df099ee3a"></a><!-- doxytag: member="stp_parameter_t::array" ref="a28aef58241d3a500968ca65df099ee3a" args="" -->
+<a class="anchor" id="a28aef58241d3a500968ca65df099ee3a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#a28aef58241d3a500968ca65df099ee3a">stp_parameter_t::array</a></td>
+          <td class="memname"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_parameter_t::array</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>array parameter value.</p>
 <p>Default array parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a74aaa2515728660657133ca3191e422c"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="a74aaa2515728660657133ca3191e422c" args="" -->
+<a class="anchor" id="a74aaa2515728660657133ca3191e422c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__parameter__t.html#a74aaa2515728660657133ca3191e422c">stp_parameter_t::boolean</a></td>
+          <td class="memname">int stp_parameter_t::boolean</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Default boolean parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="abb297424036e868212f5086d5c5235fe"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="abb297424036e868212f5086d5c5235fe" args="" -->
+<a class="anchor" id="abb297424036e868212f5086d5c5235fe"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">union { ... }   <a class="el" href="structstp__parameter__t.html#abb297424036e868212f5086d5c5235fe">stp_parameter_t::bounds</a></td>
+          <td class="memname">union { ... }   stp_parameter_t::bounds</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Limits on the values the parameter may take. </p>
 
 </div>
 </div>
-<a class="anchor" id="a2cb67e4324a017746ca9bfda772aa50f"></a><!-- doxytag: member="stp_parameter_t::category" ref="a2cb67e4324a017746ca9bfda772aa50f" args="" -->
+<a class="anchor" id="a2cb67e4324a017746ca9bfda772aa50f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#a2cb67e4324a017746ca9bfda772aa50f">stp_parameter_t::category</a></td>
+          <td class="memname">const char* stp_parameter_t::category</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>User-visible category name. </p>
 
 </div>
 </div>
-<a class="anchor" id="a79bc0b76d5d5e238ddd205aa4a97ebad"></a><!-- doxytag: member="stp_parameter_t::channel" ref="a79bc0b76d5d5e238ddd205aa4a97ebad" args="" -->
+<a class="anchor" id="a79bc0b76d5d5e238ddd205aa4a97ebad"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#a79bc0b76d5d5e238ddd205aa4a97ebad">stp_parameter_t::channel</a></td>
+          <td class="memname">unsigned char stp_parameter_t::channel</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>The channel to which this parameter applies </p>
 
 </div>
 </div>
-<a class="anchor" id="ad64f0c31d200d3d413725621b3ef9133"></a><!-- doxytag: member="stp_parameter_t::curve" ref="ad64f0c31d200d3d413725621b3ef9133" args="" -->
+<a class="anchor" id="ad64f0c31d200d3d413725621b3ef9133"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#ad64f0c31d200d3d413725621b3ef9133">stp_parameter_t::curve</a></td>
+          <td class="memname"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_parameter_t::curve</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>curve parameter value.</p>
 <p>Default curve parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a222137e14dadb05adfbdde061679ce61"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="a222137e14dadb05adfbdde061679ce61" args="" -->
+<a class="anchor" id="a12fc8869d3056687e576af63c6fbd675"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__parameter__t.html#a12fc8869d3056687e576af63c6fbd675">stp_parameter_t::dbl</a></td>
+          <td class="memname"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> stp_parameter_t::dbl</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
-<p>Default double parameter value. </p>
+</div><div class="memdoc">
+<p>double_bound parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a12fc8869d3056687e576af63c6fbd675"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="a12fc8869d3056687e576af63c6fbd675" args="" -->
+<a class="anchor" id="a222137e14dadb05adfbdde061679ce61"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> <a class="el" href="structstp__parameter__t.html#a12fc8869d3056687e576af63c6fbd675">stp_parameter_t::dbl</a></td>
+          <td class="memname">double stp_parameter_t::dbl</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
-<p>double_bound parameter value. </p>
+</div><div class="memdoc">
+<p>Default double parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a79042d88fa0ab284a8e3e4ad7b969f90"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="a79042d88fa0ab284a8e3e4ad7b969f90" args="" -->
+<a class="anchor" id="a79042d88fa0ab284a8e3e4ad7b969f90"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">union { ... }   <a class="el" href="structstp__parameter__t.html#a79042d88fa0ab284a8e3e4ad7b969f90">stp_parameter_t::deflt</a></td>
+          <td class="memname">union { ... }   stp_parameter_t::deflt</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Default value of the parameter. </p>
 
 </div>
 </div>
-<a class="anchor" id="a29505a2b48cd755e10cedf01f3683d61"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="a29505a2b48cd755e10cedf01f3683d61" args="" -->
+<a class="anchor" id="a29505a2b48cd755e10cedf01f3683d61"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#a29505a2b48cd755e10cedf01f3683d61">stp_parameter_t::dimension</a></td>
+          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> stp_parameter_t::dimension</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>int_bound parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a5d8633772783bb1c66ffa66d7f720a9d"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="a5d8633772783bb1c66ffa66d7f720a9d" args="" -->
+<a class="anchor" id="a5d8633772783bb1c66ffa66d7f720a9d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__parameter__t.html#a29505a2b48cd755e10cedf01f3683d61">stp_parameter_t::dimension</a></td>
+          <td class="memname">int stp_parameter_t::dimension</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Default dimension parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a9f0637d6b97f0daa3122840eb2bd13db"></a><!-- doxytag: member="stp_parameter_t::help" ref="a9f0637d6b97f0daa3122840eb2bd13db" args="" -->
+<a class="anchor" id="a9f0637d6b97f0daa3122840eb2bd13db"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#a9f0637d6b97f0daa3122840eb2bd13db">stp_parameter_t::help</a></td>
+          <td class="memname">const char* stp_parameter_t::help</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Help string. </p>
 
 </div>
 </div>
-<a class="anchor" id="a3563548500d3ec917d8e1cf88c34f8cd"></a><!-- doxytag: member="stp_parameter_t::integer" ref="a3563548500d3ec917d8e1cf88c34f8cd" args="" -->
+<a class="anchor" id="a32ee2ba322a0b7d16520f52ded591cc5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__parameter__t.html#a32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t::integer</a></td>
+          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> stp_parameter_t::integer</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
-<p>Default int parameter value. </p>
+</div><div class="memdoc">
+<p>int_bound parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a32ee2ba322a0b7d16520f52ded591cc5"></a><!-- doxytag: member="stp_parameter_t::integer" ref="a32ee2ba322a0b7d16520f52ded591cc5" args="" -->
+<a class="anchor" id="a3563548500d3ec917d8e1cf88c34f8cd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#a32ee2ba322a0b7d16520f52ded591cc5">stp_parameter_t::integer</a></td>
+          <td class="memname">int stp_parameter_t::integer</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
-<p>int_bound parameter value. </p>
+</div><div class="memdoc">
+<p>Default int parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a8b1af01f0874c79b6dbc4d0eca432952"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="a8b1af01f0874c79b6dbc4d0eca432952" args="" -->
+<a class="anchor" id="a8b1af01f0874c79b6dbc4d0eca432952"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#a8b1af01f0874c79b6dbc4d0eca432952">stp_parameter_t::is_active</a></td>
+          <td class="memname">unsigned char stp_parameter_t::is_active</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Is the parameter active? </p>
 
 </div>
 </div>
-<a class="anchor" id="ace4d02e3665f9cdfe83ed7dd559e1c1a"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="ace4d02e3665f9cdfe83ed7dd559e1c1a" args="" -->
+<a class="anchor" id="ace4d02e3665f9cdfe83ed7dd559e1c1a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#ace4d02e3665f9cdfe83ed7dd559e1c1a">stp_parameter_t::is_mandatory</a></td>
+          <td class="memname">unsigned char stp_parameter_t::is_mandatory</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>The parameter is required, even when set inactive. </p>
 
 </div>
 </div>
-<a class="anchor" id="a092430e582e7560fb532f546f78ca70c"></a><!-- doxytag: member="stp_parameter_t::name" ref="a092430e582e7560fb532f546f78ca70c" args="" -->
+<a class="anchor" id="a092430e582e7560fb532f546f78ca70c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#a092430e582e7560fb532f546f78ca70c">stp_parameter_t::name</a></td>
+          <td class="memname">const char* stp_parameter_t::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Internal name (key). </p>
 
 </div>
 </div>
-<a class="anchor" id="a410388e541bdb14fbd0af2984e229217"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="a410388e541bdb14fbd0af2984e229217" args="" -->
+<a class="anchor" id="a410388e541bdb14fbd0af2984e229217"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#a410388e541bdb14fbd0af2984e229217">stp_parameter_t::p_class</a></td>
+          <td class="memname"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> stp_parameter_t::p_class</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Parameter class. </p>
 
 </div>
 </div>
-<a class="anchor" id="a2a4a1195c06243e08acb03475fb1e7cc"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="a2a4a1195c06243e08acb03475fb1e7cc" args="" -->
+<a class="anchor" id="a2a4a1195c06243e08acb03475fb1e7cc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#a2a4a1195c06243e08acb03475fb1e7cc">stp_parameter_t::p_level</a></td>
+          <td class="memname"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> stp_parameter_t::p_level</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Parameter level. </p>
 
 </div>
 </div>
-<a class="anchor" id="aebe5dea02843240fe03461abf007f154"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="aebe5dea02843240fe03461abf007f154" args="" -->
+<a class="anchor" id="aebe5dea02843240fe03461abf007f154"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#aebe5dea02843240fe03461abf007f154">stp_parameter_t::p_type</a></td>
+          <td class="memname"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> stp_parameter_t::p_type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Parameter type. </p>
 
 </div>
 </div>
-<a class="anchor" id="a4421135f9985be49d156cbc9aa74c710"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="a4421135f9985be49d156cbc9aa74c710" args="" -->
+<a class="anchor" id="a4421135f9985be49d156cbc9aa74c710"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#a4421135f9985be49d156cbc9aa74c710">stp_parameter_t::read_only</a></td>
+          <td class="memname">unsigned char stp_parameter_t::read_only</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="abfe1adab94129fefdafe9e64be135fb6"></a><!-- doxytag: member="stp_parameter_t::str" ref="abfe1adab94129fefdafe9e64be135fb6" args="" -->
+<a class="anchor" id="abfe1adab94129fefdafe9e64be135fb6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#abfe1adab94129fefdafe9e64be135fb6">stp_parameter_t::str</a></td>
+          <td class="memname"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>* stp_parameter_t::str</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>string_list parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="ae4409d001a6f1b7f8bbf237016900e48"></a><!-- doxytag: member="stp_parameter_t::str" ref="ae4409d001a6f1b7f8bbf237016900e48" args="" -->
+<a class="anchor" id="ae4409d001a6f1b7f8bbf237016900e48"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#abfe1adab94129fefdafe9e64be135fb6">stp_parameter_t::str</a></td>
+          <td class="memname">const char* stp_parameter_t::str</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Default string parameter value. </p>
 
 </div>
 </div>
-<a class="anchor" id="a396e4980926c200e9ce4454f19e7311a"></a><!-- doxytag: member="stp_parameter_t::text" ref="a396e4980926c200e9ce4454f19e7311a" args="" -->
+<a class="anchor" id="a396e4980926c200e9ce4454f19e7311a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char* <a class="el" href="structstp__parameter__t.html#a396e4980926c200e9ce4454f19e7311a">stp_parameter_t::text</a></td>
+          <td class="memname">const char* stp_parameter_t::text</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>User-visible name. </p>
 
 </div>
 </div>
-<a class="anchor" id="a56100203c262c60d4cb18c7a49cde27d"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="a56100203c262c60d4cb18c7a49cde27d" args="" -->
+<a class="anchor" id="a56100203c262c60d4cb18c7a49cde27d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">unsigned char <a class="el" href="structstp__parameter__t.html#a56100203c262c60d4cb18c7a49cde27d">stp_parameter_t::verify_this_parameter</a></td>
+          <td class="memname">unsigned char stp_parameter_t::verify_this_parameter</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Should the verify system check this parameter? </p>
 
 </div>
@@ -439,9 +420,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index aa0e19a..81544f7 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_pass_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,111 +42,108 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_pass_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_pass_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#afdb7d267dad9bfc69e8deb86da07ee7b">pass</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a462d1714bab638212fcae32b869c11d2">missingstartrows</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#ae93d9d32f282f62426160626ff6c5ca3">logicalpassstart</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a0da3d73932d6c07aceaf4bce93cf6163">physpassstart</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a4d75f7e07ebbffb75c2a7f36f43b3c9e">physpassend</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#aa4a3363d8de9121ba3d8bf28076b1c89">subpass</a></td></tr>
+<tr class="memitem:afdb7d267dad9bfc69e8deb86da07ee7b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#afdb7d267dad9bfc69e8deb86da07ee7b">pass</a></td></tr>
+<tr class="memitem:a462d1714bab638212fcae32b869c11d2"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a462d1714bab638212fcae32b869c11d2">missingstartrows</a></td></tr>
+<tr class="memitem:ae93d9d32f282f62426160626ff6c5ca3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#ae93d9d32f282f62426160626ff6c5ca3">logicalpassstart</a></td></tr>
+<tr class="memitem:a0da3d73932d6c07aceaf4bce93cf6163"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a0da3d73932d6c07aceaf4bce93cf6163">physpassstart</a></td></tr>
+<tr class="memitem:a4d75f7e07ebbffb75c2a7f36f43b3c9e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#a4d75f7e07ebbffb75c2a7f36f43b3c9e">physpassend</a></td></tr>
+<tr class="memitem:aa4a3363d8de9121ba3d8bf28076b1c89"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#aa4a3363d8de9121ba3d8bf28076b1c89">subpass</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ae93d9d32f282f62426160626ff6c5ca3"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="ae93d9d32f282f62426160626ff6c5ca3" args="" -->
+<a class="anchor" id="ae93d9d32f282f62426160626ff6c5ca3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#ae93d9d32f282f62426160626ff6c5ca3">stp_pass_t::logicalpassstart</a></td>
+          <td class="memname">int stp_pass_t::logicalpassstart</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a462d1714bab638212fcae32b869c11d2"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="a462d1714bab638212fcae32b869c11d2" args="" -->
+<a class="anchor" id="a462d1714bab638212fcae32b869c11d2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#a462d1714bab638212fcae32b869c11d2">stp_pass_t::missingstartrows</a></td>
+          <td class="memname">int stp_pass_t::missingstartrows</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afdb7d267dad9bfc69e8deb86da07ee7b"></a><!-- doxytag: member="stp_pass_t::pass" ref="afdb7d267dad9bfc69e8deb86da07ee7b" args="" -->
+<a class="anchor" id="afdb7d267dad9bfc69e8deb86da07ee7b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#afdb7d267dad9bfc69e8deb86da07ee7b">stp_pass_t::pass</a></td>
+          <td class="memname">int stp_pass_t::pass</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4d75f7e07ebbffb75c2a7f36f43b3c9e"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="a4d75f7e07ebbffb75c2a7f36f43b3c9e" args="" -->
+<a class="anchor" id="a4d75f7e07ebbffb75c2a7f36f43b3c9e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#a4d75f7e07ebbffb75c2a7f36f43b3c9e">stp_pass_t::physpassend</a></td>
+          <td class="memname">int stp_pass_t::physpassend</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0da3d73932d6c07aceaf4bce93cf6163"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="a0da3d73932d6c07aceaf4bce93cf6163" args="" -->
+<a class="anchor" id="a0da3d73932d6c07aceaf4bce93cf6163"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#a0da3d73932d6c07aceaf4bce93cf6163">stp_pass_t::physpassstart</a></td>
+          <td class="memname">int stp_pass_t::physpassstart</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa4a3363d8de9121ba3d8bf28076b1c89"></a><!-- doxytag: member="stp_pass_t::subpass" ref="aa4a3363d8de9121ba3d8bf28076b1c89" args="" -->
+<a class="anchor" id="aa4a3363d8de9121ba3d8bf28076b1c89"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__pass__t.html#aa4a3363d8de9121ba3d8bf28076b1c89">stp_pass_t::subpass</a></td>
+          <td class="memname">int stp_pass_t::subpass</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 09c604f..1caee32 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_printfuncs_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,209 +42,199 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_printfuncs_t Struct Reference<div class="ingroups"><a class="el" href="group__printer.html">printer</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_printfuncs_t" -->
+
 <p><code>#include &lt;printers.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a19dc0ba4351a154cf9450ac4fce1ca1a">list_parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#ac4eab991ca917968e0f264b7105faaa4">parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a102e995ff1ce583f84e38409852bf95f">media_size</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a68c9339cc1b74382ec07eed78c2bd501">imageable_area</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a3661a4612e62e8e5aef31eaab345675c">maximum_imageable_area</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a36e471ee24b92cfd67390a025cbc427e">limit</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a7704d7a1e997039deedfdf76a353c35d">print</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a18e0da9638360173e0d75d839ce72b92">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a444ec86f3fe02ac479cbf2fc152d3423">describe_output</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a948b6d7219dbb30f47a93eef2f85fde2">verify</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a81fa6b507a316a8d6d7404b29920936e">end_job</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a1aee9299429a813e60c7c131ccf93c74">get_external_options</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a19dc0ba4351a154cf9450ac4fce1ca1a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a19dc0ba4351a154cf9450ac4fce1ca1a">list_parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ac4eab991ca917968e0f264b7105faaa4"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#ac4eab991ca917968e0f264b7105faaa4">parameters</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
+<tr class="memitem:a102e995ff1ce583f84e38409852bf95f"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a102e995ff1ce583f84e38409852bf95f">media_size</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr class="memitem:a68c9339cc1b74382ec07eed78c2bd501"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a68c9339cc1b74382ec07eed78c2bd501">imageable_area</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memitem:a3661a4612e62e8e5aef31eaab345675c"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a3661a4612e62e8e5aef31eaab345675c">maximum_imageable_area</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memitem:a36e471ee24b92cfd67390a025cbc427e"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a36e471ee24b92cfd67390a025cbc427e">limit</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr class="memitem:a7704d7a1e997039deedfdf76a353c35d"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a7704d7a1e997039deedfdf76a353c35d">print</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:a18e0da9638360173e0d75d839ce72b92"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a18e0da9638360173e0d75d839ce72b92">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr class="memitem:a444ec86f3fe02ac479cbf2fc152d3423"><td class="memItemLeft" align="right" valign="top">const char *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a444ec86f3fe02ac479cbf2fc152d3423">describe_output</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a948b6d7219dbb30f47a93eef2f85fde2"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a948b6d7219dbb30f47a93eef2f85fde2">verify</a> )(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a5c99986ad02cbcc4dce313bc7f5293fc"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a5c99986ad02cbcc4dce313bc7f5293fc">start_job</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:a81fa6b507a316a8d6d7404b29920936e"><td class="memItemLeft" align="right" valign="top">int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a81fa6b507a316a8d6d7404b29920936e">end_job</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td></tr>
+<tr class="memitem:a1aee9299429a813e60c7c131ccf93c74"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#a1aee9299429a813e60c7c131ccf93c74">get_external_options</a> )(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a444ec86f3fe02ac479cbf2fc152d3423"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="a444ec86f3fe02ac479cbf2fc152d3423" args=")(const stp_vars_t *v)" -->
+<a class="anchor" id="a444ec86f3fe02ac479cbf2fc152d3423"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const char*(* <a class="el" href="structstp__printfuncs__t.html#a444ec86f3fe02ac479cbf2fc152d3423">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
+          <td class="memname">const char*(* stp_printfuncs_t::describe_output)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a18e0da9638360173e0d75d839ce72b92"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="a18e0da9638360173e0d75d839ce72b92" args=")(const stp_vars_t *v, int *x, int *y)" -->
+<a class="anchor" id="a18e0da9638360173e0d75d839ce72b92"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#a18e0da9638360173e0d75d839ce72b92">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td>
+          <td class="memname">void(* stp_printfuncs_t::describe_resolution)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a81fa6b507a316a8d6d7404b29920936e"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="a81fa6b507a316a8d6d7404b29920936e" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="a81fa6b507a316a8d6d7404b29920936e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#a81fa6b507a316a8d6d7404b29920936e">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td>
+          <td class="memname">int(* stp_printfuncs_t::end_job)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1aee9299429a813e60c7c131ccf93c74"></a><!-- doxytag: member="stp_printfuncs_t::get_external_options" ref="a1aee9299429a813e60c7c131ccf93c74" args=")(const stp_vars_t *v)" -->
+<a class="anchor" id="a1aee9299429a813e60c7c131ccf93c74"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>*(* <a class="el" href="structstp__printfuncs__t.html#a1aee9299429a813e60c7c131ccf93c74">stp_printfuncs_t::get_external_options</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
+          <td class="memname"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a>*(* stp_printfuncs_t::get_external_options)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a68c9339cc1b74382ec07eed78c2bd501"></a><!-- doxytag: member="stp_printfuncs_t::imageable_area" ref="a68c9339cc1b74382ec07eed78c2bd501" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<a class="anchor" id="a68c9339cc1b74382ec07eed78c2bd501"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#a68c9339cc1b74382ec07eed78c2bd501">stp_printfuncs_t::imageable_area</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td>
+          <td class="memname">void(* stp_printfuncs_t::imageable_area)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a36e471ee24b92cfd67390a025cbc427e"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="a36e471ee24b92cfd67390a025cbc427e" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" -->
+<a class="anchor" id="a36e471ee24b92cfd67390a025cbc427e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#a36e471ee24b92cfd67390a025cbc427e">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td>
+          <td class="memname">void(* stp_printfuncs_t::limit)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a19dc0ba4351a154cf9450ac4fce1ca1a"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="a19dc0ba4351a154cf9450ac4fce1ca1a" args=")(const stp_vars_t *v)" -->
+<a class="anchor" id="a19dc0ba4351a154cf9450ac4fce1ca1a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* <a class="el" href="structstp__printfuncs__t.html#a19dc0ba4351a154cf9450ac4fce1ca1a">stp_printfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
+          <td class="memname"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>(* stp_printfuncs_t::list_parameters)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3661a4612e62e8e5aef31eaab345675c"></a><!-- doxytag: member="stp_printfuncs_t::maximum_imageable_area" ref="a3661a4612e62e8e5aef31eaab345675c" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" -->
+<a class="anchor" id="a3661a4612e62e8e5aef31eaab345675c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#a3661a4612e62e8e5aef31eaab345675c">stp_printfuncs_t::maximum_imageable_area</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td>
+          <td class="memname">void(* stp_printfuncs_t::maximum_imageable_area)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a102e995ff1ce583f84e38409852bf95f"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="a102e995ff1ce583f84e38409852bf95f" args=")(const stp_vars_t *v, int *width, int *height)" -->
+<a class="anchor" id="a102e995ff1ce583f84e38409852bf95f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#a102e995ff1ce583f84e38409852bf95f">stp_printfuncs_t::media_size</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td>
+          <td class="memname">void(* stp_printfuncs_t::media_size)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac4eab991ca917968e0f264b7105faaa4"></a><!-- doxytag: member="stp_printfuncs_t::parameters" ref="ac4eab991ca917968e0f264b7105faaa4" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *)" -->
+<a class="anchor" id="ac4eab991ca917968e0f264b7105faaa4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstp__printfuncs__t.html#ac4eab991ca917968e0f264b7105faaa4">stp_printfuncs_t::parameters</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td>
+          <td class="memname">void(* stp_printfuncs_t::parameters)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7704d7a1e997039deedfdf76a353c35d"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="a7704d7a1e997039deedfdf76a353c35d" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="a7704d7a1e997039deedfdf76a353c35d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#a7704d7a1e997039deedfdf76a353c35d">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td>
+          <td class="memname">int(* stp_printfuncs_t::print)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5c99986ad02cbcc4dce313bc7f5293fc"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="a5c99986ad02cbcc4dce313bc7f5293fc" args=")(const stp_vars_t *v, stp_image_t *image)" -->
+<a class="anchor" id="a5c99986ad02cbcc4dce313bc7f5293fc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#a5c99986ad02cbcc4dce313bc7f5293fc">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td>
+          <td class="memname">int(* stp_printfuncs_t::start_job)(const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__image.html#gaae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a948b6d7219dbb30f47a93eef2f85fde2"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="a948b6d7219dbb30f47a93eef2f85fde2" args=")(stp_vars_t *v)" -->
+<a class="anchor" id="a948b6d7219dbb30f47a93eef2f85fde2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int(* <a class="el" href="structstp__printfuncs__t.html#a948b6d7219dbb30f47a93eef2f85fde2">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
+          <td class="memname">int(* stp_printfuncs_t::verify)(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index 3824063..095f267 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_raw_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,52 +42,50 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_raw_t Struct Reference<div class="ingroups"><a class="el" href="group__vars.html">vars</a></div></div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_raw_t" -->
+
 <p>Raw parameter.  
  <a href="structstp__raw__t.html#details">More...</a></p>
 
 <p><code>#include &lt;vars.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#a5e4620104d47e7e593d75d1ebc977407">bytes</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#a36151f67569592aeac5c549a2a0daa2a">data</a></td></tr>
+<tr class="memitem:a5e4620104d47e7e593d75d1ebc977407"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#a5e4620104d47e7e593d75d1ebc977407">bytes</a></td></tr>
+<tr class="memitem:a36151f67569592aeac5c549a2a0daa2a"><td class="memItemLeft" align="right" valign="top">const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#a36151f67569592aeac5c549a2a0daa2a">data</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Raw parameter. </p>
 </div><hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a5e4620104d47e7e593d75d1ebc977407"></a><!-- doxytag: member="stp_raw_t::bytes" ref="a5e4620104d47e7e593d75d1ebc977407" args="" -->
+<a class="anchor" id="a5e4620104d47e7e593d75d1ebc977407"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">size_t <a class="el" href="structstp__raw__t.html#a5e4620104d47e7e593d75d1ebc977407">stp_raw_t::bytes</a></td>
+          <td class="memname">size_t stp_raw_t::bytes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Size of data. </p>
 
 </div>
 </div>
-<a class="anchor" id="a36151f67569592aeac5c549a2a0daa2a"></a><!-- doxytag: member="stp_raw_t::data" ref="a36151f67569592aeac5c549a2a0daa2a" args="" -->
+<a class="anchor" id="a36151f67569592aeac5c549a2a0daa2a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const void* <a class="el" href="structstp__raw__t.html#a36151f67569592aeac5c549a2a0daa2a">stp_raw_t::data</a></td>
+          <td class="memname">const void* stp_raw_t::data</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <p>Raw data. </p>
 
 </div>
@@ -89,9 +93,12 @@ Data Fields</h2></td></tr>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index a6ee4f3..910f909 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_shade Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,69 +42,69 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_shade Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_shade" -->
+
 <p><code>#include &lt;dither.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a07a72426c7bcbf22f1cc253a97a453d4">value</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a8e68774d99e3eecb76f06f7704f1eb90">numsizes</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a5057a856d4a6f7095af66b8cefc3cdc3">dot_sizes</a></td></tr>
+<tr class="memitem:a07a72426c7bcbf22f1cc253a97a453d4"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a07a72426c7bcbf22f1cc253a97a453d4">value</a></td></tr>
+<tr class="memitem:a8e68774d99e3eecb76f06f7704f1eb90"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a8e68774d99e3eecb76f06f7704f1eb90">numsizes</a></td></tr>
+<tr class="memitem:a5057a856d4a6f7095af66b8cefc3cdc3"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="dither_8h.html#a7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#a5057a856d4a6f7095af66b8cefc3cdc3">dot_sizes</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a5057a856d4a6f7095af66b8cefc3cdc3"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="a5057a856d4a6f7095af66b8cefc3cdc3" args="" -->
+<a class="anchor" id="a5057a856d4a6f7095af66b8cefc3cdc3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#a5057a856d4a6f7095af66b8cefc3cdc3">stp_shade::dot_sizes</a></td>
+          <td class="memname">const <a class="el" href="dither_8h.html#a7a74b9371fd47b48d961d2316e2126e4">stp_dotsize_t</a>* stp_shade::dot_sizes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8e68774d99e3eecb76f06f7704f1eb90"></a><!-- doxytag: member="stp_shade::numsizes" ref="a8e68774d99e3eecb76f06f7704f1eb90" args="" -->
+<a class="anchor" id="a8e68774d99e3eecb76f06f7704f1eb90"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__shade.html#a8e68774d99e3eecb76f06f7704f1eb90">stp_shade::numsizes</a></td>
+          <td class="memname">int stp_shade::numsizes</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a07a72426c7bcbf22f1cc253a97a453d4"></a><!-- doxytag: member="stp_shade::value" ref="a07a72426c7bcbf22f1cc253a97a453d4" args="" -->
+<a class="anchor" id="a07a72426c7bcbf22f1cc253a97a453d4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="structstp__shade.html#a07a72426c7bcbf22f1cc253a97a453d4">stp_shade::value</a></td>
+          <td class="memname">double stp_shade::value</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index cc52470..6ff6d37 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_weave_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,125 +42,121 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_weave_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_weave_t" -->
+
 <p><code>#include &lt;weave.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a708ad2c7d2f76b864fe92b9e0582eece">row</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a2536ce303e27f679c4afd6c33eea8d07">pass</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a31163b246a77f7959161edb6dd9ff61e">jet</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#af60b909adb3f9efb541be500c08cf87e">missingstartrows</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a1e50ffa910d33a365572ceb93f0197c6">logicalpassstart</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#aaec693e98c7587da452ac604b675be3c">physpassstart</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a3041aa5f7a90d0d7d82d1b2406044bb3">physpassend</a></td></tr>
+<tr class="memitem:a708ad2c7d2f76b864fe92b9e0582eece"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a708ad2c7d2f76b864fe92b9e0582eece">row</a></td></tr>
+<tr class="memitem:a2536ce303e27f679c4afd6c33eea8d07"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a2536ce303e27f679c4afd6c33eea8d07">pass</a></td></tr>
+<tr class="memitem:a31163b246a77f7959161edb6dd9ff61e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a31163b246a77f7959161edb6dd9ff61e">jet</a></td></tr>
+<tr class="memitem:af60b909adb3f9efb541be500c08cf87e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#af60b909adb3f9efb541be500c08cf87e">missingstartrows</a></td></tr>
+<tr class="memitem:a1e50ffa910d33a365572ceb93f0197c6"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a1e50ffa910d33a365572ceb93f0197c6">logicalpassstart</a></td></tr>
+<tr class="memitem:aaec693e98c7587da452ac604b675be3c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#aaec693e98c7587da452ac604b675be3c">physpassstart</a></td></tr>
+<tr class="memitem:a3041aa5f7a90d0d7d82d1b2406044bb3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#a3041aa5f7a90d0d7d82d1b2406044bb3">physpassend</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a31163b246a77f7959161edb6dd9ff61e"></a><!-- doxytag: member="stp_weave_t::jet" ref="a31163b246a77f7959161edb6dd9ff61e" args="" -->
+<a class="anchor" id="a31163b246a77f7959161edb6dd9ff61e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#a31163b246a77f7959161edb6dd9ff61e">stp_weave_t::jet</a></td>
+          <td class="memname">int stp_weave_t::jet</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1e50ffa910d33a365572ceb93f0197c6"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="a1e50ffa910d33a365572ceb93f0197c6" args="" -->
+<a class="anchor" id="a1e50ffa910d33a365572ceb93f0197c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#a1e50ffa910d33a365572ceb93f0197c6">stp_weave_t::logicalpassstart</a></td>
+          <td class="memname">int stp_weave_t::logicalpassstart</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af60b909adb3f9efb541be500c08cf87e"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="af60b909adb3f9efb541be500c08cf87e" args="" -->
+<a class="anchor" id="af60b909adb3f9efb541be500c08cf87e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#af60b909adb3f9efb541be500c08cf87e">stp_weave_t::missingstartrows</a></td>
+          <td class="memname">int stp_weave_t::missingstartrows</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2536ce303e27f679c4afd6c33eea8d07"></a><!-- doxytag: member="stp_weave_t::pass" ref="a2536ce303e27f679c4afd6c33eea8d07" args="" -->
+<a class="anchor" id="a2536ce303e27f679c4afd6c33eea8d07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#a2536ce303e27f679c4afd6c33eea8d07">stp_weave_t::pass</a></td>
+          <td class="memname">int stp_weave_t::pass</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3041aa5f7a90d0d7d82d1b2406044bb3"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="a3041aa5f7a90d0d7d82d1b2406044bb3" args="" -->
+<a class="anchor" id="a3041aa5f7a90d0d7d82d1b2406044bb3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#a3041aa5f7a90d0d7d82d1b2406044bb3">stp_weave_t::physpassend</a></td>
+          <td class="memname">int stp_weave_t::physpassend</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aaec693e98c7587da452ac604b675be3c"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="aaec693e98c7587da452ac604b675be3c" args="" -->
+<a class="anchor" id="aaec693e98c7587da452ac604b675be3c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#aaec693e98c7587da452ac604b675be3c">stp_weave_t::physpassstart</a></td>
+          <td class="memname">int stp_weave_t::physpassstart</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a708ad2c7d2f76b864fe92b9e0582eece"></a><!-- doxytag: member="stp_weave_t::row" ref="a708ad2c7d2f76b864fe92b9e0582eece" args="" -->
+<a class="anchor" id="a708ad2c7d2f76b864fe92b9e0582eece"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstp__weave__t.html#a708ad2c7d2f76b864fe92b9e0582eece">stp_weave_t::row</a></td>
+          <td class="memname">int stp_weave_t::row</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/tab_a.png b/doc/gutenprint/html/tab_a.png
index 2d99ef2..3b725c4 100644
--- a/doc/gutenprint/html/tab_a.png
+++ b/doc/gutenprint/html/tab_a.png
diff --git a/doc/gutenprint/html/tab_b.png b/doc/gutenprint/html/tab_b.png
index b2c3d2b..258c141 100644
--- a/doc/gutenprint/html/tab_b.png
+++ b/doc/gutenprint/html/tab_b.png
diff --git a/doc/gutenprint/html/tab_h.png b/doc/gutenprint/html/tab_h.png
index c11f48f..4ca9102 100644
--- a/doc/gutenprint/html/tab_h.png
+++ b/doc/gutenprint/html/tab_h.png
diff --git a/doc/gutenprint/html/tab_s.png b/doc/gutenprint/html/tab_s.png
index 978943a..ab478c9 100644
--- a/doc/gutenprint/html/tab_s.png
+++ b/doc/gutenprint/html/tab_s.png
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index 1fee6ad..64b279b 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: stp_mxml_value_u Union Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -36,97 +42,95 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stp_mxml_value_u Union Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stp_mxml_value_u" -->
+
 <p><code>#include &lt;mxml.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#ad4d8442bb433ac3da208e22ff0eaccf7">element</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a9540870864c06f2bf901024b7cc9048d">integer</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#aca8f6bf03f29248dee0b8d364454d051">opaque</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a3f253397958ad919a1fc97c42a58bc67">real</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a82c76c9aca350baca3b72723d0a4e99d">text</a></td></tr>
+<tr class="memitem:ad4d8442bb433ac3da208e22ff0eaccf7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#ad4d8442bb433ac3da208e22ff0eaccf7">element</a></td></tr>
+<tr class="memitem:a9540870864c06f2bf901024b7cc9048d"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a9540870864c06f2bf901024b7cc9048d">integer</a></td></tr>
+<tr class="memitem:aca8f6bf03f29248dee0b8d364454d051"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#aca8f6bf03f29248dee0b8d364454d051">opaque</a></td></tr>
+<tr class="memitem:a3f253397958ad919a1fc97c42a58bc67"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a3f253397958ad919a1fc97c42a58bc67">real</a></td></tr>
+<tr class="memitem:a82c76c9aca350baca3b72723d0a4e99d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#ab9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#a82c76c9aca350baca3b72723d0a4e99d">text</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="ad4d8442bb433ac3da208e22ff0eaccf7"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="ad4d8442bb433ac3da208e22ff0eaccf7" args="" -->
+<a class="anchor" id="ad4d8442bb433ac3da208e22ff0eaccf7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#ad4d8442bb433ac3da208e22ff0eaccf7">stp_mxml_value_u::element</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a70e20b752807f49a56b56d80ee470b47">stp_mxml_element_t</a> stp_mxml_value_u::element</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9540870864c06f2bf901024b7cc9048d"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="a9540870864c06f2bf901024b7cc9048d" args="" -->
+<a class="anchor" id="a9540870864c06f2bf901024b7cc9048d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="unionstp__mxml__value__u.html#a9540870864c06f2bf901024b7cc9048d">stp_mxml_value_u::integer</a></td>
+          <td class="memname">int stp_mxml_value_u::integer</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aca8f6bf03f29248dee0b8d364454d051"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="aca8f6bf03f29248dee0b8d364454d051" args="" -->
+<a class="anchor" id="aca8f6bf03f29248dee0b8d364454d051"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="unionstp__mxml__value__u.html#aca8f6bf03f29248dee0b8d364454d051">stp_mxml_value_u::opaque</a></td>
+          <td class="memname">char* stp_mxml_value_u::opaque</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3f253397958ad919a1fc97c42a58bc67"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="a3f253397958ad919a1fc97c42a58bc67" args="" -->
+<a class="anchor" id="a3f253397958ad919a1fc97c42a58bc67"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">double <a class="el" href="unionstp__mxml__value__u.html#a3f253397958ad919a1fc97c42a58bc67">stp_mxml_value_u::real</a></td>
+          <td class="memname">double stp_mxml_value_u::real</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a82c76c9aca350baca3b72723d0a4e99d"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="a82c76c9aca350baca3b72723d0a4e99d" args="" -->
+<a class="anchor" id="a82c76c9aca350baca3b72723d0a4e99d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#a82c76c9aca350baca3b72723d0a4e99d">stp_mxml_value_u::text</a></td>
+          <td class="memname"><a class="el" href="mxml_8h.html#ab9c0236a2d70c3bcb210a9f6fadf00a3">stp_mxml_text_t</a> stp_mxml_value_u::text</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index e94aa33..9a06efc 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/util.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,14 +41,18 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/util.h File Reference</div>  </div>
-</div>
+<div class="title">util.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Utility functions.  
@@ -50,80 +60,81 @@
 <div class="textblock"><code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>(x)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&#160;&#160;&#160;0x1</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&#160;&#160;&#160;0x2</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&#160;&#160;&#160;0x4</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&#160;&#160;&#160;0x8</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&#160;&#160;&#160;0x10</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gada7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&#160;&#160;&#160;0x20</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&#160;&#160;&#160;0x40</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&#160;&#160;&#160;0x80</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&#160;&#160;&#160;0x100</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&#160;&#160;&#160;0x200</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&#160;&#160;&#160;0x400</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&#160;&#160;&#160;0x800</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&#160;&#160;&#160;0x1000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&#160;&#160;&#160;0x2000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&#160;&#160;&#160;0x4000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&#160;&#160;&#160;0x8000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gacf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&#160;&#160;&#160;0x10000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&#160;&#160;&#160;0x20000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31234d4cc42f026f39ea32ee3dd7b0a1">STP_DBG_DYESUB</a>&#160;&#160;&#160;0x40000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&#160;&#160;&#160;0x80000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&#160;&#160;&#160;0x100000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&#160;&#160;&#160;0x200000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&#160;&#160;&#160;0x400000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaef83832f5488d7be5f6e75a5bc022360">STP_DBG_ASSERTIONS</a>&#160;&#160;&#160;0x800000</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a9d373a9b65ff25b2db84c07394e1c212"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>(x)</td></tr>
+<tr class="memitem:ga4472d3ba849ed203d43005f04583decc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4472d3ba849ed203d43005f04583decc">STP_DBG_LUT</a>&#160;&#160;&#160;0x1</td></tr>
+<tr class="memitem:ga0beee5fa281098eab25e3f22570c0fdc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0beee5fa281098eab25e3f22570c0fdc">STP_DBG_COLORFUNC</a>&#160;&#160;&#160;0x2</td></tr>
+<tr class="memitem:ga1c6936662d2cbe95de396fe8af2f254d"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1c6936662d2cbe95de396fe8af2f254d">STP_DBG_INK</a>&#160;&#160;&#160;0x4</td></tr>
+<tr class="memitem:ga90d230dd93fa96d34b438e82ed3f9639"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga90d230dd93fa96d34b438e82ed3f9639">STP_DBG_PS</a>&#160;&#160;&#160;0x8</td></tr>
+<tr class="memitem:gaf8162186c8118e5c3a8543bc0c410a78"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf8162186c8118e5c3a8543bc0c410a78">STP_DBG_PCL</a>&#160;&#160;&#160;0x10</td></tr>
+<tr class="memitem:gada7c4766db0c05ecb5ce435ddd81ecdd"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gada7c4766db0c05ecb5ce435ddd81ecdd">STP_DBG_ESCP2</a>&#160;&#160;&#160;0x20</td></tr>
+<tr class="memitem:ga109cde96d907cbd28f0b631f07a3d696"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga109cde96d907cbd28f0b631f07a3d696">STP_DBG_CANON</a>&#160;&#160;&#160;0x40</td></tr>
+<tr class="memitem:gac71c7cb5cdf49c881d944ef813a3733f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac71c7cb5cdf49c881d944ef813a3733f">STP_DBG_LEXMARK</a>&#160;&#160;&#160;0x80</td></tr>
+<tr class="memitem:ga2af8b3f36dbda4cfd313b50ba2dae636"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2af8b3f36dbda4cfd313b50ba2dae636">STP_DBG_WEAVE_PARAMS</a>&#160;&#160;&#160;0x100</td></tr>
+<tr class="memitem:ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga698ce0ddb2e4f0a8b6d7a77ad7a0fbf0">STP_DBG_ROWS</a>&#160;&#160;&#160;0x200</td></tr>
+<tr class="memitem:ga01f4480bda8819f337b2be4c41e0ebe1"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga01f4480bda8819f337b2be4c41e0ebe1">STP_DBG_MARK_FILE</a>&#160;&#160;&#160;0x400</td></tr>
+<tr class="memitem:ga3c5672b14a2e2ccdffca5b6277b1aac2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3c5672b14a2e2ccdffca5b6277b1aac2">STP_DBG_LIST</a>&#160;&#160;&#160;0x800</td></tr>
+<tr class="memitem:ga9ace1ab545abac936101248caf9a50c6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9ace1ab545abac936101248caf9a50c6">STP_DBG_MODULE</a>&#160;&#160;&#160;0x1000</td></tr>
+<tr class="memitem:ga6f8cdfb28d0d73e9579fb1751f540dc7"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6f8cdfb28d0d73e9579fb1751f540dc7">STP_DBG_PATH</a>&#160;&#160;&#160;0x2000</td></tr>
+<tr class="memitem:gad5eeaeabba7a0a861ae0dc936057aabd"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad5eeaeabba7a0a861ae0dc936057aabd">STP_DBG_PAPER</a>&#160;&#160;&#160;0x4000</td></tr>
+<tr class="memitem:gadbfb451ebbd246d62bd52e0120fa232b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbfb451ebbd246d62bd52e0120fa232b">STP_DBG_PRINTERS</a>&#160;&#160;&#160;0x8000</td></tr>
+<tr class="memitem:gacf72e68aa70e333b06b0bb821218d967"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gacf72e68aa70e333b06b0bb821218d967">STP_DBG_XML</a>&#160;&#160;&#160;0x10000</td></tr>
+<tr class="memitem:ga4c481c5ea8d87ae6c0e556593ab2020e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4c481c5ea8d87ae6c0e556593ab2020e">STP_DBG_VARS</a>&#160;&#160;&#160;0x20000</td></tr>
+<tr class="memitem:ga31234d4cc42f026f39ea32ee3dd7b0a1"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31234d4cc42f026f39ea32ee3dd7b0a1">STP_DBG_DYESUB</a>&#160;&#160;&#160;0x40000</td></tr>
+<tr class="memitem:ga8f3e76af1b2564a5763e790a45215438"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8f3e76af1b2564a5763e790a45215438">STP_DBG_CURVE</a>&#160;&#160;&#160;0x80000</td></tr>
+<tr class="memitem:gaabbc2868668663cc28d6289d50e5f83d"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaabbc2868668663cc28d6289d50e5f83d">STP_DBG_CURVE_ERRORS</a>&#160;&#160;&#160;0x100000</td></tr>
+<tr class="memitem:gab3c2a0be5bea6ef42b720eabde62cd44"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab3c2a0be5bea6ef42b720eabde62cd44">STP_DBG_PPD</a>&#160;&#160;&#160;0x200000</td></tr>
+<tr class="memitem:gaa447450ea502f96203aa2c47f6e49e92"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa447450ea502f96203aa2c47f6e49e92">STP_DBG_NO_COMPRESSION</a>&#160;&#160;&#160;0x400000</td></tr>
+<tr class="memitem:gaef83832f5488d7be5f6e75a5bc022360"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaef83832f5488d7be5f6e75a5bc022360">STP_DBG_ASSERTIONS</a>&#160;&#160;&#160;0x800000</td></tr>
+<tr class="memitem:gaa5a86efbbd3e2eb391718d82a1d7ffcc"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaa5a86efbbd3e2eb391718d82a1d7ffcc">STP_SAFE_FREE</a>(x)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaaace483bb815cde40e15bee42be1e24d">stp_write_raw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaeba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library version string (x.y.z)  <a href="group__util.html#ga1f0797636484393574cb95e667819dc1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library release version string (x.y)  <a href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b"></a><br/></td></tr>
+<tr class="memitem:ga2ce0a2e8887fe5ff7f3eed1370d0d691"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691">stp_init</a> (void)</td></tr>
+<tr class="memdesc:ga2ce0a2e8887fe5ff7f3eed1370d0d691"><td class="mdescLeft">&#160;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#ga2ce0a2e8887fe5ff7f3eed1370d0d691"></a><br/></td></tr>
+<tr class="memitem:ga7fcc19f0abdc6513dfba7eaebeb16cb9"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr class="memdesc:ga7fcc19f0abdc6513dfba7eaebeb16cb9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#ga7fcc19f0abdc6513dfba7eaebeb16cb9"></a><br/></td></tr>
+<tr class="memitem:gadbe8c167230b49bc10391d2c246e6dc0"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadbe8c167230b49bc10391d2c246e6dc0">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga7eddbee28cb1f3c76a19408b86ea142e">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr class="memitem:gad0c145dc5cebecab0bb4e3ac40fc8e4d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad0c145dc5cebecab0bb4e3ac40fc8e4d">stp_abort</a> (void)</td></tr>
+<tr class="memitem:ga13aa8afef5b0872704390adc6a01924e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13aa8afef5b0872704390adc6a01924e">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gad7ffe058decb939af6a5c1ec1d0d77fa"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad7ffe058decb939af6a5c1ec1d0d77fa">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga183d8f36f187530f9d7acdb176be3409"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga183d8f36f187530f9d7acdb176be3409">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaaace483bb815cde40e15bee42be1e24d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaaace483bb815cde40e15bee42be1e24d">stp_write_raw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga39e4c5f6fa2a07dfca3090a50a8858f9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39e4c5f6fa2a07dfca3090a50a8858f9">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1ffcb45ea3c37bb6b485addcaf945c99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1ffcb45ea3c37bb6b485addcaf945c99">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga23b504253ceda208b9a4985e6de8a5f7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23b504253ceda208b9a4985e6de8a5f7">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaadf69b8b3f713d2bd7ca3a5648da0c56"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaadf69b8b3f713d2bd7ca3a5648da0c56">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga258b7b5f8808d0a3168f798e8bf72608"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga258b7b5f8808d0a3168f798e8bf72608">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gaf6cf72e5e45f175ae8c332c0588832b9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaf6cf72e5e45f175ae8c332c0588832b9">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga79dd0a6f5c63f4fbf8591d3c041a7720"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga79dd0a6f5c63f4fbf8591d3c041a7720">stp_putraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *r, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gadb49b9cba9ddf4e506b6f530353ad93d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gadb49b9cba9ddf4e506b6f530353ad93d">stp_send_command</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr class="memitem:ga15987fbd850e04f2520cb151e08908e1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15987fbd850e04f2520cb151e08908e1">stp_erputc</a> (int ch)</td></tr>
+<tr class="memitem:gae53707df5c9945f289c58bfbe08a8d88"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae53707df5c9945f289c58bfbe08a8d88">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga1df22de14e3275cb26ede10da66eebdf"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1df22de14e3275cb26ede10da66eebdf">stp_erprintf</a> (const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga3f57c5298a5c6140ac56771dd62bd036"><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3f57c5298a5c6140ac56771dd62bd036">stp_asprintf</a> (char **strp, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:gad4f33438f0103a143d90dc9c48d248eb"><td class="memItemLeft" align="right" valign="top">void void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gad4f33438f0103a143d90dc9c48d248eb">stp_catprintf</a> (char **strp, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:gaeba8c24f265ee904c5876704b767841c"><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gaeba8c24f265ee904c5876704b767841c">stp_get_debug_level</a> (void)</td></tr>
+<tr class="memitem:ga511e0c4cac91c674797da98ab96b83e6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga511e0c4cac91c674797da98ab96b83e6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga129f45d7df47fd58d8653538fd13a1f2"><td class="memItemLeft" align="right" valign="top">void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga129f45d7df47fd58d8653538fd13a1f2">stp_deprintf</a> (unsigned long level, const char *format,...) <a class="el" href="util_8h.html#a9d373a9b65ff25b2db84c07394e1c212">__attribute__</a>((format(__printf__</td></tr>
+<tr class="memitem:ga6d15e5b4e00f9d242166edb5332f8368"><td class="memItemLeft" align="right" valign="top">void void void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6d15e5b4e00f9d242166edb5332f8368">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:gabe74390c1422e9746745da55692f47b8"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabe74390c1422e9746745da55692f47b8">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga86a2976738a237df953655e733c75b3a"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga86a2976738a237df953655e733c75b3a">stp_malloc</a> (size_t)</td></tr>
+<tr class="memitem:gac8fd1a439fa2d8e1ff1a2b104cd0137b"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gac8fd1a439fa2d8e1ff1a2b104cd0137b">stp_zalloc</a> (size_t)</td></tr>
+<tr class="memitem:ga2420936ab8b3492581f389deea44f58c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2420936ab8b3492581f389deea44f58c">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr class="memitem:ga7d0c40c3157b2c5c630200352064874c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7d0c40c3157b2c5c630200352064874c">stp_free</a> (void *ptr)</td></tr>
+<tr class="memitem:ga56b08d3e12750bdfae8b53263f97aba9"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga56b08d3e12750bdfae8b53263f97aba9">stp_strlen</a> (const char *s)</td></tr>
+<tr class="memitem:gab026f7022963acd694a8b89e4decbde5"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gab026f7022963acd694a8b89e4decbde5">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr class="memitem:ga5c0731867697f555a94b2a1229804381"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5c0731867697f555a94b2a1229804381">stp_strdup</a> (const char *s)</td></tr>
+<tr class="memitem:ga1f0797636484393574cb95e667819dc1"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1f0797636484393574cb95e667819dc1">stp_get_version</a> (void)</td></tr>
+<tr class="memdesc:ga1f0797636484393574cb95e667819dc1"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library version string (x.y.z)  <a href="group__util.html#ga1f0797636484393574cb95e667819dc1"></a><br/></td></tr>
+<tr class="memitem:ga5ba7edc43ed094f32ae7d9158a362a7b"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b">stp_get_release_version</a> (void)</td></tr>
+<tr class="memdesc:ga5ba7edc43ed094f32ae7d9158a362a7b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the library release version string (x.y)  <a href="group__util.html#ga5ba7edc43ed094f32ae7d9158a362a7b"></a><br/></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Utility functions. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a9d373a9b65ff25b2db84c07394e1c212"></a><!-- doxytag: member="util.h::__attribute__" ref="a9d373a9b65ff25b2db84c07394e1c212" args="(x)" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a9d373a9b65ff25b2db84c07394e1c212"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -135,14 +146,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 9a6d499..712afb9 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/vars.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,17 +41,21 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/vars.h File Reference</div>  </div>
-</div>
+<div class="title">vars.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Print job functions.  
@@ -54,37 +64,40 @@
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="string-list_8h.html">gutenprint/string-list.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Raw parameter.  <a href="structstp__raw__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">double_bound (range) parameter.  <a href="structstp__double__bound__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">int_bound (range) parameter.  <a href="structstp__int__bound__t.html#details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#details">More...</a><br/></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&#160;&#160;&#160;{ sizeof((x)), (x) }</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&#160;&#160;&#160;{ sizeof((x)) - 1, (x) }</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&#160;&#160;&#160;((unsigned char) -1)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html">stp_raw_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Raw parameter.  <a href="structstp__raw__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">double_bound (range) parameter.  <a href="structstp__double__bound__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">int_bound (range) parameter.  <a href="structstp__int__bound__t.html#details">More...</a><br/></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a></td></tr>
+<tr class="memdesc:"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#details">More...</a><br/></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:ga9fc3819cba14f7f4c5654508a08a1adf"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fc3819cba14f7f4c5654508a08a1adf">STP_RAW</a>(x)&#160;&#160;&#160;{ sizeof((x)), (x) }</td></tr>
+<tr class="memitem:gad888c1f6a36f999ffebfffa7b74f28d2"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad888c1f6a36f999ffebfffa7b74f28d2">STP_RAW_STRING</a>(x)&#160;&#160;&#160;{ sizeof((x)) - 1, (x) }</td></tr>
+<tr class="memitem:ga4f46af65b4df5881b980acba32a05b70"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4f46af65b4df5881b980acba32a05b70">STP_CHANNEL_NONE</a>&#160;&#160;&#160;((unsigned char) -1)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_vars&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#ga268c87919653380a22b1f69c78fe6555"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> )(void *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct stp_compdata&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:ga2d49c94847d18d8b62a214995b14680f"><td class="memItemLeft" align="right" valign="top">typedef struct stp_vars&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a></td></tr>
+<tr class="memdesc:ga2d49c94847d18d8b62a214995b14680f"><td class="mdescLeft">&#160;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f"></a><br/></td></tr>
+<tr class="memitem:ga40c1035f88ac38d77eddb65195b28595"><td class="memItemLeft" align="right" valign="top">typedef void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a></td></tr>
+<tr class="memdesc:ga40c1035f88ac38d77eddb65195b28595"><td class="mdescLeft">&#160;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595"></a><br/></td></tr>
+<tr class="memitem:ga53c035a67629ae3b3eb86b3c09df7774"><td class="memItemLeft" align="right" valign="top">typedef const void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a></td></tr>
+<tr class="memdesc:ga53c035a67629ae3b3eb86b3c09df7774"><td class="mdescLeft">&#160;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774"></a><br/></td></tr>
+<tr class="memitem:ga268c87919653380a22b1f69c78fe6555"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr class="memdesc:ga268c87919653380a22b1f69c78fe6555"><td class="mdescLeft">&#160;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#ga268c87919653380a22b1f69c78fe6555"></a><br/></td></tr>
+<tr class="memitem:ga25e6aec21fd8f8a65c4c4086d0f3dec0"><td class="memItemLeft" align="right" valign="top">typedef void *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr class="memitem:ga1ac9aa4c059fbb52307d8522a5f1dc6d"><td class="memItemLeft" align="right" valign="top">typedef void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr class="memitem:ga4d45b95baae036143e14adfc0014f562"><td class="memItemLeft" align="right" valign="top">typedef struct stp_compdata&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d45b95baae036143e14adfc0014f562">compdata_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br/>
+<tr class="memitem:ga9b3d4f47a44c0c8c9b150cddc56d2a91"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> { <br/>
 &#160;&#160;<a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91a7a6f3e019c8a92ddecd34c71013acde0">STP_PARAMETER_TYPE_STRING_LIST</a>, 
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91aae2cac85ef78157b53c7a79706dc0f70">STP_PARAMETER_TYPE_INT</a>, 
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91af97ef629defc99977bd1cb35daabe0c1">STP_PARAMETER_TYPE_BOOLEAN</a>, 
@@ -99,14 +112,14 @@ Enumerations</h2></td></tr>
 <a class="el" href="group__vars.html#gga9b3d4f47a44c0c8c9b150cddc56d2a91ad053047279b4c82034d26c4aa4c818d5">STP_PARAMETER_TYPE_INVALID</a>
 <br/>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
+<tr class="memdesc:ga9b3d4f47a44c0c8c9b150cddc56d2a91"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">More...</a><br/></td></tr>
+<tr class="memitem:ga4eba7e712c0e17b76e472f26e202d7b8"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa7ed8b66836057aa58b9a74811057b4a">STP_PARAMETER_CLASS_FEATURE</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8affc6ff4bfbf2873ce55dfc03776bb6d9">STP_PARAMETER_CLASS_OUTPUT</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8aa05ce344ff3338e69638d69f9c120d01">STP_PARAMETER_CLASS_CORE</a>, 
 <a class="el" href="group__vars.html#gga4eba7e712c0e17b76e472f26e202d7b8a2e17ce7ebc18801c11af7ea0a61e93ca">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br/>
+<tr class="memdesc:ga4eba7e712c0e17b76e472f26e202d7b8"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga4eba7e712c0e17b76e472f26e202d7b8">More...</a><br/></td></tr>
+<tr class="memitem:gaaa9c9265ffe70122bd33659cf2983207"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">stp_parameter_level_t</a> { <br/>
 &#160;&#160;<a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207ae9d7192607a6e1ec92dfed3f13a3a46f">STP_PARAMETER_LEVEL_BASIC</a>, 
 <a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207a3130e7060a3b901ea8dcb37d986d47e0">STP_PARAMETER_LEVEL_ADVANCED</a>, 
 <a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207a3d016c9587f698ee400bc7e66071f06c">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
@@ -120,302 +133,308 @@ Enumerations</h2></td></tr>
 &#160;&#160;<a class="el" href="group__vars.html#ggaaa9c9265ffe70122bd33659cf2983207ab8bf539d78e56f06f463d00f7a3b56b3">STP_PARAMETER_LEVEL_INVALID</a>
 <br/>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
+<tr class="memdesc:gaaa9c9265ffe70122bd33659cf2983207"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaaa9c9265ffe70122bd33659cf2983207">More...</a><br/></td></tr>
+<tr class="memitem:ga70ebf70dc8e6199d84fc91985c94bae9"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a6517762c5800eac253f43eeacd96c22f">STP_PARAMETER_INACTIVE</a>, 
 <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9a410b7e080ef62fb8896f2f844b1c1e00">STP_PARAMETER_DEFAULTED</a>, 
 <a class="el" href="group__vars.html#gga70ebf70dc8e6199d84fc91985c94bae9adbc7323a015e40652fd256e49c8d5b8c">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
+<tr class="memdesc:ga70ebf70dc8e6199d84fc91985c94bae9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">More...</a><br/></td></tr>
+<tr class="memitem:gac061852de3627383cd415cd80a979e02"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a326a171221148779ec7df761b3eee967">PARAMETER_BAD</a>, 
 <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a2df363618282a9164433c0f212b18616">PARAMETER_OK</a>, 
 <a class="el" href="group__vars.html#ggac061852de3627383cd415cd80a979e02a5cb96da6c2e3ae7187e85a1ef6e41fc6">PARAMETER_INACTIVE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#ga292132b97b20a6d034e22f4146d36131"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#gaad2d305eed993707d22263b54578a39b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga2f246d3af2be9e108abe423691e16049"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#ga086303d36b835d539e75f16187e99e8f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#gadcd8062af7b643c734f53c545694d258"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#ga404bf7f1b3632178d559f6980478a312"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#gad598d95a82767e05c958ccd44534c51d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#ga2167971895eea887eaaa656ed075beff"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga217eece123630113cfcf8181d475fb53"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#gae52dbb466422a18dec110220c45fe64e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#ga2021992d89c92b10138fb012a9554a08"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a parameter.  <a href="group__vars.html#ga390f7c2fe642bea08507374a184de233"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all string parameters.  <a href="group__vars.html#ga110e543418842a6dd79149409620bf13"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all file parameters.  <a href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all float parameters.  <a href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all integer parameters.  <a href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all dimension parameters.  <a href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all boolean parameters.  <a href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all curve parameters.  <a href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all array parameters.  <a href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all raw parameters.  <a href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">List all parameters.  <a href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a parameter.  <a href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#ga23b9c17426210460618c4f95c5f34229"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#ga285f05c648724c80bf05af30f87120a3"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a parameter is set.  <a href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#gab926417b2f601c78d85df44694cc6d38"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b">stp_parameter_get_category</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the value of a specified category for the specified parameter.  <a href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37">stp_parameter_has_category_value</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category, const char *value)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether a parameter has a category with the specified value.  <a href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863">stp_parameter_get_categories</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc)</td></tr>
-<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the list of categories and their values for the specified parameter.  <a href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gabfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr class="memitem:ga5d641ab7093c9ba82cbd4cfbf904fabc"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc">stp_vars_create</a> (void)</td></tr>
+<tr class="memdesc:ga5d641ab7093c9ba82cbd4cfbf904fabc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#ga5d641ab7093c9ba82cbd4cfbf904fabc"></a><br/></td></tr>
+<tr class="memitem:ga88376207367adb4260ff14e5d9ec76e9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
+<tr class="memdesc:ga88376207367adb4260ff14e5d9ec76e9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#ga88376207367adb4260ff14e5d9ec76e9"></a><br/></td></tr>
+<tr class="memitem:gaec00fba49ad08d20890e64773bcdbd48"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *source)</td></tr>
+<tr class="memdesc:gaec00fba49ad08d20890e64773bcdbd48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#gaec00fba49ad08d20890e64773bcdbd48"></a><br/></td></tr>
+<tr class="memitem:gad3f1ff7a86c3cd1c9f9f62cfa8814437"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gad3f1ff7a86c3cd1c9f9f62cfa8814437"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#gad3f1ff7a86c3cd1c9f9f62cfa8814437"></a><br/></td></tr>
+<tr class="memitem:gacf237afcbc26436ebedac5b11f469fdf"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf">stp_set_driver</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr class="memdesc:gacf237afcbc26436ebedac5b11f469fdf"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#gacf237afcbc26436ebedac5b11f469fdf"></a><br/></td></tr>
+<tr class="memitem:ga188d298a8739b84fcb965f211fc7dc4e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr class="memdesc:ga188d298a8739b84fcb965f211fc7dc4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga188d298a8739b84fcb965f211fc7dc4e"></a><br/></td></tr>
+<tr class="memitem:ga20c45707399ef6fdf6ee8c8209b5c7c0"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga20c45707399ef6fdf6ee8c8209b5c7c0"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#ga20c45707399ef6fdf6ee8c8209b5c7c0"></a><br/></td></tr>
+<tr class="memitem:ga7eb2a1c4b892efd5507fcd4b7a434cea"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr class="memdesc:ga7eb2a1c4b892efd5507fcd4b7a434cea"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga7eb2a1c4b892efd5507fcd4b7a434cea"></a><br/></td></tr>
+<tr class="memitem:ga5a842b31f0a572d8e64f1a5616e25a99"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr class="memdesc:ga5a842b31f0a572d8e64f1a5616e25a99"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga5a842b31f0a572d8e64f1a5616e25a99"></a><br/></td></tr>
+<tr class="memitem:ga2bac9212773ecf603b7667bd0268c23e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga2bac9212773ecf603b7667bd0268c23e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#ga2bac9212773ecf603b7667bd0268c23e"></a><br/></td></tr>
+<tr class="memitem:ga3b0cc83e87247854ecafd46a6e446bcb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb">stp_set_left</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga3b0cc83e87247854ecafd46a6e446bcb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#ga3b0cc83e87247854ecafd46a6e446bcb"></a><br/></td></tr>
+<tr class="memitem:ga5c02ee2422d86e4bcdcae613c70c9e1e"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e">stp_get_left</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga5c02ee2422d86e4bcdcae613c70c9e1e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#ga5c02ee2422d86e4bcdcae613c70c9e1e"></a><br/></td></tr>
+<tr class="memitem:ga557b5ad44d3b1da8392496681624ad8b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b">stp_set_top</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga557b5ad44d3b1da8392496681624ad8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#ga557b5ad44d3b1da8392496681624ad8b"></a><br/></td></tr>
+<tr class="memitem:ga292132b97b20a6d034e22f4146d36131"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga292132b97b20a6d034e22f4146d36131">stp_get_top</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga292132b97b20a6d034e22f4146d36131"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#ga292132b97b20a6d034e22f4146d36131"></a><br/></td></tr>
+<tr class="memitem:ga3a852ce7e42d7f8e0cef6c7d399e0491"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491">stp_set_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga3a852ce7e42d7f8e0cef6c7d399e0491"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#ga3a852ce7e42d7f8e0cef6c7d399e0491"></a><br/></td></tr>
+<tr class="memitem:ga1c54d99b94c69a67eb4ae0349a4720e7"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7">stp_get_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga1c54d99b94c69a67eb4ae0349a4720e7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#ga1c54d99b94c69a67eb4ae0349a4720e7"></a><br/></td></tr>
+<tr class="memitem:ga8ce73c5efa41f005936d5f84c44c6667"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667">stp_set_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga8ce73c5efa41f005936d5f84c44c6667"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#ga8ce73c5efa41f005936d5f84c44c6667"></a><br/></td></tr>
+<tr class="memitem:ga8731a92f5d3047e00ba33577821d5aec"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec">stp_get_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga8731a92f5d3047e00ba33577821d5aec"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#ga8731a92f5d3047e00ba33577821d5aec"></a><br/></td></tr>
+<tr class="memitem:ga639be0da07c3e5b7dc6d68ac2aa999e9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga639be0da07c3e5b7dc6d68ac2aa999e9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#ga639be0da07c3e5b7dc6d68ac2aa999e9"></a><br/></td></tr>
+<tr class="memitem:gaad2d305eed993707d22263b54578a39b"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaad2d305eed993707d22263b54578a39b">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gaad2d305eed993707d22263b54578a39b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#gaad2d305eed993707d22263b54578a39b"></a><br/></td></tr>
+<tr class="memitem:ga83326bacb8b92149af1b70457b23bc8f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int val)</td></tr>
+<tr class="memdesc:ga83326bacb8b92149af1b70457b23bc8f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#ga83326bacb8b92149af1b70457b23bc8f"></a><br/></td></tr>
+<tr class="memitem:gac0c4928fa488bb95e73ba9b8aa932584"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gac0c4928fa488bb95e73ba9b8aa932584"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#gac0c4928fa488bb95e73ba9b8aa932584"></a><br/></td></tr>
+<tr class="memitem:ga075ffc274f0d2d2b6edd8326de1d7142"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
+<tr class="memdesc:ga075ffc274f0d2d2b6edd8326de1d7142"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#ga075ffc274f0d2d2b6edd8326de1d7142"></a><br/></td></tr>
+<tr class="memitem:ga7c6c7c547d0c973ac801362db5ca4879"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga7c6c7c547d0c973ac801362db5ca4879"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga7c6c7c547d0c973ac801362db5ca4879"></a><br/></td></tr>
+<tr class="memitem:ga82f6a7514840de82c9ed7edd30f16b5d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a> val)</td></tr>
+<tr class="memdesc:ga82f6a7514840de82c9ed7edd30f16b5d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#ga82f6a7514840de82c9ed7edd30f16b5d"></a><br/></td></tr>
+<tr class="memitem:ga2f246d3af2be9e108abe423691e16049"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga268c87919653380a22b1f69c78fe6555">stp_outfunc_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2f246d3af2be9e108abe423691e16049">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga2f246d3af2be9e108abe423691e16049"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga2f246d3af2be9e108abe423691e16049"></a><br/></td></tr>
+<tr class="memitem:gac2b3408200a9676e6c6063cc0ae2f4bd"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
+<tr class="memdesc:gac2b3408200a9676e6c6063cc0ae2f4bd"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#gac2b3408200a9676e6c6063cc0ae2f4bd"></a><br/></td></tr>
+<tr class="memitem:ga7042b05e0df5b32206d54397429bbac5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga7042b05e0df5b32206d54397429bbac5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#ga7042b05e0df5b32206d54397429bbac5"></a><br/></td></tr>
+<tr class="memitem:ga8b30fbadf3475c59101af9d7d37c33b7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, void *val)</td></tr>
+<tr class="memdesc:ga8b30fbadf3475c59101af9d7d37c33b7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#ga8b30fbadf3475c59101af9d7d37c33b7"></a><br/></td></tr>
+<tr class="memitem:gad08bdcd721d37f52993c1862e25ebaf7"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gad08bdcd721d37f52993c1862e25ebaf7"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#gad08bdcd721d37f52993c1862e25ebaf7"></a><br/></td></tr>
+<tr class="memitem:ga086303d36b835d539e75f16187e99e8f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga086303d36b835d539e75f16187e99e8f">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *print)</td></tr>
+<tr class="memdesc:ga086303d36b835d539e75f16187e99e8f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#ga086303d36b835d539e75f16187e99e8f"></a><br/></td></tr>
+<tr class="memitem:gadb632ed2afb82e30c6f1583a69d4a8ce"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb632ed2afb82e30c6f1583a69d4a8ce">stp_copy_vars_from</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *to, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *from)</td></tr>
+<tr class="memdesc:gadb632ed2afb82e30c6f1583a69d4a8ce"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy settings from one vars object to another, not modifying anything unset in the source.  <a href="group__vars.html#gadb632ed2afb82e30c6f1583a69d4a8ce"></a><br/></td></tr>
+<tr class="memitem:ga12e8bb617e5c90da99d6d74519664634"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga12e8bb617e5c90da99d6d74519664634"><td class="mdescLeft">&#160;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#ga12e8bb617e5c90da99d6d74519664634"></a><br/></td></tr>
+<tr class="memitem:ga7a94856ce75482a5edb6153fe8916a54"><td class="memItemLeft" align="right" valign="top">size_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga7a94856ce75482a5edb6153fe8916a54"><td class="mdescLeft">&#160;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#ga7a94856ce75482a5edb6153fe8916a54"></a><br/></td></tr>
+<tr class="memitem:gadcd8062af7b643c734f53c545694d258"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadcd8062af7b643c734f53c545694d258">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr class="memdesc:gadcd8062af7b643c734f53c545694d258"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#gadcd8062af7b643c734f53c545694d258"></a><br/></td></tr>
+<tr class="memitem:ga70d69ef7dec383004bf4570e57b76e18"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr class="memdesc:ga70d69ef7dec383004bf4570e57b76e18"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#ga70d69ef7dec383004bf4570e57b76e18"></a><br/></td></tr>
+<tr class="memitem:ga3ffaadbe73187aa1f298c4eaa80ea82e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga3ffaadbe73187aa1f298c4eaa80ea82e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#ga3ffaadbe73187aa1f298c4eaa80ea82e"></a><br/></td></tr>
+<tr class="memitem:ga404bf7f1b3632178d559f6980478a312"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga404bf7f1b3632178d559f6980478a312">stp_parameter_list_create</a> (void)</td></tr>
+<tr class="memdesc:ga404bf7f1b3632178d559f6980478a312"><td class="mdescLeft">&#160;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#ga404bf7f1b3632178d559f6980478a312"></a><br/></td></tr>
+<tr class="memitem:ga8f4f06610d1f58bae9e70e632919c405"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr class="memdesc:ga8f4f06610d1f58bae9e70e632919c405"><td class="mdescLeft">&#160;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#ga8f4f06610d1f58bae9e70e632919c405"></a><br/></td></tr>
+<tr class="memitem:ga92be87a573b883584e5a036743c1bb7d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> list)</td></tr>
+<tr class="memdesc:ga92be87a573b883584e5a036743c1bb7d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#ga92be87a573b883584e5a036743c1bb7d"></a><br/></td></tr>
+<tr class="memitem:ga4b62bc6d0133704b3a2568b1654b6678"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a> append)</td></tr>
+<tr class="memdesc:ga4b62bc6d0133704b3a2568b1654b6678"><td class="mdescLeft">&#160;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#ga4b62bc6d0133704b3a2568b1654b6678"></a><br/></td></tr>
+<tr class="memitem:ga0b8991bd1a91e2cac7d0b355b1186c8e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memdesc:ga0b8991bd1a91e2cac7d0b355b1186c8e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#ga0b8991bd1a91e2cac7d0b355b1186c8e"></a><br/></td></tr>
+<tr class="memitem:gad598d95a82767e05c958ccd44534c51d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad598d95a82767e05c958ccd44534c51d">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr class="memdesc:gad598d95a82767e05c958ccd44534c51d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#gad598d95a82767e05c958ccd44534c51d"></a><br/></td></tr>
+<tr class="memitem:ga6ce39557b61706421232b5f1ac604b1b"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memdesc:ga6ce39557b61706421232b5f1ac604b1b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#ga6ce39557b61706421232b5f1ac604b1b"></a><br/></td></tr>
+<tr class="memitem:gaa147483996fa118516ddb36fe3366aa9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaa147483996fa118516ddb36fe3366aa9"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#gaa147483996fa118516ddb36fe3366aa9"></a><br/></td></tr>
+<tr class="memitem:gafe6c8b3d86ca16239a63ce9d2ef57f48"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:gafe6c8b3d86ca16239a63ce9d2ef57f48"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#gafe6c8b3d86ca16239a63ce9d2ef57f48"></a><br/></td></tr>
+<tr class="memitem:ga537f2ba6c74c9562b2f6883d7e36c59f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:ga537f2ba6c74c9562b2f6883d7e36c59f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga537f2ba6c74c9562b2f6883d7e36c59f"></a><br/></td></tr>
+<tr class="memitem:ga6f7816adbce50ca9e2fdacad35282e6a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga6f7816adbce50ca9e2fdacad35282e6a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga6f7816adbce50ca9e2fdacad35282e6a"></a><br/></td></tr>
+<tr class="memitem:gaf3a3283247deaad7d1ac19818aa4b796"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr class="memdesc:gaf3a3283247deaad7d1ac19818aa4b796"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#gaf3a3283247deaad7d1ac19818aa4b796"></a><br/></td></tr>
+<tr class="memitem:ga70eded5d0df4677dd4b357b4b934f75a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga70eded5d0df4677dd4b357b4b934f75a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#ga70eded5d0df4677dd4b357b4b934f75a"></a><br/></td></tr>
+<tr class="memitem:ga6ca7898c212230cdbdc70ada2efb1417"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga6ca7898c212230cdbdc70ada2efb1417"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#ga6ca7898c212230cdbdc70ada2efb1417"></a><br/></td></tr>
+<tr class="memitem:ga2167971895eea887eaaa656ed075beff"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2167971895eea887eaaa656ed075beff">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga2167971895eea887eaaa656ed075beff"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#ga2167971895eea887eaaa656ed075beff"></a><br/></td></tr>
+<tr class="memitem:gafe5f1f6364b89437664b2bbc55288025"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
+<tr class="memdesc:gafe5f1f6364b89437664b2bbc55288025"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#gafe5f1f6364b89437664b2bbc55288025"></a><br/></td></tr>
+<tr class="memitem:ga88f25e09f9a4b76aca7ba8316cbf9c8b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
+<tr class="memdesc:ga88f25e09f9a4b76aca7ba8316cbf9c8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#ga88f25e09f9a4b76aca7ba8316cbf9c8b"></a><br/></td></tr>
+<tr class="memitem:ga0155de75bf2aa95ab45a3319539cda56"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga0155de75bf2aa95ab45a3319539cda56"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#ga0155de75bf2aa95ab45a3319539cda56"></a><br/></td></tr>
+<tr class="memitem:ga227ec3e75a78a5c3dd01c85dbc1e7004"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr class="memdesc:ga227ec3e75a78a5c3dd01c85dbc1e7004"><td class="mdescLeft">&#160;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#ga227ec3e75a78a5c3dd01c85dbc1e7004"></a><br/></td></tr>
+<tr class="memitem:gaf299bd0827a4d86aca59fb0d9015a866"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaf299bd0827a4d86aca59fb0d9015a866"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#gaf299bd0827a4d86aca59fb0d9015a866"></a><br/></td></tr>
+<tr class="memitem:gaa5d6d8858b266517f5899196b062d00d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:gaa5d6d8858b266517f5899196b062d00d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#gaa5d6d8858b266517f5899196b062d00d"></a><br/></td></tr>
+<tr class="memitem:gaf5e225475c66f966f4ba8d8c88374186"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr class="memdesc:gaf5e225475c66f966f4ba8d8c88374186"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#gaf5e225475c66f966f4ba8d8c88374186"></a><br/></td></tr>
+<tr class="memitem:ga217eece123630113cfcf8181d475fb53"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga217eece123630113cfcf8181d475fb53">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga217eece123630113cfcf8181d475fb53"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga217eece123630113cfcf8181d475fb53"></a><br/></td></tr>
+<tr class="memitem:gae52dbb466422a18dec110220c45fe64e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae52dbb466422a18dec110220c45fe64e">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr class="memdesc:gae52dbb466422a18dec110220c45fe64e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#gae52dbb466422a18dec110220c45fe64e"></a><br/></td></tr>
+<tr class="memitem:ga3c0418772a82144f317dc973f01a8d55"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga3c0418772a82144f317dc973f01a8d55"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#ga3c0418772a82144f317dc973f01a8d55"></a><br/></td></tr>
+<tr class="memitem:gab6f1820cadd75a4311bfc49b01de447b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:gab6f1820cadd75a4311bfc49b01de447b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#gab6f1820cadd75a4311bfc49b01de447b"></a><br/></td></tr>
+<tr class="memitem:ga81d5f09980407b4310dada2a68fc4b09"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr class="memdesc:ga81d5f09980407b4310dada2a68fc4b09"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#ga81d5f09980407b4310dada2a68fc4b09"></a><br/></td></tr>
+<tr class="memitem:gafe38044cc067b2c2afa3da469d1cb860"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *value)</td></tr>
+<tr class="memdesc:gafe38044cc067b2c2afa3da469d1cb860"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#gafe38044cc067b2c2afa3da469d1cb860"></a><br/></td></tr>
+<tr class="memitem:ga63e7ff7b4c3e1d092f95c6234f21e39f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *value)</td></tr>
+<tr class="memdesc:ga63e7ff7b4c3e1d092f95c6234f21e39f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#ga63e7ff7b4c3e1d092f95c6234f21e39f"></a><br/></td></tr>
+<tr class="memitem:ga8159b3f5bea06a99711921f0201f5e0f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr class="memdesc:ga8159b3f5bea06a99711921f0201f5e0f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#ga8159b3f5bea06a99711921f0201f5e0f"></a><br/></td></tr>
+<tr class="memitem:gab5b21e5606b8ca755c5eac7774260efa"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab5b21e5606b8ca755c5eac7774260efa"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#gab5b21e5606b8ca755c5eac7774260efa"></a><br/></td></tr>
+<tr class="memitem:ga2021992d89c92b10138fb012a9554a08"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2021992d89c92b10138fb012a9554a08">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga2021992d89c92b10138fb012a9554a08"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#ga2021992d89c92b10138fb012a9554a08"></a><br/></td></tr>
+<tr class="memitem:ga365412d9c176fd3ac9375ded3f22ddb3"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga365412d9c176fd3ac9375ded3f22ddb3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#ga365412d9c176fd3ac9375ded3f22ddb3"></a><br/></td></tr>
+<tr class="memitem:ga7c0d95ba35aba0786bfc5f918efa79fc"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga7c0d95ba35aba0786bfc5f918efa79fc"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#ga7c0d95ba35aba0786bfc5f918efa79fc"></a><br/></td></tr>
+<tr class="memitem:ga3c8d1333086ca5a01a3439f94d9f94d3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga3c8d1333086ca5a01a3439f94d9f94d3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#ga3c8d1333086ca5a01a3439f94d9f94d3"></a><br/></td></tr>
+<tr class="memitem:ga8a30b26fa842805384b6ad663cabaea2"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga8a30b26fa842805384b6ad663cabaea2"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#ga8a30b26fa842805384b6ad663cabaea2"></a><br/></td></tr>
+<tr class="memitem:ga553dec81dd8b3e5590d963ba72223557"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga553dec81dd8b3e5590d963ba72223557"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#ga553dec81dd8b3e5590d963ba72223557"></a><br/></td></tr>
+<tr class="memitem:gac50c216c2d5cd56a9704f48d4338b179"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gac50c216c2d5cd56a9704f48d4338b179"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#gac50c216c2d5cd56a9704f48d4338b179"></a><br/></td></tr>
+<tr class="memitem:ga9fff6c14a71f5f8ec28620ef64a92fd5"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga9fff6c14a71f5f8ec28620ef64a92fd5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#ga9fff6c14a71f5f8ec28620ef64a92fd5"></a><br/></td></tr>
+<tr class="memitem:ga9e98ef9a9b1b84a0c0580fe024e35490"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga9e98ef9a9b1b84a0c0580fe024e35490"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#ga9e98ef9a9b1b84a0c0580fe024e35490"></a><br/></td></tr>
+<tr class="memitem:ga4fad48e3e6453842559bd872650cb88f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4fad48e3e6453842559bd872650cb88f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#ga4fad48e3e6453842559bd872650cb88f"></a><br/></td></tr>
+<tr class="memitem:ga4eccbbe421f8b0c9342b17cef40b263d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4eccbbe421f8b0c9342b17cef40b263d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#ga4eccbbe421f8b0c9342b17cef40b263d"></a><br/></td></tr>
+<tr class="memitem:ga2107c08f37e31f45253f7d75a3773d46"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga2107c08f37e31f45253f7d75a3773d46"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#ga2107c08f37e31f45253f7d75a3773d46"></a><br/></td></tr>
+<tr class="memitem:ga514a21602ae7a8ebe8e5072a5a4b6f89"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga514a21602ae7a8ebe8e5072a5a4b6f89"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#ga514a21602ae7a8ebe8e5072a5a4b6f89"></a><br/></td></tr>
+<tr class="memitem:ga42ebfed8dec2054799e4943a8ca84267"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga42ebfed8dec2054799e4943a8ca84267"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#ga42ebfed8dec2054799e4943a8ca84267"></a><br/></td></tr>
+<tr class="memitem:gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#gaf52a0b0c3b0e0fee1fc46516b1bc0c4e"></a><br/></td></tr>
+<tr class="memitem:ga7c67cef38cead5f519fd04ae09265b53"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga7c67cef38cead5f519fd04ae09265b53"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#ga7c67cef38cead5f519fd04ae09265b53"></a><br/></td></tr>
+<tr class="memitem:ga11b79add82faf23b0e3c758f9530d95c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga11b79add82faf23b0e3c758f9530d95c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga11b79add82faf23b0e3c758f9530d95c"></a><br/></td></tr>
+<tr class="memitem:ga390f7c2fe642bea08507374a184de233"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga390f7c2fe642bea08507374a184de233">stp_clear_parameter</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga390f7c2fe642bea08507374a184de233"><td class="mdescLeft">&#160;</td><td class="mdescRight">Clear a parameter.  <a href="group__vars.html#ga390f7c2fe642bea08507374a184de233"></a><br/></td></tr>
+<tr class="memitem:ga110e543418842a6dd79149409620bf13"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110e543418842a6dd79149409620bf13">stp_list_string_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga110e543418842a6dd79149409620bf13"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all string parameters.  <a href="group__vars.html#ga110e543418842a6dd79149409620bf13"></a><br/></td></tr>
+<tr class="memitem:ga76c7e033078e6c2fa276ee72ca97c63c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c">stp_list_file_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga76c7e033078e6c2fa276ee72ca97c63c"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all file parameters.  <a href="group__vars.html#ga76c7e033078e6c2fa276ee72ca97c63c"></a><br/></td></tr>
+<tr class="memitem:gadec4183ce240188ed18fdc21d9b518f7"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7">stp_list_float_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gadec4183ce240188ed18fdc21d9b518f7"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all float parameters.  <a href="group__vars.html#gadec4183ce240188ed18fdc21d9b518f7"></a><br/></td></tr>
+<tr class="memitem:gae08d29a439b77219f32d037ab5b191f5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5">stp_list_int_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gae08d29a439b77219f32d037ab5b191f5"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all integer parameters.  <a href="group__vars.html#gae08d29a439b77219f32d037ab5b191f5"></a><br/></td></tr>
+<tr class="memitem:ga5cae4a118badc7c52e5f7b7543c83d8e"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e">stp_list_dimension_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga5cae4a118badc7c52e5f7b7543c83d8e"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all dimension parameters.  <a href="group__vars.html#ga5cae4a118badc7c52e5f7b7543c83d8e"></a><br/></td></tr>
+<tr class="memitem:ga60f98e23144fd1bf5aa53def670b2c91"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91">stp_list_boolean_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga60f98e23144fd1bf5aa53def670b2c91"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all boolean parameters.  <a href="group__vars.html#ga60f98e23144fd1bf5aa53def670b2c91"></a><br/></td></tr>
+<tr class="memitem:ga1329d614d6cd18fc6c244b020e26b081"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081">stp_list_curve_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga1329d614d6cd18fc6c244b020e26b081"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all curve parameters.  <a href="group__vars.html#ga1329d614d6cd18fc6c244b020e26b081"></a><br/></td></tr>
+<tr class="memitem:ga16d23d59368e907a29719f0902ea75fe"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe">stp_list_array_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga16d23d59368e907a29719f0902ea75fe"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all array parameters.  <a href="group__vars.html#ga16d23d59368e907a29719f0902ea75fe"></a><br/></td></tr>
+<tr class="memitem:ga4d06ccaf72d08800f7eb78b3293f4a00"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00">stp_list_raw_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:ga4d06ccaf72d08800f7eb78b3293f4a00"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all raw parameters.  <a href="group__vars.html#ga4d06ccaf72d08800f7eb78b3293f4a00"></a><br/></td></tr>
+<tr class="memitem:ga27864133bc2159d1472cbdfb3b781c27"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27">stp_list_parameters</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga27864133bc2159d1472cbdfb3b781c27"><td class="mdescLeft">&#160;</td><td class="mdescRight">List all parameters.  <a href="group__vars.html#ga27864133bc2159d1472cbdfb3b781c27"></a><br/></td></tr>
+<tr class="memitem:gac9f06e27ce5b6808d30c6fc01558db3b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b">stp_set_string_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gac9f06e27ce5b6808d30c6fc01558db3b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#gac9f06e27ce5b6808d30c6fc01558db3b"></a><br/></td></tr>
+<tr class="memitem:ga0628a3f1feb7db7b5b10249a2b4f2412"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412">stp_set_file_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0628a3f1feb7db7b5b10249a2b4f2412"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#ga0628a3f1feb7db7b5b10249a2b4f2412"></a><br/></td></tr>
+<tr class="memitem:ga49e5b05ba7bf8ccf6e95cb744f4f0f93"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93">stp_set_float_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga49e5b05ba7bf8ccf6e95cb744f4f0f93"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#ga49e5b05ba7bf8ccf6e95cb744f4f0f93"></a><br/></td></tr>
+<tr class="memitem:ga0cc1a26e8c3d502024c55a065fd5629a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a">stp_set_int_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0cc1a26e8c3d502024c55a065fd5629a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#ga0cc1a26e8c3d502024c55a065fd5629a"></a><br/></td></tr>
+<tr class="memitem:ga28feceb75f731d6de08d1fdad1fc269e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e">stp_set_dimension_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga28feceb75f731d6de08d1fdad1fc269e"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#ga28feceb75f731d6de08d1fdad1fc269e"></a><br/></td></tr>
+<tr class="memitem:ga3b74af22c776ddebd6b70455e196fe1c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c">stp_set_boolean_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga3b74af22c776ddebd6b70455e196fe1c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ga3b74af22c776ddebd6b70455e196fe1c"></a><br/></td></tr>
+<tr class="memitem:ga0486744f97114ba03d4f8f7562d6c739"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739">stp_set_curve_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga0486744f97114ba03d4f8f7562d6c739"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ga0486744f97114ba03d4f8f7562d6c739"></a><br/></td></tr>
+<tr class="memitem:ga4d13479ad3669ec9b8d7dcc109bc8e7d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d">stp_set_array_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga4d13479ad3669ec9b8d7dcc109bc8e7d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#ga4d13479ad3669ec9b8d7dcc109bc8e7d"></a><br/></td></tr>
+<tr class="memitem:ga47b8c3b31693ecdef420160b40b23a0d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d">stp_set_raw_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga47b8c3b31693ecdef420160b40b23a0d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#ga47b8c3b31693ecdef420160b40b23a0d"></a><br/></td></tr>
+<tr class="memitem:ga5ececd1972a375e1e569ed4a242ed1ed"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed">stp_set_parameter_active</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga5ececd1972a375e1e569ed4a242ed1ed"><td class="mdescLeft">&#160;</td><td class="mdescRight">Set the activity of a parameter.  <a href="group__vars.html#ga5ececd1972a375e1e569ed4a242ed1ed"></a><br/></td></tr>
+<tr class="memitem:ga8189b61073bfcd0244d5d6f2a2c8ba86"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga8189b61073bfcd0244d5d6f2a2c8ba86"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#ga8189b61073bfcd0244d5d6f2a2c8ba86"></a><br/></td></tr>
+<tr class="memitem:gaa7db6701be5d05e545c79db905e4c7eb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gaa7db6701be5d05e545c79db905e4c7eb"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#gaa7db6701be5d05e545c79db905e4c7eb"></a><br/></td></tr>
+<tr class="memitem:gab12bebb419eb1ae8f323aa931e324389"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gab12bebb419eb1ae8f323aa931e324389"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#gab12bebb419eb1ae8f323aa931e324389"></a><br/></td></tr>
+<tr class="memitem:ga4fd7914c01e2e1b34797736dfd2c9b9c"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga4fd7914c01e2e1b34797736dfd2c9b9c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#ga4fd7914c01e2e1b34797736dfd2c9b9c"></a><br/></td></tr>
+<tr class="memitem:gac1f2b865c76da441b6c1bd9b5b93aa1f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:gac1f2b865c76da441b6c1bd9b5b93aa1f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#gac1f2b865c76da441b6c1bd9b5b93aa1f"></a><br/></td></tr>
+<tr class="memitem:ga23b9c17426210460618c4f95c5f34229"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23b9c17426210460618c4f95c5f34229">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga23b9c17426210460618c4f95c5f34229"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#ga23b9c17426210460618c4f95c5f34229"></a><br/></td></tr>
+<tr class="memitem:ga6c94a1df4388b142d00d5d30df904b47"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga6c94a1df4388b142d00d5d30df904b47"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#ga6c94a1df4388b142d00d5d30df904b47"></a><br/></td></tr>
+<tr class="memitem:ga5a629e6da1f5008f0db034191ad8b1d5"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga5a629e6da1f5008f0db034191ad8b1d5"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#ga5a629e6da1f5008f0db034191ad8b1d5"></a><br/></td></tr>
+<tr class="memitem:ga285f05c648724c80bf05af30f87120a3"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga285f05c648724c80bf05af30f87120a3">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active)</td></tr>
+<tr class="memdesc:ga285f05c648724c80bf05af30f87120a3"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#ga285f05c648724c80bf05af30f87120a3"></a><br/></td></tr>
+<tr class="memitem:gaa416ba26ede5046db94b54b9d846e329"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329">stp_check_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a> active, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:gaa416ba26ede5046db94b54b9d846e329"><td class="mdescLeft">&#160;</td><td class="mdescRight">Check if a parameter is set.  <a href="group__vars.html#gaa416ba26ede5046db94b54b9d846e329"></a><br/></td></tr>
+<tr class="memitem:ga0b7be7ba9f763be692dd833a434ed13d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga0b7be7ba9f763be692dd833a434ed13d"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#ga0b7be7ba9f763be692dd833a434ed13d"></a><br/></td></tr>
+<tr class="memitem:ga47e7a69ff8e23eed6188542c5c8bff4f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga47e7a69ff8e23eed6188542c5c8bff4f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#ga47e7a69ff8e23eed6188542c5c8bff4f"></a><br/></td></tr>
+<tr class="memitem:ga4b8f9847f2eebfff53446a9bc235ab68"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga4b8f9847f2eebfff53446a9bc235ab68"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#ga4b8f9847f2eebfff53446a9bc235ab68"></a><br/></td></tr>
+<tr class="memitem:gab74fd69c4ef62af7b5ab33c6baf48b8b"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab74fd69c4ef62af7b5ab33c6baf48b8b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#gab74fd69c4ef62af7b5ab33c6baf48b8b"></a><br/></td></tr>
+<tr class="memitem:ga45f9abd8ac6772ea850344c513f6c436"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:ga45f9abd8ac6772ea850344c513f6c436"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#ga45f9abd8ac6772ea850344c513f6c436"></a><br/></td></tr>
+<tr class="memitem:gab33cf5376adc63e826cd3dedae33e930"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab33cf5376adc63e826cd3dedae33e930"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#gab33cf5376adc63e826cd3dedae33e930"></a><br/></td></tr>
+<tr class="memitem:gae36bf982c52215f11fe8e392b4b3d705"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gae36bf982c52215f11fe8e392b4b3d705"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#gae36bf982c52215f11fe8e392b4b3d705"></a><br/></td></tr>
+<tr class="memitem:gac9f85c3a8bf99e09150cbf4220e4b983"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gac9f85c3a8bf99e09150cbf4220e4b983"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#gac9f85c3a8bf99e09150cbf4220e4b983"></a><br/></td></tr>
+<tr class="memitem:gab6e41a5edb7474ed7ac26e236e00c80c"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr class="memdesc:gab6e41a5edb7474ed7ac26e236e00c80c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#gab6e41a5edb7474ed7ac26e236e00c80c"></a><br/></td></tr>
+<tr class="memitem:ga31b32d5481a838276f23cfa4bc010c03"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga70ebf70dc8e6199d84fc91985c94bae9">stp_parameter_activity_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03">stp_get_parameter_active</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga9b3d4f47a44c0c8c9b150cddc56d2a91">stp_parameter_type_t</a> type)</td></tr>
+<tr class="memdesc:ga31b32d5481a838276f23cfa4bc010c03"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the activity status of a parameter.  <a href="group__vars.html#ga31b32d5481a838276f23cfa4bc010c03"></a><br/></td></tr>
+<tr class="memitem:gac9e6d740ffc4cff5dc7d0bf106a3e7df"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr class="memdesc:gac9e6d740ffc4cff5dc7d0bf106a3e7df"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#gac9e6d740ffc4cff5dc7d0bf106a3e7df"></a><br/></td></tr>
+<tr class="memitem:ga67d1e68ed47e5b554f2021fca1f01978"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memdesc:ga67d1e68ed47e5b554f2021fca1f01978"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#ga67d1e68ed47e5b554f2021fca1f01978"></a><br/></td></tr>
+<tr class="memitem:gad17cadb7fd78bffb759f2213a1a90df6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6">stp_get_maximum_imageable_area</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr class="memdesc:gad17cadb7fd78bffb759f2213a1a90df6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the maximum imagable area of the page.  <a href="group__vars.html#gad17cadb7fd78bffb759f2213a1a90df6"></a><br/></td></tr>
+<tr class="memitem:ga0c8ee62453baff3d2c00e0ccae67b049"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr class="memdesc:ga0c8ee62453baff3d2c00e0ccae67b049"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga0c8ee62453baff3d2c00e0ccae67b049"></a><br/></td></tr>
+<tr class="memitem:ga88715b31fcec18778f769ffbc1b55384"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr class="memdesc:ga88715b31fcec18778f769ffbc1b55384"><td class="mdescLeft">&#160;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga88715b31fcec18778f769ffbc1b55384"></a><br/></td></tr>
+<tr class="memitem:gab926417b2f601c78d85df44694cc6d38"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gab926417b2f601c78d85df44694cc6d38">stp_verify</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memdesc:gab926417b2f601c78d85df44694cc6d38"><td class="mdescLeft">&#160;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#gab926417b2f601c78d85df44694cc6d38"></a><br/></td></tr>
+<tr class="memitem:gaf63982a6e44f8b62532346d9ceb3d91c"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c">stp_default_settings</a> (void)</td></tr>
+<tr class="memdesc:gaf63982a6e44f8b62532346d9ceb3d91c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#gaf63982a6e44f8b62532346d9ceb3d91c"></a><br/></td></tr>
+<tr class="memitem:gadb64d444ebed8ec698ce949f8a1aae4b"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b">stp_parameter_get_category</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category)</td></tr>
+<tr class="memdesc:gadb64d444ebed8ec698ce949f8a1aae4b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the value of a specified category for the specified parameter.  <a href="group__vars.html#gadb64d444ebed8ec698ce949f8a1aae4b"></a><br/></td></tr>
+<tr class="memitem:gaecbbdd337f5b844ae7cc3e035dea8b37"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37">stp_parameter_has_category_value</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const char *category, const char *value)</td></tr>
+<tr class="memdesc:gaecbbdd337f5b844ae7cc3e035dea8b37"><td class="mdescLeft">&#160;</td><td class="mdescRight">Determine whether a parameter has a category with the specified value.  <a href="group__vars.html#gaecbbdd337f5b844ae7cc3e035dea8b37"></a><br/></td></tr>
+<tr class="memitem:gad87a41146ef226c77cb8dc4993e40863"><td class="memItemLeft" align="right" valign="top"><a class="el" href="string-list_8h.html#a5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863">stp_parameter_get_categories</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc)</td></tr>
+<tr class="memdesc:gad87a41146ef226c77cb8dc4993e40863"><td class="mdescLeft">&#160;</td><td class="mdescRight">Get the list of categories and their values for the specified parameter.  <a href="group__vars.html#gad87a41146ef226c77cb8dc4993e40863"></a><br/></td></tr>
+<tr class="memitem:gafd4f81ca2ad497bd21f005344844f9c4"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gafd4f81ca2ad497bd21f005344844f9c4">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga25e6aec21fd8f8a65c4c4086d0f3dec0">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga1ac9aa4c059fbb52307d8522a5f1dc6d">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr class="memitem:ga151b7d922a3e1e5e9d9f0ea8de6ab70a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga151b7d922a3e1e5e9d9f0ea8de6ab70a">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memitem:ga1666dd1571bdb866a85d4318858893be"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1666dd1571bdb866a85d4318858893be">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr class="memitem:gabfffe0d654de156874decdc0338216f4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#gac061852de3627383cd415cd80a979e02">stp_parameter_verify_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gabfffe0d654de156874decdc0338216f4">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr class="memitem:ga6d04a3c444753f11004ad6259a91e853"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6d04a3c444753f11004ad6259a91e853">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ga1023ad18d2c97763137909b6191b0940"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1023ad18d2c97763137909b6191b0940">stp_set_verified</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int value)</td></tr>
+<tr class="memitem:gaf7d2d5a9897c9ce77bb16f4a1addaa62"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaf7d2d5a9897c9ce77bb16f4a1addaa62">stp_copy_options</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *vs)</td></tr>
+<tr class="memitem:ga7f2c578ff7ae28a3db502476aa10137e"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7f2c578ff7ae28a3db502476aa10137e">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Print job functions. </p>
-</div></div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div></div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 8ddc85c..71f3621 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/weave.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,44 +41,51 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a> &#124;
 <a href="#var-members">Variables</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/weave.h File Reference</div>  </div>
-</div>
+<div class="title">weave.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>Softweave functions.  
 <a href="#details">More...</a></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html">stp_pass_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6e5fd9b98567e1fd3fde622fd42dec67">STP_MAX_WEAVE</a>&#160;&#160;&#160;(16)</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html">stp_pass_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a6e5fd9b98567e1fd3fde622fd42dec67"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6e5fd9b98567e1fd3fde622fd42dec67">STP_MAX_WEAVE</a>&#160;&#160;&#160;(16)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ad25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)</td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:ae8aea6782f8e438961332cb7cc18bcdc"><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
+<tr class="memitem:a3bb2000973de2f8a9a2b50a1b5e18097"><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
+<tr class="memitem:ad25d63c939f6ace90d029473ad33ce63"><td class="memItemLeft" align="right" valign="top">typedef void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ad25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
+<tr class="memitem:a6e7058d252c95199e92f783d84775fa1"><td class="memItemLeft" align="right" valign="top">typedef int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a> { <br/>
+<tr class="memitem:a059ef2763c95a5cc47d51dcf38580991"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a> { <br/>
 &#160;&#160;<a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991a6077c1fbd3cc6c79a1ac5f23d31bd2b3">STP_WEAVE_ZIGZAG</a>, 
 <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991a9b5dcc799a9afed0063f052196fa8d6b">STP_WEAVE_ASCENDING</a>, 
 <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991afaf7b19bfde4be5241cb112835325797">STP_WEAVE_DESCENDING</a>, 
@@ -82,30 +95,32 @@ Enumerations</h2></td></tr>
 <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991aecb24603379f9f3dd682bf692326a8e1">STP_WEAVE_ASCENDING_3X</a>
 <br/>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5b4fc76c83f5408182f90fb139c06b50">stp_initialize_weave</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#ad25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>, <a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>, <a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>, <a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ab9694e4381a005efb70daea2429345a3">stp_flush_all</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#aea7e0ed7877aa1e98b2ce9c210ad9ff4">stp_write_weave</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a986bb835225820c68d85041e797cf2a5">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4c7e67ed92ac3427c94fb0e6a85bfce9">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5acdf7cc603254e68b0ae39e45ea52f3">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a1ec75a70b7dad8a5d0e4c963d67677c3">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5412630e5a7ba809b6ef84ab4e6c9f09">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a39d760951513fd171f9dc25b57daf229">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
-<tr><td colspan="2"><h2><a name="var-members"></a>
+<tr class="memitem:a5b4fc76c83f5408182f90fb139c06b50"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5b4fc76c83f5408182f90fb139c06b50">stp_initialize_weave</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#ad25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>, <a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>, <a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>, <a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>)</td></tr>
+<tr class="memitem:ab9694e4381a005efb70daea2429345a3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ab9694e4381a005efb70daea2429345a3">stp_flush_all</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:aea7e0ed7877aa1e98b2ce9c210ad9ff4"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#aea7e0ed7877aa1e98b2ce9c210ad9ff4">stp_write_weave</a> (<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
+<tr class="memitem:a986bb835225820c68d85041e797cf2a5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a986bb835225820c68d85041e797cf2a5">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
+<tr class="memitem:a4c7e67ed92ac3427c94fb0e6a85bfce9"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4c7e67ed92ac3427c94fb0e6a85bfce9">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
+<tr class="memitem:a5acdf7cc603254e68b0ae39e45ea52f3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5acdf7cc603254e68b0ae39e45ea52f3">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
+<tr class="memitem:a1ec75a70b7dad8a5d0e4c963d67677c3"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a1ec75a70b7dad8a5d0e4c963d67677c3">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
+<tr class="memitem:a5412630e5a7ba809b6ef84ab4e6c9f09"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5412630e5a7ba809b6ef84ab4e6c9f09">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int pass)</td></tr>
+<tr class="memitem:a39d760951513fd171f9dc25b57daf229"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a39d760951513fd171f9dc25b57daf229">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="var-members"></a>
 Variables</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a525feabe0775e573007678b2da863b24">stp_pack_tiff</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a561a5fd614c279fdc9ea9c14c7a5b540">stp_pack_uncompressed</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a87a7e015e79b03ec26069ddf9ab64c50">stp_fill_tiff</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a581ae80f8594763f27620d3338407fef">stp_fill_uncompressed</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a9907d0fcce9e3c336fa7c6d66e1c91a5">stp_compute_tiff_linewidth</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4046c403128b61705309b05700120e41">stp_compute_uncompressed_linewidth</a></td></tr>
+<tr class="memitem:a525feabe0775e573007678b2da863b24"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a525feabe0775e573007678b2da863b24">stp_pack_tiff</a></td></tr>
+<tr class="memitem:a561a5fd614c279fdc9ea9c14c7a5b540"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a561a5fd614c279fdc9ea9c14c7a5b540">stp_pack_uncompressed</a></td></tr>
+<tr class="memitem:a87a7e015e79b03ec26069ddf9ab64c50"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a87a7e015e79b03ec26069ddf9ab64c50">stp_fill_tiff</a></td></tr>
+<tr class="memitem:a581ae80f8594763f27620d3338407fef"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a581ae80f8594763f27620d3338407fef">stp_fill_uncompressed</a></td></tr>
+<tr class="memitem:a9907d0fcce9e3c336fa7c6d66e1c91a5"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a9907d0fcce9e3c336fa7c6d66e1c91a5">stp_compute_tiff_linewidth</a></td></tr>
+<tr class="memitem:a4046c403128b61705309b05700120e41"><td class="memItemLeft" align="right" valign="top"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4046c403128b61705309b05700120e41">stp_compute_uncompressed_linewidth</a></td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>Softweave functions. </p>
-</div><hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a6e5fd9b98567e1fd3fde622fd42dec67"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="a6e5fd9b98567e1fd3fde622fd42dec67" args="" -->
+</div><hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a6e5fd9b98567e1fd3fde622fd42dec67"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -113,66 +128,61 @@ Variables</h2></td></tr>
           <td class="memname">#define STP_MAX_WEAVE&#160;&#160;&#160;(16)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a6e7058d252c95199e92f783d84775fa1"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="a6e7058d252c95199e92f783d84775fa1" args="(stp_vars_t *v, int n)" -->
+<a class="anchor" id="a6e7058d252c95199e92f783d84775fa1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int <a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)</td>
+          <td class="memname">typedef int stp_compute_linewidth_func(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int n)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3bb2000973de2f8a9a2b50a1b5e18097"></a><!-- doxytag: member="weave.h::stp_fillfunc" ref="a3bb2000973de2f8a9a2b50a1b5e18097" args="(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)" -->
+<a class="anchor" id="a3bb2000973de2f8a9a2b50a1b5e18097"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void <a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a>(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td>
+          <td class="memname">typedef void stp_fillfunc(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad25d63c939f6ace90d029473ad33ce63"></a><!-- doxytag: member="weave.h::stp_flushfunc" ref="ad25d63c939f6ace90d029473ad33ce63" args="(stp_vars_t *v, int passno, int vertical_subpass)" -->
+<a class="anchor" id="ad25d63c939f6ace90d029473ad33ce63"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef void <a class="el" href="weave_8h.html#ad25d63c939f6ace90d029473ad33ce63">stp_flushfunc</a>(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)</td>
+          <td class="memname">typedef void stp_flushfunc(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, int passno, int vertical_subpass)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae8aea6782f8e438961332cb7cc18bcdc"></a><!-- doxytag: member="weave.h::stp_packfunc" ref="ae8aea6782f8e438961332cb7cc18bcdc" args="(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)" -->
+<a class="anchor" id="ae8aea6782f8e438961332cb7cc18bcdc"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int <a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a>(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td>
+          <td class="memname">typedef int stp_packfunc(<a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="a059ef2763c95a5cc47d51dcf38580991" args="" -->
+<a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -180,20 +190,19 @@ Variables</h2></td></tr>
           <td class="memname">enum <a class="el" href="weave_8h.html#a059ef2763c95a5cc47d51dcf38580991">stp_weave_strategy_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a6077c1fbd3cc6c79a1ac5f23d31bd2b3"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="a059ef2763c95a5cc47d51dcf38580991a6077c1fbd3cc6c79a1ac5f23d31bd2b3" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a6077c1fbd3cc6c79a1ac5f23d31bd2b3"></a>STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a9b5dcc799a9afed0063f052196fa8d6b"></a><!-- doxytag: member="STP_WEAVE_ASCENDING" ref="a059ef2763c95a5cc47d51dcf38580991a9b5dcc799a9afed0063f052196fa8d6b" args="" -->STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a9b5dcc799a9afed0063f052196fa8d6b"></a>STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991afaf7b19bfde4be5241cb112835325797"></a><!-- doxytag: member="STP_WEAVE_DESCENDING" ref="a059ef2763c95a5cc47d51dcf38580991afaf7b19bfde4be5241cb112835325797" args="" -->STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991afaf7b19bfde4be5241cb112835325797"></a>STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a7bfa24511bcbc811272e385372c61936"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_2X" ref="a059ef2763c95a5cc47d51dcf38580991a7bfa24511bcbc811272e385372c61936" args="" -->STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a7bfa24511bcbc811272e385372c61936"></a>STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a8e37ffcadb7b41a3276029206a80d5e6"></a><!-- doxytag: member="STP_WEAVE_STAGGERED" ref="a059ef2763c95a5cc47d51dcf38580991a8e37ffcadb7b41a3276029206a80d5e6" args="" -->STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991a8e37ffcadb7b41a3276029206a80d5e6"></a>STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991aecb24603379f9f3dd682bf692326a8e1"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_3X" ref="a059ef2763c95a5cc47d51dcf38580991aecb24603379f9f3dd682bf692326a8e1" args="" -->STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a059ef2763c95a5cc47d51dcf38580991aecb24603379f9f3dd682bf692326a8e1"></a>STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -202,7 +211,7 @@ Variables</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ab9694e4381a005efb70daea2429345a3"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="ab9694e4381a005efb70daea2429345a3" args="(stp_vars_t *v)" -->
+<a class="anchor" id="ab9694e4381a005efb70daea2429345a3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -214,12 +223,11 @@ Variables</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4c7e67ed92ac3427c94fb0e6a85bfce9"></a><!-- doxytag: member="weave.h::stp_get_lineactive_by_pass" ref="a4c7e67ed92ac3427c94fb0e6a85bfce9" args="(const stp_vars_t *v, int pass)" -->
+<a class="anchor" id="a4c7e67ed92ac3427c94fb0e6a85bfce9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -241,12 +249,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1ec75a70b7dad8a5d0e4c963d67677c3"></a><!-- doxytag: member="weave.h::stp_get_linebases_by_pass" ref="a1ec75a70b7dad8a5d0e4c963d67677c3" args="(const stp_vars_t *v, int pass)" -->
+<a class="anchor" id="a1ec75a70b7dad8a5d0e4c963d67677c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -268,12 +275,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5acdf7cc603254e68b0ae39e45ea52f3"></a><!-- doxytag: member="weave.h::stp_get_linecount_by_pass" ref="a5acdf7cc603254e68b0ae39e45ea52f3" args="(const stp_vars_t *v, int pass)" -->
+<a class="anchor" id="a5acdf7cc603254e68b0ae39e45ea52f3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -295,12 +301,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a986bb835225820c68d85041e797cf2a5"></a><!-- doxytag: member="weave.h::stp_get_lineoffsets_by_pass" ref="a986bb835225820c68d85041e797cf2a5" args="(const stp_vars_t *v, int pass)" -->
+<a class="anchor" id="a986bb835225820c68d85041e797cf2a5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -322,12 +327,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5412630e5a7ba809b6ef84ab4e6c9f09"></a><!-- doxytag: member="weave.h::stp_get_pass_by_pass" ref="a5412630e5a7ba809b6ef84ab4e6c9f09" args="(const stp_vars_t *v, int pass)" -->
+<a class="anchor" id="a5412630e5a7ba809b6ef84ab4e6c9f09"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -349,12 +353,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5b4fc76c83f5408182f90fb139c06b50"></a><!-- doxytag: member="weave.h::stp_initialize_weave" ref="a5b4fc76c83f5408182f90fb139c06b50" args="(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)" -->
+<a class="anchor" id="a5b4fc76c83f5408182f90fb139c06b50"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -472,12 +475,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a39d760951513fd171f9dc25b57daf229"></a><!-- doxytag: member="weave.h::stp_weave_parameters_by_row" ref="a39d760951513fd171f9dc25b57daf229" args="(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)" -->
+<a class="anchor" id="a39d760951513fd171f9dc25b57daf229"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -511,12 +513,11 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aea7e0ed7877aa1e98b2ce9c210ad9ff4"></a><!-- doxytag: member="weave.h::stp_write_weave" ref="aea7e0ed7877aa1e98b2ce9c210ad9ff4" args="(stp_vars_t *v, unsigned char *const cols[])" -->
+<a class="anchor" id="aea7e0ed7877aa1e98b2ce9c210ad9ff4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -538,93 +539,89 @@ Variables</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Variable Documentation</h2>
-<a class="anchor" id="a9907d0fcce9e3c336fa7c6d66e1c91a5"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a9907d0fcce9e3c336fa7c6d66e1c91a5" args="" -->
+<a class="anchor" id="a9907d0fcce9e3c336fa7c6d66e1c91a5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a9907d0fcce9e3c336fa7c6d66e1c91a5">stp_compute_tiff_linewidth</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> stp_compute_tiff_linewidth</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4046c403128b61705309b05700120e41"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="a4046c403128b61705309b05700120e41" args="" -->
+<a class="anchor" id="a4046c403128b61705309b05700120e41"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a4046c403128b61705309b05700120e41">stp_compute_uncompressed_linewidth</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#a6e7058d252c95199e92f783d84775fa1">stp_compute_linewidth_func</a> stp_compute_uncompressed_linewidth</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a87a7e015e79b03ec26069ddf9ab64c50"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="a87a7e015e79b03ec26069ddf9ab64c50" args="" -->
+<a class="anchor" id="a87a7e015e79b03ec26069ddf9ab64c50"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> <a class="el" href="weave_8h.html#a87a7e015e79b03ec26069ddf9ab64c50">stp_fill_tiff</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> stp_fill_tiff</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a581ae80f8594763f27620d3338407fef"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="a581ae80f8594763f27620d3338407fef" args="" -->
+<a class="anchor" id="a581ae80f8594763f27620d3338407fef"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> <a class="el" href="weave_8h.html#a581ae80f8594763f27620d3338407fef">stp_fill_uncompressed</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#a3bb2000973de2f8a9a2b50a1b5e18097">stp_fillfunc</a> stp_fill_uncompressed</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a525feabe0775e573007678b2da863b24"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="a525feabe0775e573007678b2da863b24" args="" -->
+<a class="anchor" id="a525feabe0775e573007678b2da863b24"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> <a class="el" href="weave_8h.html#a525feabe0775e573007678b2da863b24">stp_pack_tiff</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> stp_pack_tiff</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a561a5fd614c279fdc9ea9c14c7a5b540"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="a561a5fd614c279fdc9ea9c14c7a5b540" args="" -->
+<a class="anchor" id="a561a5fd614c279fdc9ea9c14c7a5b540"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> <a class="el" href="weave_8h.html#a561a5fd614c279fdc9ea9c14c7a5b540">stp_pack_uncompressed</a></td>
+          <td class="memname"><a class="el" href="weave_8h.html#ae8aea6782f8e438961332cb7cc18bcdc">stp_packfunc</a> stp_pack_uncompressed</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index aa179c4..90014f4 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprint API Reference: include/gutenprint/xml.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprint API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprint API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -35,108 +41,110 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_1aca62f7c2d1ca2bd7aa79274e259f3c.html">gutenprint</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprint/xml.h File Reference</div>  </div>
-</div>
+<div class="title">xml.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 
 <p>XML tree functions.  
 <a href="#details">More...</a></p>
 <div class="textblock"><code>#include &lt;<a class="el" href="mxml_8h.html">gutenprint/mxml.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a> )(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="memitem:afad8ff906c4248935a93794f1b6f8c1a"><td class="memItemLeft" align="right" valign="top">typedef int(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a> )(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, const char *file)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a9082cdb0bef669a2c1cd463874d56cb3">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a> parse_func)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a018dc99b4a78447b2e8cf66fec5a47b8">stp_unregister_xml_parser</a> (const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a8ce0a404da56d87db34ee50562f3154d">stp_register_xml_preload</a> (const char *filename)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a07bde9804f5e759aea971fea06e8cff7">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3cfa9b65f1620621f0a0c6c7038fd316">stp_xml_init_defaults</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac18d19df318ec2e3b4c850c68f07fe8f">stp_xml_parse_file</a> (const char *file)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a28f6df53b5a7623b654dff6ec26db8c7">stp_xmlstrtol</a> (const char *value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1c1ba2f2312544bda8b3ce2e919e4687">stp_xmlstrtoul</a> (const char *value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a955626cb67a5067d67a116f8ab67007d">stp_xmlstrtod</a> (const char *textval)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a4a44cfc8ec6e821c4f8564397b3bd66f">stp_xmlstrtoraw</a> (const char *textval)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3e003171cb008a542fffbeff3f2e2299">stp_rawtoxmlstr</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a6bdda178f51ef17e02b0c662e0b06a8b">stp_strtoxmlstr</a> (const char *raw)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a13a01102edf22955690bf21a44049369">stp_prtraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, FILE *fp)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1a82a8dc830a6f7f81ec4e6f2344a5af">stp_xml_init</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ab7b7abdceb4f1e6e6c6a607cd2eedead">stp_xml_exit</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3f776c6582845b20c4f76b239d590ec6">stp_xml_get_node</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a31f7bc9f5f2b2ce79dcfc87d7f4630f2">stp_xmldoc_create_generic</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a57035ed4be23f4527c9515198bf37a9d">stp_xml_preinit</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#afa6f69121eb86b2aee998635b79d21ac">stp_sequence_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ad03ea12e2b0089daf469c6af120ef180">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *seq)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a112e57d9f022170ee00b0a66fea1770f">stp_curve_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ae8c5f8944f4921f772eb12e52c7fb95d">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ace5ac81af291e43504d5c0200276e543">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a2ec4cf1f87b354d564429f3d34afd029">stp_vars_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ae02d45dc8cae7bea5c4e378e121d6623">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#acecaf19b0eb498487f14bf462c181c16">stp_vars_create_from_xmltree_ref</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *root)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac0c8478cc24d2aee3eaaf7eafa4586b9">stp_vars_fill_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da, <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a152b1cd11fb8bc6b7ecc95c65ee74ec6">stp_vars_fill_from_xmltree_ref</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *root, <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a139bc6e17f2ccabf7e149241f923d9c4">stp_xmltree_create_from_vars</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac3ebefda15f3996388895a4408c3b030">stp_xml_parse_file_named</a> (const char *name)</td></tr>
+<tr class="memitem:a9082cdb0bef669a2c1cd463874d56cb3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a9082cdb0bef669a2c1cd463874d56cb3">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a> parse_func)</td></tr>
+<tr class="memitem:a018dc99b4a78447b2e8cf66fec5a47b8"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a018dc99b4a78447b2e8cf66fec5a47b8">stp_unregister_xml_parser</a> (const char *name)</td></tr>
+<tr class="memitem:a8ce0a404da56d87db34ee50562f3154d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a8ce0a404da56d87db34ee50562f3154d">stp_register_xml_preload</a> (const char *filename)</td></tr>
+<tr class="memitem:a07bde9804f5e759aea971fea06e8cff7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a07bde9804f5e759aea971fea06e8cff7">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
+<tr class="memitem:a3cfa9b65f1620621f0a0c6c7038fd316"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3cfa9b65f1620621f0a0c6c7038fd316">stp_xml_init_defaults</a> (void)</td></tr>
+<tr class="memitem:ac18d19df318ec2e3b4c850c68f07fe8f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac18d19df318ec2e3b4c850c68f07fe8f">stp_xml_parse_file</a> (const char *file)</td></tr>
+<tr class="memitem:a28f6df53b5a7623b654dff6ec26db8c7"><td class="memItemLeft" align="right" valign="top">long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a28f6df53b5a7623b654dff6ec26db8c7">stp_xmlstrtol</a> (const char *value)</td></tr>
+<tr class="memitem:a1c1ba2f2312544bda8b3ce2e919e4687"><td class="memItemLeft" align="right" valign="top">unsigned long&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1c1ba2f2312544bda8b3ce2e919e4687">stp_xmlstrtoul</a> (const char *value)</td></tr>
+<tr class="memitem:a955626cb67a5067d67a116f8ab67007d"><td class="memItemLeft" align="right" valign="top">double&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a955626cb67a5067d67a116f8ab67007d">stp_xmlstrtod</a> (const char *textval)</td></tr>
+<tr class="memitem:a4a44cfc8ec6e821c4f8564397b3bd66f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a4a44cfc8ec6e821c4f8564397b3bd66f">stp_xmlstrtoraw</a> (const char *textval)</td></tr>
+<tr class="memitem:a3e003171cb008a542fffbeff3f2e2299"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3e003171cb008a542fffbeff3f2e2299">stp_rawtoxmlstr</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw)</td></tr>
+<tr class="memitem:a6bdda178f51ef17e02b0c662e0b06a8b"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a6bdda178f51ef17e02b0c662e0b06a8b">stp_strtoxmlstr</a> (const char *raw)</td></tr>
+<tr class="memitem:a13a01102edf22955690bf21a44049369"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a13a01102edf22955690bf21a44049369">stp_prtraw</a> (const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *raw, FILE *fp)</td></tr>
+<tr class="memitem:a1a82a8dc830a6f7f81ec4e6f2344a5af"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1a82a8dc830a6f7f81ec4e6f2344a5af">stp_xml_init</a> (void)</td></tr>
+<tr class="memitem:ab7b7abdceb4f1e6e6c6a607cd2eedead"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ab7b7abdceb4f1e6e6c6a607cd2eedead">stp_xml_exit</a> (void)</td></tr>
+<tr class="memitem:a3f776c6582845b20c4f76b239d590ec6"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3f776c6582845b20c4f76b239d590ec6">stp_xml_get_node</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
+<tr class="memitem:a31f7bc9f5f2b2ce79dcfc87d7f4630f2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a31f7bc9f5f2b2ce79dcfc87d7f4630f2">stp_xmldoc_create_generic</a> (void)</td></tr>
+<tr class="memitem:a57035ed4be23f4527c9515198bf37a9d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a57035ed4be23f4527c9515198bf37a9d">stp_xml_preinit</a> (void)</td></tr>
+<tr class="memitem:afa6f69121eb86b2aee998635b79d21ac"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#afa6f69121eb86b2aee998635b79d21ac">stp_sequence_create_from_xmltree</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da)</td></tr>
+<tr class="memitem:ad03ea12e2b0089daf469c6af120ef180"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ad03ea12e2b0089daf469c6af120ef180">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *seq)</td></tr>
+<tr class="memitem:a112e57d9f022170ee00b0a66fea1770f"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a112e57d9f022170ee00b0a66fea1770f">stp_curve_create_from_xmltree</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da)</td></tr>
+<tr class="memitem:ae8c5f8944f4921f772eb12e52c7fb95d"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ae8c5f8944f4921f772eb12e52c7fb95d">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *curve)</td></tr>
+<tr class="memitem:ace5ac81af291e43504d5c0200276e543"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ace5ac81af291e43504d5c0200276e543">stp_array_create_from_xmltree</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *array)</td></tr>
+<tr class="memitem:a2ec4cf1f87b354d564429f3d34afd029"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a2ec4cf1f87b354d564429f3d34afd029">stp_vars_create_from_xmltree</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da)</td></tr>
+<tr class="memitem:ae02d45dc8cae7bea5c4e378e121d6623"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ae02d45dc8cae7bea5c4e378e121d6623">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *array)</td></tr>
+<tr class="memitem:acecaf19b0eb498487f14bf462c181c16"><td class="memItemLeft" align="right" valign="top"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#acecaf19b0eb498487f14bf462c181c16">stp_vars_create_from_xmltree_ref</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *root)</td></tr>
+<tr class="memitem:ac0c8478cc24d2aee3eaaf7eafa4586b9"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac0c8478cc24d2aee3eaaf7eafa4586b9">stp_vars_fill_from_xmltree</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da, <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a152b1cd11fb8bc6b7ecc95c65ee74ec6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a152b1cd11fb8bc6b7ecc95c65ee74ec6">stp_vars_fill_from_xmltree_ref</a> (<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *da, <a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *root, <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:a139bc6e17f2ccabf7e149241f923d9c4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a139bc6e17f2ccabf7e149241f923d9c4">stp_xmltree_create_from_vars</a> (const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *v)</td></tr>
+<tr class="memitem:ac3ebefda15f3996388895a4408c3b030"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ac3ebefda15f3996388895a4408c3b030">stp_xml_parse_file_named</a> (const char *name)</td></tr>
 </table>
 <hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
 <div class="textblock"><p>XML tree functions. </p>
 </div><hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="afad8ff906c4248935a93794f1b6f8c1a"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="afad8ff906c4248935a93794f1b6f8c1a" args=")(stp_mxml_node_t *node, const char *file)" -->
+<a class="anchor" id="afad8ff906c4248935a93794f1b6f8c1a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef int(* <a class="el" href="xml_8h.html#afad8ff906c4248935a93794f1b6f8c1a">stp_xml_parse_func</a>)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td>
+          <td class="memname">typedef int(* stp_xml_parse_func)(<a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *node, const char *file)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ace5ac81af291e43504d5c0200276e543"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="ace5ac81af291e43504d5c0200276e543" args="(stp_mxml_node_t *array)" -->
+<a class="anchor" id="ace5ac81af291e43504d5c0200276e543"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* stp_array_create_from_xmltree </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>array</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a112e57d9f022170ee00b0a66fea1770f"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="a112e57d9f022170ee00b0a66fea1770f" args="(stp_mxml_node_t *da)" -->
+<a class="anchor" id="a112e57d9f022170ee00b0a66fea1770f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* stp_curve_create_from_xmltree </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a13a01102edf22955690bf21a44049369"></a><!-- doxytag: member="xml.h::stp_prtraw" ref="a13a01102edf22955690bf21a44049369" args="(const stp_raw_t *raw, FILE *fp)" -->
+<a class="anchor" id="a13a01102edf22955690bf21a44049369"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -158,12 +166,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3e003171cb008a542fffbeff3f2e2299"></a><!-- doxytag: member="xml.h::stp_rawtoxmlstr" ref="a3e003171cb008a542fffbeff3f2e2299" args="(const stp_raw_t *raw)" -->
+<a class="anchor" id="a3e003171cb008a542fffbeff3f2e2299"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -175,12 +182,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9082cdb0bef669a2c1cd463874d56cb3"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="a9082cdb0bef669a2c1cd463874d56cb3" args="(const char *name, stp_xml_parse_func parse_func)" -->
+<a class="anchor" id="a9082cdb0bef669a2c1cd463874d56cb3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -202,12 +208,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8ce0a404da56d87db34ee50562f3154d"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="a8ce0a404da56d87db34ee50562f3154d" args="(const char *filename)" -->
+<a class="anchor" id="a8ce0a404da56d87db34ee50562f3154d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -219,29 +224,27 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afa6f69121eb86b2aee998635b79d21ac"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="afa6f69121eb86b2aee998635b79d21ac" args="(stp_mxml_node_t *da)" -->
+<a class="anchor" id="afa6f69121eb86b2aee998635b79d21ac"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a>* stp_sequence_create_from_xmltree </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6bdda178f51ef17e02b0c662e0b06a8b"></a><!-- doxytag: member="xml.h::stp_strtoxmlstr" ref="a6bdda178f51ef17e02b0c662e0b06a8b" args="(const char *raw)" -->
+<a class="anchor" id="a6bdda178f51ef17e02b0c662e0b06a8b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -253,12 +256,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a018dc99b4a78447b2e8cf66fec5a47b8"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="a018dc99b4a78447b2e8cf66fec5a47b8" args="(const char *name)" -->
+<a class="anchor" id="a018dc99b4a78447b2e8cf66fec5a47b8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -270,12 +272,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a07bde9804f5e759aea971fea06e8cff7"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="a07bde9804f5e759aea971fea06e8cff7" args="(const char *filename)" -->
+<a class="anchor" id="a07bde9804f5e759aea971fea06e8cff7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -287,42 +288,40 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a2ec4cf1f87b354d564429f3d34afd029"></a><!-- doxytag: member="xml.h::stp_vars_create_from_xmltree" ref="a2ec4cf1f87b354d564429f3d34afd029" args="(stp_mxml_node_t *da)" -->
+<a class="anchor" id="a2ec4cf1f87b354d564429f3d34afd029"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create_from_xmltree </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acecaf19b0eb498487f14bf462c181c16"></a><!-- doxytag: member="xml.h::stp_vars_create_from_xmltree_ref" ref="acecaf19b0eb498487f14bf462c181c16" args="(stp_mxml_node_t *da, stp_mxml_node_t *root)" -->
+<a class="anchor" id="acecaf19b0eb498487f14bf462c181c16"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname"><a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a>* stp_vars_create_from_xmltree_ref </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>root</em>&#160;</td>
         </tr>
         <tr>
@@ -331,19 +330,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac0c8478cc24d2aee3eaaf7eafa4586b9"></a><!-- doxytag: member="xml.h::stp_vars_fill_from_xmltree" ref="ac0c8478cc24d2aee3eaaf7eafa4586b9" args="(stp_mxml_node_t *da, stp_vars_t *v)" -->
+<a class="anchor" id="ac0c8478cc24d2aee3eaaf7eafa4586b9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_vars_fill_from_xmltree </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em>, </td>
         </tr>
         <tr>
@@ -358,25 +356,24 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a152b1cd11fb8bc6b7ecc95c65ee74ec6"></a><!-- doxytag: member="xml.h::stp_vars_fill_from_xmltree_ref" ref="a152b1cd11fb8bc6b7ecc95c65ee74ec6" args="(stp_mxml_node_t *da, stp_mxml_node_t *root, stp_vars_t *v)" -->
+<a class="anchor" id="a152b1cd11fb8bc6b7ecc95c65ee74ec6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stp_vars_fill_from_xmltree_ref </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>da</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>root</em>, </td>
         </tr>
         <tr>
@@ -391,12 +388,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab7b7abdceb4f1e6e6c6a607cd2eedead"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="ab7b7abdceb4f1e6e6c6a607cd2eedead" args="(void)" -->
+<a class="anchor" id="ab7b7abdceb4f1e6e6c6a607cd2eedead"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -408,19 +404,18 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3f776c6582845b20c4f76b239d590ec6"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="a3f776c6582845b20c4f76b239d590ec6" args="(stp_mxml_node_t *xmlroot,...)" -->
+<a class="anchor" id="a3f776c6582845b20c4f76b239d590ec6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xml_get_node </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xml_get_node </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a> *&#160;</td>
           <td class="paramname"><em>xmlroot</em>, </td>
         </tr>
         <tr>
@@ -435,12 +430,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1a82a8dc830a6f7f81ec4e6f2344a5af"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="a1a82a8dc830a6f7f81ec4e6f2344a5af" args="(void)" -->
+<a class="anchor" id="a1a82a8dc830a6f7f81ec4e6f2344a5af"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -452,12 +446,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3cfa9b65f1620621f0a0c6c7038fd316"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="a3cfa9b65f1620621f0a0c6c7038fd316" args="(void)" -->
+<a class="anchor" id="a3cfa9b65f1620621f0a0c6c7038fd316"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -469,12 +462,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac18d19df318ec2e3b4c850c68f07fe8f"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="ac18d19df318ec2e3b4c850c68f07fe8f" args="(const char *file)" -->
+<a class="anchor" id="ac18d19df318ec2e3b4c850c68f07fe8f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -486,12 +478,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac3ebefda15f3996388895a4408c3b030"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="ac3ebefda15f3996388895a4408c3b030" args="(const char *name)" -->
+<a class="anchor" id="ac3ebefda15f3996388895a4408c3b030"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -503,12 +494,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a57035ed4be23f4527c9515198bf37a9d"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="a57035ed4be23f4527c9515198bf37a9d" args="(void)" -->
+<a class="anchor" id="a57035ed4be23f4527c9515198bf37a9d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -520,29 +510,27 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a31f7bc9f5f2b2ce79dcfc87d7f4630f2"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="a31f7bc9f5f2b2ce79dcfc87d7f4630f2" args="(void)" -->
+<a class="anchor" id="a31f7bc9f5f2b2ce79dcfc87d7f4630f2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmldoc_create_generic </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xmldoc_create_generic </td>
           <td>(</td>
           <td class="paramtype">void&#160;</td>
           <td class="paramname"></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a955626cb67a5067d67a116f8ab67007d"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="a955626cb67a5067d67a116f8ab67007d" args="(const char *textval)" -->
+<a class="anchor" id="a955626cb67a5067d67a116f8ab67007d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -554,12 +542,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a28f6df53b5a7623b654dff6ec26db8c7"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="a28f6df53b5a7623b654dff6ec26db8c7" args="(const char *value)" -->
+<a class="anchor" id="a28f6df53b5a7623b654dff6ec26db8c7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -571,12 +558,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4a44cfc8ec6e821c4f8564397b3bd66f"></a><!-- doxytag: member="xml.h::stp_xmlstrtoraw" ref="a4a44cfc8ec6e821c4f8564397b3bd66f" args="(const char *textval)" -->
+<a class="anchor" id="a4a44cfc8ec6e821c4f8564397b3bd66f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -588,12 +574,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1c1ba2f2312544bda8b3ce2e919e4687"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="a1c1ba2f2312544bda8b3ce2e919e4687" args="(const char *value)" -->
+<a class="anchor" id="a1c1ba2f2312544bda8b3ce2e919e4687"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -605,82 +590,80 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae02d45dc8cae7bea5c4e378e121d6623"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="ae02d45dc8cae7bea5c4e378e121d6623" args="(const stp_array_t *array)" -->
+<a class="anchor" id="ae02d45dc8cae7bea5c4e378e121d6623"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_array </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xmltree_create_from_array </td>
           <td>(</td>
           <td class="paramtype">const <a class="el" href="group__array.html#ga26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&#160;</td>
           <td class="paramname"><em>array</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae8c5f8944f4921f772eb12e52c7fb95d"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="ae8c5f8944f4921f772eb12e52c7fb95d" args="(const stp_curve_t *curve)" -->
+<a class="anchor" id="ae8c5f8944f4921f772eb12e52c7fb95d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_curve </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xmltree_create_from_curve </td>
           <td>(</td>
           <td class="paramtype">const <a class="el" href="group__curve.html#ga375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&#160;</td>
           <td class="paramname"><em>curve</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad03ea12e2b0089daf469c6af120ef180"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="ad03ea12e2b0089daf469c6af120ef180" args="(const stp_sequence_t *seq)" -->
+<a class="anchor" id="ad03ea12e2b0089daf469c6af120ef180"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_sequence </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xmltree_create_from_sequence </td>
           <td>(</td>
           <td class="paramtype">const <a class="el" href="group__sequence.html#ga327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&#160;</td>
           <td class="paramname"><em>seq</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a139bc6e17f2ccabf7e149241f923d9c4"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_vars" ref="a139bc6e17f2ccabf7e149241f923d9c4" args="(const stp_vars_t *v)" -->
+<a class="anchor" id="a139bc6e17f2ccabf7e149241f923d9c4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_vars </td>
+          <td class="memname"><a class="el" href="mxml_8h.html#a8fb80a78e3ac8d8aa9eb14c35326bd82">stp_mxml_node_t</a>* stp_xmltree_create_from_vars </td>
           <td>(</td>
           <td class="paramtype">const <a class="el" href="group__vars.html#ga2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&#160;</td>
           <td class="paramname"><em>v</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index b8a44f0..6722749 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1' standalone='yes' ?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
 <tagfile>
   <compound kind="file">
     <name>curve.h</name>
@@ -1164,4 +1164,20 @@
       <arglist></arglist>
     </member>
   </compound>
+  <compound kind="dir">
+    <name>include/gutenprintui2/</name>
+    <path>/home/rlk/sandbox/print-5.1/include/gutenprintui2/</path>
+    <filename>dir_6692d22cad271f22063fae9b501c7ab3.html</filename>
+    <file>curve.h</file>
+    <file>gammacurve.h</file>
+    <file>gutenprintui.h</file>
+    <file>t.h</file>
+    <file>typebuiltins.h</file>
+  </compound>
+  <compound kind="dir">
+    <name>include/</name>
+    <path>/home/rlk/sandbox/print-5.1/include/</path>
+    <filename>dir_d44c64559bbebec7f509842c48db8b23.html</filename>
+    <dir>include/gutenprintui2/</dir>
+  </compound>
 </tagfile>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index e914fa9..97aa6ac 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Data Structures</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,23 +40,28 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Data Structures</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here are the data structures with brief descriptions:</div><table>
-  <tr><td class="indexkey"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstpui__image.html">stpui_image</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
+<div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
+<table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct__StpuiCurve.html" target="_self">_StpuiCurve</a></td><td class="desc"></td></tr>
+<tr id="row_1_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct__StpuiCurveClass.html" target="_self">_StpuiCurveClass</a></td><td class="desc"></td></tr>
+<tr id="row_2_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct__StpuiGammaCurve.html" target="_self">_StpuiGammaCurve</a></td><td class="desc"></td></tr>
+<tr id="row_3_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="struct__StpuiGammaCurveClass.html" target="_self">_StpuiGammaCurveClass</a></td><td class="desc"></td></tr>
+<tr id="row_4_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstpui__image.html" target="_self">stpui_image</a></td><td class="desc"></td></tr>
+<tr id="row_5_"><td class="entry"><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2cl.png" alt="C" width="24" height="22" /><a class="el" href="structstpui__plist__t.html" target="_self">stpui_plist_t</a></td><td class="desc"></td></tr>
 </table>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/bc_s.png b/doc/gutenprintui2/html/bc_s.png
index e401862..25e3beb 100644
--- a/doc/gutenprintui2/html/bc_s.png
+++ b/doc/gutenprintui2/html/bc_s.png
diff --git a/doc/gutenprintui2/html/bdwn.png b/doc/gutenprintui2/html/bdwn.png
new file mode 100644
index 0000000..940a0b9
--- /dev/null
+++ b/doc/gutenprintui2/html/bdwn.png
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index aadd2db..5116333 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Data Structure Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,20 +40,29 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">Data Structure Index</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
 <div class="qindex"><a class="qindex" href="#letter_S">S</a>&#160;|&#160;<a class="qindex" href="#letter__">_</a></div>
-<table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
-</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&#160;&#160;&#160;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&#160;&#160;&#160;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&#160;&#160;&#160;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&#160;&#160;&#160;</td></tr><tr><td><a class="el" href="structstpui__image.html">stpui_image</a>&#160;&#160;&#160;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;_&#160;&#160;</div></td></tr></table>
-</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&#160;&#160;&#160;</td></tr></table><div class="qindex"><a class="qindex" href="#letter_S">S</a>&#160;|&#160;<a class="qindex" href="#letter__">_</a></div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+<table style="margin: 10px; white-space: nowrap;" align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
+<tr><td rowspan="2" valign="bottom"><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&#160;&#160;&#160;</td></tr>
+<tr><td rowspan="2" valign="bottom"><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;_&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&#160;&#160;&#160;</td><td></td></tr>
+<tr><td valign="top"><a class="el" href="structstpui__image.html">stpui_image</a>&#160;&#160;&#160;</td><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&#160;&#160;&#160;</td><td></td><td></td></tr>
+<tr><td></td><td></td><td></td><td></td></tr>
+</table>
+<div class="qindex"><a class="qindex" href="#letter_S">S</a>&#160;|&#160;<a class="qindex" href="#letter__">_</a></div>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/closed.png b/doc/gutenprintui2/html/closed.png
index b7d4bd9..98cc2c9 100644
--- a/doc/gutenprintui2/html/closed.png
+++ b/doc/gutenprintui2/html/closed.png
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 9383032..a970514 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: include/gutenprintui2/curve.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,56 +39,64 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprintui2/curve.h File Reference</div>  </div>
-</div>
+<div class="title">curve.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;gdk/gdk.h&gt;</code><br/>
 <code>#include &lt;gtk/gtkdrawingarea.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>&#160;&#160;&#160;(stpui_curve_get_type ())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a03272c56621cf16c2caa378231c7fa43">STPUI_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#ad788bc4e6a85701756b28d972a64b7f8">STPUI_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a92f2038dd52d2b3af7c03bdeb5918567">STPUI_IS_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#aee626496df16d25159b91982478b0df9">STPUI_IS_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a41b32938b1bfc087ca93b3655ef03ab6">STPUI_CURVE_GET_CLASS</a>(obj)&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a887bee281f88accbe674790e5e5b28e3"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>&#160;&#160;&#160;(<a class="el" href="curve_8h.html#a233b21367f03cd5ba884d4e3c742c8d2">stpui_curve_get_type</a> ())</td></tr>
+<tr class="memitem:a03272c56621cf16c2caa378231c7fa43"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a03272c56621cf16c2caa378231c7fa43">STPUI_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a>))</td></tr>
+<tr class="memitem:ad788bc4e6a85701756b28d972a64b7f8"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#ad788bc4e6a85701756b28d972a64b7f8">STPUI_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a>))</td></tr>
+<tr class="memitem:a92f2038dd52d2b3af7c03bdeb5918567"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a92f2038dd52d2b3af7c03bdeb5918567">STPUI_IS_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>))</td></tr>
+<tr class="memitem:aee626496df16d25159b91982478b0df9"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#aee626496df16d25159b91982478b0df9">STPUI_IS_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>))</td></tr>
+<tr class="memitem:a41b32938b1bfc087ca93b3655ef03ab6"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a41b32938b1bfc087ca93b3655ef03ab6">STPUI_CURVE_GET_CLASS</a>(obj)&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a>))</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:a5c0213fede0b7d8a91b66e4679cc899a"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td></tr>
+<tr class="memitem:a057f1c40a70e84c7a187b423ebe4aada"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> { <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996ba741f86dc6dfb50a67dd621a287014de1">STPUI_CURVE_TYPE_LINEAR</a>, 
+<tr class="memitem:a59cb8817385039367325d6dbb4a0996b"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> { <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996ba741f86dc6dfb50a67dd621a287014de1">STPUI_CURVE_TYPE_LINEAR</a>, 
 <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996ba6cef8a118ee2829db63f812874a412c1">STPUI_CURVE_TYPE_SPLINE</a>, 
 <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996ba1a204ef2d450d762415a1c0c1c77db89">STPUI_CURVE_TYPE_FREE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a233b21367f03cd5ba884d4e3c742c8d2">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#acbdc99aaef1f5672d0294d9742fdc398">stpui_curve_new</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a466fe70debd1a7eca3988f91a109009f">stpui_curve_reset</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a956d80d857cf5927768a38103d8af705">stpui_curve_set_gamma</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#ad4dcd042b1e50672781895d886adad66">stpui_curve_set_range</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a43799d3f187018958cb78ece053dadda">stpui_curve_get_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#abe1c943341872697e6219d7053db2804">stpui_curve_set_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a196839b2b6e39ae4bd5ccc9aad4ff8f7">stpui_curve_set_curve_type</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> type)</td></tr>
+<tr class="memitem:a233b21367f03cd5ba884d4e3c742c8d2"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a233b21367f03cd5ba884d4e3c742c8d2">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr class="memitem:acbdc99aaef1f5672d0294d9742fdc398"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#acbdc99aaef1f5672d0294d9742fdc398">stpui_curve_new</a> (void)</td></tr>
+<tr class="memitem:a466fe70debd1a7eca3988f91a109009f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a466fe70debd1a7eca3988f91a109009f">stpui_curve_reset</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve)</td></tr>
+<tr class="memitem:a956d80d857cf5927768a38103d8af705"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a956d80d857cf5927768a38103d8af705">stpui_curve_set_gamma</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
+<tr class="memitem:ad4dcd042b1e50672781895d886adad66"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#ad4dcd042b1e50672781895d886adad66">stpui_curve_set_range</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
+<tr class="memitem:a43799d3f187018958cb78ece053dadda"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a43799d3f187018958cb78ece053dadda">stpui_curve_get_vector</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
+<tr class="memitem:abe1c943341872697e6219d7053db2804"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#abe1c943341872697e6219d7053db2804">stpui_curve_set_vector</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
+<tr class="memitem:a196839b2b6e39ae4bd5ccc9aad4ff8f7"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a196839b2b6e39ae4bd5ccc9aad4ff8f7">stpui_curve_set_curve_type</a> (<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> type)</td></tr>
 </table>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a03272c56621cf16c2caa378231c7fa43"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="a03272c56621cf16c2caa378231c7fa43" args="(obj)" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a03272c56621cf16c2caa378231c7fa43"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -91,15 +105,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad788bc4e6a85701756b28d972a64b7f8"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="ad788bc4e6a85701756b28d972a64b7f8" args="(klass)" -->
+<a class="anchor" id="ad788bc4e6a85701756b28d972a64b7f8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -108,15 +121,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">klass</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a41b32938b1bfc087ca93b3655ef03ab6"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="a41b32938b1bfc087ca93b3655ef03ab6" args="(obj)" -->
+<a class="anchor" id="a41b32938b1bfc087ca93b3655ef03ab6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -125,15 +137,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>, <a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a92f2038dd52d2b3af7c03bdeb5918567"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="a92f2038dd52d2b3af7c03bdeb5918567" args="(obj)" -->
+<a class="anchor" id="a92f2038dd52d2b3af7c03bdeb5918567"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -142,15 +153,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aee626496df16d25159b91982478b0df9"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="aee626496df16d25159b91982478b0df9" args="(klass)" -->
+<a class="anchor" id="aee626496df16d25159b91982478b0df9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -159,56 +169,52 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">klass</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), <a class="el" href="curve_8h.html#a887bee281f88accbe674790e5e5b28e3">STPUI_TYPE_CURVE</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a887bee281f88accbe674790e5e5b28e3"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="a887bee281f88accbe674790e5e5b28e3" args="" -->
+<a class="anchor" id="a887bee281f88accbe674790e5e5b28e3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_CURVE&#160;&#160;&#160;(stpui_curve_get_type ())</td>
+          <td class="memname">#define STPUI_TYPE_CURVE&#160;&#160;&#160;(<a class="el" href="curve_8h.html#a233b21367f03cd5ba884d4e3c742c8d2">stpui_curve_get_type</a> ())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a5c0213fede0b7d8a91b66e4679cc899a"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="a5c0213fede0b7d8a91b66e4679cc899a" args="" -->
+<a class="anchor" id="a5c0213fede0b7d8a91b66e4679cc899a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a> <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a></td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a> <a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a057f1c40a70e84c7a187b423ebe4aada"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="a057f1c40a70e84c7a187b423ebe4aada" args="" -->
+<a class="anchor" id="a057f1c40a70e84c7a187b423ebe4aada"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a> <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a></td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a> <a class="el" href="curve_8h.html#a057f1c40a70e84c7a187b423ebe4aada">StpuiCurveClass</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="a59cb8817385039367325d6dbb4a0996b"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="a59cb8817385039367325d6dbb4a0996b" args="" -->
+<a class="anchor" id="a59cb8817385039367325d6dbb4a0996b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -216,14 +222,13 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba741f86dc6dfb50a67dd621a287014de1"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="a59cb8817385039367325d6dbb4a0996ba741f86dc6dfb50a67dd621a287014de1" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba741f86dc6dfb50a67dd621a287014de1"></a>STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba6cef8a118ee2829db63f812874a412c1"></a><!-- doxytag: member="STPUI_CURVE_TYPE_SPLINE" ref="a59cb8817385039367325d6dbb4a0996ba6cef8a118ee2829db63f812874a412c1" args="" -->STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba6cef8a118ee2829db63f812874a412c1"></a>STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba1a204ef2d450d762415a1c0c1c77db89"></a><!-- doxytag: member="STPUI_CURVE_TYPE_FREE" ref="a59cb8817385039367325d6dbb4a0996ba1a204ef2d450d762415a1c0c1c77db89" args="" -->STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="a59cb8817385039367325d6dbb4a0996ba1a204ef2d450d762415a1c0c1c77db89"></a>STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -232,7 +237,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a233b21367f03cd5ba884d4e3c742c8d2"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="a233b21367f03cd5ba884d4e3c742c8d2" args="(void) G_GNUC_CONST" -->
+<a class="anchor" id="a233b21367f03cd5ba884d4e3c742c8d2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -244,19 +249,18 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a43799d3f187018958cb78ece053dadda"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="a43799d3f187018958cb78ece053dadda" args="(StpuiCurve *curve, int veclen, gfloat vector[])" -->
+<a class="anchor" id="a43799d3f187018958cb78ece053dadda"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_get_vector </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em>, </td>
         </tr>
         <tr>
@@ -277,12 +281,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acbdc99aaef1f5672d0294d9742fdc398"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="acbdc99aaef1f5672d0294d9742fdc398" args="(void)" -->
+<a class="anchor" id="acbdc99aaef1f5672d0294d9742fdc398"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -294,36 +297,34 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a466fe70debd1a7eca3988f91a109009f"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="a466fe70debd1a7eca3988f91a109009f" args="(StpuiCurve *curve)" -->
+<a class="anchor" id="a466fe70debd1a7eca3988f91a109009f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_reset </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em></td><td>)</td>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a196839b2b6e39ae4bd5ccc9aad4ff8f7"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="a196839b2b6e39ae4bd5ccc9aad4ff8f7" args="(StpuiCurve *curve, StpuiCurveType type)" -->
+<a class="anchor" id="a196839b2b6e39ae4bd5ccc9aad4ff8f7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_set_curve_type </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em>, </td>
         </tr>
         <tr>
@@ -338,19 +339,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a956d80d857cf5927768a38103d8af705"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="a956d80d857cf5927768a38103d8af705" args="(StpuiCurve *curve, gfloat gamma_)" -->
+<a class="anchor" id="a956d80d857cf5927768a38103d8af705"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_set_gamma </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em>, </td>
         </tr>
         <tr>
@@ -365,19 +365,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad4dcd042b1e50672781895d886adad66"></a><!-- doxytag: member="curve.h::stpui_curve_set_range" ref="ad4dcd042b1e50672781895d886adad66" args="(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)" -->
+<a class="anchor" id="ad4dcd042b1e50672781895d886adad66"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_set_range </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em>, </td>
         </tr>
         <tr>
@@ -410,19 +409,18 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="abe1c943341872697e6219d7053db2804"></a><!-- doxytag: member="curve.h::stpui_curve_set_vector" ref="abe1c943341872697e6219d7053db2804" args="(StpuiCurve *curve, int veclen, const gfloat vector[])" -->
+<a class="anchor" id="abe1c943341872697e6219d7053db2804"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">void stpui_curve_set_vector </td>
           <td>(</td>
-          <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *&#160;</td>
           <td class="paramname"><em>curve</em>, </td>
         </tr>
         <tr>
@@ -443,14 +441,16 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir_6692d22cad271f22063fae9b501c7ab3.html b/doc/gutenprintui2/html/dir_6692d22cad271f22063fae9b501c7ab3.html
new file mode 100644
index 0000000..bc4ee23
--- /dev/null
+++ b/doc/gutenprintui2/html/dir_6692d22cad271f22063fae9b501c7ab3.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<title>libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td style="padding-left: 0.5em;">
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
+</div>
+</div><!-- top -->
+<div class="header">
+  <div class="headertitle">
+<div class="title">gutenprintui2 Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="files"></a>
+Files</h2></td></tr>
+<tr class="memitem:curve_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html">curve.h</a></td></tr>
+<tr class="memitem:gammacurve_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html">gammacurve.h</a></td></tr>
+<tr class="memitem:gutenprintui_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td></tr>
+<tr class="memitem:t_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html">t.h</a></td></tr>
+<tr class="memitem:typebuiltins_8h"><td class="memItemLeft" align="right" valign="top">file &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td></tr>
+</table>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
+</body>
+</html>
diff --git a/doc/gutenprintui2/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/gutenprintui2/html/dir_d44c64559bbebec7f509842c48db8b23.html
new file mode 100644
index 0000000..c5d5bc2
--- /dev/null
+++ b/doc/gutenprintui2/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<title>libgutenprintui2 API Reference: include/ Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td style="padding-left: 0.5em;">
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
+  <div id="navrow1" class="tabs">
+    <ul class="tablist">
+      <li><a href="index.html"><span>Main&#160;Page</span></a></li>
+      <li><a href="annotated.html"><span>Data&#160;Structures</span></a></li>
+      <li><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li>  </ul>
+</div>
+</div><!-- top -->
+<div class="header">
+  <div class="headertitle">
+<div class="title">include Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="subdirs"></a>
+Directories</h2></td></tr>
+<tr class="memitem:dir_6692d22cad271f22063fae9b501c7ab3"><td class="memItemLeft" align="right" valign="top">directory &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></td></tr>
+</table>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
+</body>
+</html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index 74445fe..ceac83e 100644
--- a/doc/gutenprintui2/html/doxygen.css
+++ b/doc/gutenprintui2/html/doxygen.css
@@ -2,7 +2,8 @@
 
 body, table, div, p, dl {
 	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size: 12px;
+	font-size: 13px;
+	line-height: 1.3;
 }
 
 /* @group Heading Levels */
@@ -25,6 +26,19 @@ h3 {
 	font-size: 100%;
 }
 
+h1, h2, h3, h4, h5, h6 {
+	-webkit-transition: text-shadow 0.5s linear;
+	-moz-transition: text-shadow 0.5s linear;
+	-ms-transition: text-shadow 0.5s linear;
+	-o-transition: text-shadow 0.5s linear;
+	transition: text-shadow 0.5s linear;
+	margin-right: 15px;
+}
+
+h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
+	text-shadow: 0 0 15px cyan;
+}
+
 dt {
 	font-weight: bold;
 }
@@ -72,8 +86,6 @@ div.qindex, div.navtab{
 	background-color: #EBEFF6;
 	border: 1px solid #A3B4D7;
 	text-align: center;
-	margin: 2px;
-	padding: 2px;
 }
 
 div.qindex, div.navpath {
@@ -123,12 +135,12 @@ a.el {
 a.elRef {
 }
 
-a.code {
-	color: #4665A2;
+a.code, a.code:visited {
+	color: #4665A2; 
 }
 
-a.codeRef {
-	color: #4665A2;
+a.codeRef, a.codeRef:visited {
+	color: #4665A2; 
 }
 
 /* @end */
@@ -137,20 +149,56 @@ dl.el {
 	margin-left: -1cm;
 }
 
-.fragment {
+pre.fragment {
+        border: 1px solid #C4CFE5;
+        background-color: #FBFCFD;
+        padding: 4px 6px;
+        margin: 4px 8px 4px 2px;
+        overflow: auto;
+        word-wrap: break-word;
+        font-size:  9pt;
+        line-height: 125%;
+        font-family: monospace, fixed;
+        font-size: 105%;
+}
+
+div.fragment {
+        padding: 4px;
+        margin: 4px;
+	background-color: #FBFCFD;
+	border: 1px solid #C4CFE5;
+}
+
+div.line {
 	font-family: monospace, fixed;
-	font-size: 105%;
+        font-size: 13px;
+	min-height: 13px;
+	line-height: 1.0;
+	text-wrap: unrestricted;
+	white-space: -moz-pre-wrap; /* Moz */
+	white-space: -pre-wrap;     /* Opera 4-6 */
+	white-space: -o-pre-wrap;   /* Opera 7 */
+	white-space: pre-wrap;      /* CSS3  */
+	word-wrap: break-word;      /* IE 5.5+ */
+	text-indent: -53px;
+	padding-left: 53px;
+	padding-bottom: 0px;
+	margin: 0px;
 }
 
-pre.fragment {
-	border: 1px solid #C4CFE5;
-	background-color: #FBFCFD;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-	overflow: auto;
-	word-wrap: break-word;
-	font-size:  9pt;
-	line-height: 125%;
+span.lineno {
+	padding-right: 4px;
+	text-align: right;
+	border-right: 2px solid #0F0;
+	background-color: #E8E8E8;
+        white-space: pre;
+}
+span.lineno a {
+	background-color: #D8D8D8;
+}
+
+span.lineno a:hover {
+	background-color: #C8C8C8;
 }
 
 div.ah {
@@ -183,15 +231,15 @@ div.groupText {
 }
 
 body {
-	background: white;
+	background-color: white;
 	color: black;
         margin: 0;
 }
 
 div.contents {
 	margin-top: 10px;
-	margin-left: 10px;
-	margin-right: 5px;
+	margin-left: 12px;
+	margin-right: 8px;
 }
 
 td.indexkey {
@@ -200,6 +248,8 @@ td.indexkey {
 	border: 1px solid #C4CFE5;
 	margin: 2px 0px 2px 0;
 	padding: 2px 10px;
+        white-space: nowrap;
+        vertical-align: top;
 }
 
 td.indexvalue {
@@ -292,6 +342,13 @@ span.vhdllogic {
 	color: #ff0000 
 }
 
+blockquote {
+        background-color: #F7F8FB;
+        border-left: 2px solid #9CAFD4;
+        margin: 0 24px 0 4px;
+        padding: 0 12px 0 16px;
+}
+
 /* @end */
 
 /*
@@ -345,6 +402,24 @@ table.memberdecls {
 	padding: 0px;
 }
 
+.memberdecls td {
+	-webkit-transition-property: background-color, box-shadow;
+	-webkit-transition-duration: 0.5s;
+	-moz-transition-property: background-color, box-shadow;
+	-moz-transition-duration: 0.5s;
+	-ms-transition-property: background-color, box-shadow;
+	-ms-transition-duration: 0.5s;
+	-o-transition-property: background-color, box-shadow;
+	-o-transition-duration: 0.5s;
+	transition-property: background-color, box-shadow;
+	transition-duration: 0.5s;
+}
+
+.memberdecls td.glow {
+	background-color: cyan;
+	box-shadow: 0 0 15px cyan;
+}
+
 .mdescLeft, .mdescRight,
 .memItemLeft, .memItemRight,
 .memTemplItemLeft, .memTemplItemRight, .memTemplParams {
@@ -406,15 +481,27 @@ table.memberdecls {
 	padding: 0;
 	margin-bottom: 10px;
 	margin-right: 5px;
+        -webkit-transition: box-shadow 0.5s linear;
+        -moz-transition: box-shadow 0.5s linear;
+        -ms-transition: box-shadow 0.5s linear;
+        -o-transition: box-shadow 0.5s linear;
+        transition: box-shadow 0.5s linear;
+}
+
+.memitem.glow {
+         box-shadow: 0 0 15px cyan;
 }
 
 .memname {
-        white-space: nowrap;
         font-weight: bold;
         margin-left: 6px;
 }
 
-.memproto {
+.memname td {
+	vertical-align: bottom;
+}
+
+.memproto, dl.reflist dt {
         border-top: 1px solid #A8B8D9;
         border-left: 1px solid #A8B8D9;
         border-right: 1px solid #A8B8D9;
@@ -422,45 +509,55 @@ table.memberdecls {
         color: #253555;
         font-weight: bold;
         text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
         /* opera specific markup */
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 8px;
-        border-top-left-radius: 8px;
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
         /* firefox specific markup */
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 8px;
-        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 4px;
+        -moz-border-radius-topleft: 4px;
         /* webkit specific markup */
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 8px;
-        -webkit-border-top-left-radius: 8px;
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
+        -webkit-border-top-right-radius: 4px;
+        -webkit-border-top-left-radius: 4px;
 
 }
 
-.memdoc {
+.memdoc, dl.reflist dd {
         border-bottom: 1px solid #A8B8D9;      
         border-left: 1px solid #A8B8D9;      
         border-right: 1px solid #A8B8D9; 
-        padding: 2px 5px;
+        padding: 6px 10px 2px 10px;
         background-color: #FBFCFD;
         border-top-width: 0;
+        background-image:url('nav_g.png');
+        background-repeat:repeat-x;
+        background-color: #FFFFFF;
         /* opera specific markup */
-        border-bottom-left-radius: 8px;
-        border-bottom-right-radius: 8px;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
         box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
         /* firefox specific markup */
-        -moz-border-radius-bottomleft: 8px;
-        -moz-border-radius-bottomright: 8px;
+        -moz-border-radius-bottomleft: 4px;
+        -moz-border-radius-bottomright: 4px;
         -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
         /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 8px;
-        -webkit-border-bottom-right-radius: 8px;
+        -webkit-border-bottom-left-radius: 4px;
+        -webkit-border-bottom-right-radius: 4px;
         -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
+}
+
+dl.reflist dt {
+        padding: 5px;
+}
+
+dl.reflist dd {
+        margin: 0px 0px 10px 0px;
+        padding: 5px;
 }
 
 .paramkey {
@@ -480,7 +577,8 @@ table.memberdecls {
 }
 
 .params, .retval, .exception, .tparams {
-        border-spacing: 6px 2px;
+        margin-left: 0px;
+        padding-left: 0px;
 }       
 
 .params .paramname, .retval .paramname {
@@ -498,105 +596,110 @@ table.memberdecls {
         vertical-align: top;
 }
 
+table.mlabels {
+	border-spacing: 0px;
+}
 
-
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0px;
+td.mlabels-left {
+	width: 100%;
+	padding: 0px;
 }
 
-/* these are for tree view when used as main index */
+td.mlabels-right {
+	vertical-align: bottom;
+	padding: 0px;
+	white-space: nowrap;
+}
 
-.directory {
-	font-size: 9pt;
-	font-weight: bold;
-	margin: 5px;
+span.mlabels {
+        margin-left: 8px;
 }
 
-.directory h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+span.mlabel {
+        background-color: #728DC1;
+        border-top:1px solid #5373B4;
+        border-left:1px solid #5373B4;
+        border-right:1px solid #C4CFE5;
+        border-bottom:1px solid #C4CFE5;
+	text-shadow: none;
+        color: white;
+        margin-right: 4px;
+        padding: 2px 3px;
+        border-radius: 3px;
+        font-size: 7pt;
+	white-space: nowrap;
 }
 
-/*
-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;
-}
+/* @end */
 
-.directory p {
-	margin: 0px;
-	white-space: nowrap;
-}
+/* these are for tree view when not used as main index */
 
-.directory div {
-	display: none;
-	margin: 0px;
+div.directory {
+        margin: 10px 0px;
+        border-top: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
 }
 
-.directory img {
-	vertical-align: -30%;
+.directory table {
+        border-collapse:collapse;
 }
 
-/* these are for tree view when not used as main index */
-
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
+.directory td {
+        margin: 0px;
+        padding: 0px;
+	vertical-align: top;
 }
 
-.directory-alt h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
+.directory td.entry {
+        white-space: nowrap;
+        padding-right: 6px;
 }
 
-.directory-alt > h3 {
-	margin-top: 0;
+.directory td.entry a {
+        outline:none;
 }
 
-.directory-alt p {
-	margin: 0px;
-	white-space: nowrap;
+.directory td.desc {
+        width: 100%;
+        padding-left: 6px;
+	padding-right: 6px;
+	border-left: 1px solid rgba(0,0,0,0.05);
 }
 
-.directory-alt div {
-	display: none;
-	margin: 0px;
+.directory tr.even {
+	padding-left: 6px;
+	background-color: #F7F8FB;
 }
 
-.directory-alt img {
+.directory img {
 	vertical-align: -30%;
 }
 
-/* @end */
+.directory .levels {
+        white-space: nowrap;
+        width: 100%;
+        text-align: right;
+        font-size: 9pt;
+}
+
+.directory .levels span {
+        cursor: pointer;
+        padding-left: 2px;
+        padding-right: 2px;
+	color: #3D578C;
+}
 
 div.dynheader {
         margin-top: 8px;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
 
 address {
@@ -606,6 +709,8 @@ address {
 
 table.doxtable {
 	border-collapse:collapse;
+        margin-top: 4px;
+        margin-bottom: 4px;
 }
 
 table.doxtable td, table.doxtable th {
@@ -619,9 +724,60 @@ table.doxtable th {
 	font-size: 110%;
 	padding-bottom: 4px;
 	padding-top: 5px;
-	text-align:left;
 }
 
+table.fieldtable {
+        width: 100%;
+        margin-bottom: 10px;
+        border: 1px solid #A8B8D9;
+        border-spacing: 0px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        border-radius: 4px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
+}
+
+.fieldtable td, .fieldtable th {
+        padding: 3px 7px 2px;
+}
+
+.fieldtable td.fieldtype, .fieldtable td.fieldname {
+        white-space: nowrap;
+        border-right: 1px solid #A8B8D9;
+        border-bottom: 1px solid #A8B8D9;
+        vertical-align: top;
+}
+
+.fieldtable td.fielddoc {
+        border-bottom: 1px solid #A8B8D9;
+        width: 100%;
+}
+
+.fieldtable tr:last-child td {
+        border-bottom: none;
+}
+
+.fieldtable th {
+        background-image:url('nav_f.png');
+        background-repeat:repeat-x;
+        background-color: #E2E8F2;
+        font-size: 90%;
+        color: #253555;
+        padding-bottom: 4px;
+        padding-top: 5px;
+        text-align:left;
+        -moz-border-radius-topleft: 4px;
+        -moz-border-radius-topright: 4px;
+        -webkit-border-top-left-radius: 4px;
+        -webkit-border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+        border-bottom: 1px solid #A8B8D9;
+}
+
+
 .tabsearch {
 	top: 0px;
 	left: 10px;
@@ -701,6 +857,7 @@ div.summary a
 
 div.ingroups
 {
+	margin-left: 5px;
 	font-size: 8pt;
 	padding-left: 5px;
 	width: 50%;
@@ -723,7 +880,7 @@ div.header
 
 div.headertitle
 {
-	padding: 5px 5px 5px 10px;
+	padding: 5px 5px 5px 7px;
 }
 
 dl
@@ -731,47 +888,74 @@ dl
         padding: 0 0 0 10px;
 }
 
-dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
+dl.section
 {
-        border-left:4px solid;
-        padding: 0 0 0 6px;
+	margin-left: 0px;
+	padding-left: 0px;
 }
 
 dl.note
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #D0C000;
 }
 
 dl.warning, dl.attention
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #FF0000;
 }
 
 dl.pre, dl.post, dl.invariant
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00D000;
 }
 
 dl.deprecated
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #505050;
 }
 
 dl.todo
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #00C0E0;
 }
 
 dl.test
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #3030E0;
 }
 
 dl.bug
 {
+        margin-left:-7px;
+        padding-left: 3px;
+        border-left:4px solid;
         border-color: #C08050;
 }
 
+dl.section dd {
+	margin-bottom: 6px;
+}
+
+
 #projectlogo
 {
 	text-align: center;
@@ -833,3 +1017,117 @@ dl.bug
 	font-weight: bold;
 }
 
+div.zoom
+{
+	border: 1px solid #90A5CE;
+}
+
+dl.citelist {
+        margin-bottom:50px;
+}
+
+dl.citelist dt {
+        color:#334975;
+        float:left;
+        font-weight:bold;
+        margin-right:10px;
+        padding:5px;
+}
+
+dl.citelist dd {
+        margin:2px 0;
+        padding:5px 0;
+}
+
+div.toc {
+        padding: 14px 25px;
+        background-color: #F4F6FA;
+        border: 1px solid #D8DFEE;
+        border-radius: 7px 7px 7px 7px;
+        float: right;
+        height: auto;
+        margin: 0 20px 10px 10px;
+        width: 200px;
+}
+
+div.toc li {
+        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
+        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
+        margin-top: 5px;
+        padding-left: 10px;
+        padding-top: 2px;
+}
+
+div.toc h3 {
+        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
+	color: #4665A2;
+        border-bottom: 0 none;
+        margin: 0;
+}
+
+div.toc ul {
+        list-style: none outside none;
+        border: medium none;
+        padding: 0px;
+}       
+
+div.toc li.level1 {
+        margin-left: 0px;
+}
+
+div.toc li.level2 {
+        margin-left: 15px;
+}
+
+div.toc li.level3 {
+        margin-left: 30px;
+}
+
+div.toc li.level4 {
+        margin-left: 45px;
+}
+
+.inherit_header {
+        font-weight: bold;
+        color: gray;
+        cursor: pointer;
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+.inherit_header td {
+        padding: 6px 0px 2px 5px;
+}
+
+.inherit {
+        display: none;
+}
+
+tr.heading h2 {
+        margin-top: 12px;
+        margin-bottom: 4px;
+}
+
+@media print
+{
+  #top { display: none; }
+  #side-nav { display: none; }
+  #nav-path { display: none; }
+  body { overflow:visible; }
+  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
+  .summary { display: none; }
+  .memitem { page-break-inside: avoid; }
+  #doc-content
+  {
+    margin-left:0 !important;
+    height:auto !important;
+    width:auto !important;
+    overflow:inherit;
+    display:inline;
+  }
+}
+
diff --git a/doc/gutenprintui2/html/doxygen.png b/doc/gutenprintui2/html/doxygen.png
index 635ed52..3ff17d8 100644
--- a/doc/gutenprintui2/html/doxygen.png
+++ b/doc/gutenprintui2/html/doxygen.png
diff --git a/doc/gutenprintui2/html/dynsections.js b/doc/gutenprintui2/html/dynsections.js
new file mode 100644
index 0000000..116542f
--- /dev/null
+++ b/doc/gutenprintui2/html/dynsections.js
@@ -0,0 +1,78 @@
+function toggleVisibility(linkObj)
+{
+ var base = $(linkObj).attr('id');
+ var summary = $('#'+base+'-summary');
+ var content = $('#'+base+'-content');
+ var trigger = $('#'+base+'-trigger');
+ var src=$(trigger).attr('src');
+ if (content.is(':visible')===true) {
+   content.hide();
+   summary.show();
+   $(linkObj).addClass('closed').removeClass('opened');
+   $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png');
+ } else {
+   content.show();
+   summary.hide();
+   $(linkObj).removeClass('closed').addClass('opened');
+   $(trigger).attr('src',src.substring(0,src.length-10)+'open.png');
+ } 
+ return false;
+}
+
+function updateStripes()
+{
+  $('table.directory tr').
+       removeClass('even').filter(':visible:even').addClass('even');
+}
+function toggleLevel(level)
+{
+  $('table.directory tr').each(function(){ 
+    var l = this.id.split('_').length-1;
+    var i = $('#img'+this.id.substring(3));
+    var a = $('#arr'+this.id.substring(3));
+    if (l<level+1) {
+      i.attr('src','ftv2folderopen.png');
+      a.attr('src','ftv2mnode.png');
+      $(this).show();
+    } else if (l==level+1) {
+      i.attr('src','ftv2folderclosed.png');
+      a.attr('src','ftv2pnode.png');
+      $(this).show();
+    } else {
+      $(this).hide();
+    }
+  });
+  updateStripes();
+}
+function toggleFolder(id) 
+{
+  var n = $('[id^=row_'+id+']');
+  var i = $('[id^=img_'+id+']');
+  var a = $('[id^=arr_'+id+']');
+  var c = n.slice(1);
+  if (c.filter(':first').is(':visible')===true) {
+    i.attr('src','ftv2folderclosed.png');
+    a.attr('src','ftv2pnode.png');
+    c.hide();
+  } else {
+    i.attr('src','ftv2folderopen.png');
+    a.attr('src','ftv2mnode.png');
+    c.show();
+  }
+  updateStripes();
+}
+
+function toggleInherit(id)
+{
+  var rows = $('tr.inherit.'+id);
+  var img = $('tr.inherit_header.'+id+' img');
+  var src = $(img).attr('src');
+  if (rows.filter(':first').is(':visible')===true) {
+    rows.css('display','none');
+    $(img).attr('src',src.substring(0,src.length-8)+'closed.png');
+  } else {
+    rows.css('display','table-row'); // using show() causes jump in firefox
+    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
+  }
+}
+
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 70c1a6d..686f19e 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: File List</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,22 +39,29 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">File List</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<div class="textblock">Here is a list of all files with brief descriptions:</div><table>
-  <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="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>
+<div class="textblock">Here is a list of all files with brief descriptions:</div><div class="directory">
+<div class="levels">[detail level <span onclick="javascript:toggleLevel(1);">1</span><span onclick="javascript:toggleLevel(2);">2</span><span onclick="javascript:toggleLevel(3);">3</span>]</div><table class="directory">
+<tr id="row_0_" class="even"><td class="entry"><img id="arr_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('0_')"/><img id="img_0_" src="ftv2folderopen.png" alt="-" width="24" height="22" onclick="toggleFolder('0_')"/><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html" target="_self">include</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img id="arr_0_0_" src="ftv2mlastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('0_0_')"/><img id="img_0_0_" src="ftv2folderopen.png" alt="-" width="24" height="22" onclick="toggleFolder('0_0_')"/><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html" target="_self">gutenprintui2</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_0_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="curve_8h.html" target="_self">curve.h</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_1_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gammacurve_8h.html" target="_self">gammacurve.h</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_2_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="gutenprintui_8h.html" target="_self">gutenprintui.h</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_3_"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="t_8h.html" target="_self">t.h</a></td><td class="desc"></td></tr>
+<tr id="row_0_0_4_" class="even"><td class="entry"><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="typebuiltins_8h.html" target="_self">typebuiltins.h</a></td><td class="desc"></td></tr>
 </table>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- directory -->
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/ftv2blank.png b/doc/gutenprintui2/html/ftv2blank.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2blank.png
diff --git a/doc/gutenprintui2/html/ftv2cl.png b/doc/gutenprintui2/html/ftv2cl.png
new file mode 100644
index 0000000..132f657
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2cl.png
diff --git a/doc/gutenprintui2/html/ftv2doc.png b/doc/gutenprintui2/html/ftv2doc.png
new file mode 100644
index 0000000..17edabf
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2doc.png
diff --git a/doc/gutenprintui2/html/ftv2folderclosed.png b/doc/gutenprintui2/html/ftv2folderclosed.png
new file mode 100644
index 0000000..bb8ab35
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2folderclosed.png
diff --git a/doc/gutenprintui2/html/ftv2folderopen.png b/doc/gutenprintui2/html/ftv2folderopen.png
new file mode 100644
index 0000000..d6c7f67
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2folderopen.png
diff --git a/doc/gutenprintui2/html/ftv2lastnode.png b/doc/gutenprintui2/html/ftv2lastnode.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2lastnode.png
diff --git a/doc/gutenprintui2/html/ftv2link.png b/doc/gutenprintui2/html/ftv2link.png
new file mode 100644
index 0000000..17edabf
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2link.png
diff --git a/doc/gutenprintui2/html/ftv2mlastnode.png b/doc/gutenprintui2/html/ftv2mlastnode.png
new file mode 100644
index 0000000..0b63f6d
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2mlastnode.png
diff --git a/doc/gutenprintui2/html/ftv2mnode.png b/doc/gutenprintui2/html/ftv2mnode.png
new file mode 100644
index 0000000..0b63f6d
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2mnode.png
diff --git a/doc/gutenprintui2/html/ftv2mo.png b/doc/gutenprintui2/html/ftv2mo.png
new file mode 100644
index 0000000..4bfb80f
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2mo.png
diff --git a/doc/gutenprintui2/html/ftv2node.png b/doc/gutenprintui2/html/ftv2node.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2node.png
diff --git a/doc/gutenprintui2/html/ftv2ns.png b/doc/gutenprintui2/html/ftv2ns.png
new file mode 100644
index 0000000..72e3d71
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2ns.png
diff --git a/doc/gutenprintui2/html/ftv2plastnode.png b/doc/gutenprintui2/html/ftv2plastnode.png
new file mode 100644
index 0000000..c6ee22f
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2plastnode.png
diff --git a/doc/gutenprintui2/html/ftv2pnode.png b/doc/gutenprintui2/html/ftv2pnode.png
new file mode 100644
index 0000000..c6ee22f
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2pnode.png
diff --git a/doc/gutenprintui2/html/ftv2splitbar.png b/doc/gutenprintui2/html/ftv2splitbar.png
new file mode 100644
index 0000000..fe895f2
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2splitbar.png
diff --git a/doc/gutenprintui2/html/ftv2vertline.png b/doc/gutenprintui2/html/ftv2vertline.png
new file mode 100644
index 0000000..63c605b
--- /dev/null
+++ b/doc/gutenprintui2/html/ftv2vertline.png
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index b098343..6166a6a 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -63,7 +69,7 @@
       <li><a href="#index_v"><span>v</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all struct and union fields with links to the structures/unions they belong to:</div>
 
@@ -293,9 +299,12 @@
 : <a class="el" href="structstpui__image.html#ac378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 93f137c..3ed9992 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Data Fields - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -63,7 +69,7 @@
       <li><a href="#index_v"><span>v</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -293,9 +299,12 @@
 : <a class="el" href="structstpui__image.html#ac378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index fc10c15..8fe9933 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gammacurve.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,44 +39,51 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#typedef-members">Typedefs</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprintui2/gammacurve.h File Reference</div>  </div>
-</div>
+<div class="title">gammacurve.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;gdk/gdk.h&gt;</code><br/>
 <code>#include &lt;gtk/gtkvbox.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td></tr>
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>&#160;&#160;&#160;(stpui_gamma_curve_get_type ())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a1799655d0ba34bbf0f856411399f222e">STPUI_GAMMA_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a45aa6ff6c9db14c6de371c1c9662483b">STPUI_GAMMA_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9a10e0a1241d9f042e2e1a2cf14b70c3">STPUI_IS_GAMMA_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ad5a762ee6059464c4d4d2f175d716c16">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ae0813a802c9f9ee0a8fa4d3ff372ef0f">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a9c72ddb3a35cadb3cc00b316cbb8e601"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>&#160;&#160;&#160;(<a class="el" href="gammacurve_8h.html#ae52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> ())</td></tr>
+<tr class="memitem:a1799655d0ba34bbf0f856411399f222e"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a1799655d0ba34bbf0f856411399f222e">STPUI_GAMMA_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#a16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a>))</td></tr>
+<tr class="memitem:a45aa6ff6c9db14c6de371c1c9662483b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a45aa6ff6c9db14c6de371c1c9662483b">STPUI_GAMMA_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a>))</td></tr>
+<tr class="memitem:a9a10e0a1241d9f042e2e1a2cf14b70c3"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9a10e0a1241d9f042e2e1a2cf14b70c3">STPUI_IS_GAMMA_CURVE</a>(obj)&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>))</td></tr>
+<tr class="memitem:ad5a762ee6059464c4d4d2f175d716c16"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ad5a762ee6059464c4d4d2f175d716c16">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>))</td></tr>
+<tr class="memitem:ae0813a802c9f9ee0a8fa4d3ff372ef0f"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ae0813a802c9f9ee0a8fa4d3ff372ef0f">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a>))</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
+<tr class="memitem:a16a893a0c5c5908d5db1a36c91590d6c"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td></tr>
+<tr class="memitem:aec66cf466c32b2ead30a56c3fb1a3e09"><td class="memItemLeft" align="right" valign="top">typedef struct <br class="typebreak"/>
 <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a></td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ae52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a39433a30aa8d9b5a4e3fd1aa4176eb2f">stpui_gamma_curve_new</a> (void)</td></tr>
+<tr class="memitem:ae52edc31b54a94c1e4e106f1966af6e4"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#ae52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr class="memitem:a39433a30aa8d9b5a4e3fd1aa4176eb2f"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a39433a30aa8d9b5a4e3fd1aa4176eb2f">stpui_gamma_curve_new</a> (void)</td></tr>
 </table>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="a1799655d0ba34bbf0f856411399f222e"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="a1799655d0ba34bbf0f856411399f222e" args="(obj)" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="a1799655d0ba34bbf0f856411399f222e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -79,15 +92,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_CAST ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#a16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a45aa6ff6c9db14c6de371c1c9662483b"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="a45aa6ff6c9db14c6de371c1c9662483b" args="(klass)" -->
+<a class="anchor" id="a45aa6ff6c9db14c6de371c1c9662483b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -96,15 +108,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">klass</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_CAST ((klass), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae0813a802c9f9ee0a8fa4d3ff372ef0f"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="ae0813a802c9f9ee0a8fa4d3ff372ef0f" args="(obj)" -->
+<a class="anchor" id="ae0813a802c9f9ee0a8fa4d3ff372ef0f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -113,15 +124,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_INSTANCE_GET_CLASS ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>, <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9a10e0a1241d9f042e2e1a2cf14b70c3"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="a9a10e0a1241d9f042e2e1a2cf14b70c3" args="(obj)" -->
+<a class="anchor" id="a9a10e0a1241d9f042e2e1a2cf14b70c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -130,15 +140,14 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">obj</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad5a762ee6059464c4d4d2f175d716c16"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="ad5a762ee6059464c4d4d2f175d716c16" args="(klass)" -->
+<a class="anchor" id="ad5a762ee6059464c4d4d2f175d716c16"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -147,56 +156,52 @@ Functions</h2></td></tr>
           <td>(</td>
           <td class="paramtype">&#160;</td>
           <td class="paramname">klass</td><td>)</td>
-          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td>&#160;&#160;&#160;(G_TYPE_CHECK_CLASS_TYPE ((klass), <a class="el" href="gammacurve_8h.html#a9c72ddb3a35cadb3cc00b316cbb8e601">STPUI_TYPE_GAMMA_CURVE</a>))</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9c72ddb3a35cadb3cc00b316cbb8e601"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="a9c72ddb3a35cadb3cc00b316cbb8e601" args="" -->
+<a class="anchor" id="a9c72ddb3a35cadb3cc00b316cbb8e601"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_GAMMA_CURVE&#160;&#160;&#160;(stpui_gamma_curve_get_type ())</td>
+          <td class="memname">#define STPUI_TYPE_GAMMA_CURVE&#160;&#160;&#160;(<a class="el" href="gammacurve_8h.html#ae52edc31b54a94c1e4e106f1966af6e4">stpui_gamma_curve_get_type</a> ())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a16a893a0c5c5908d5db1a36c91590d6c"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="a16a893a0c5c5908d5db1a36c91590d6c" args="" -->
+<a class="anchor" id="a16a893a0c5c5908d5db1a36c91590d6c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a> <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a></td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a> <a class="el" href="gammacurve_8h.html#a16a893a0c5c5908d5db1a36c91590d6c">StpuiGammaCurve</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aec66cf466c32b2ead30a56c3fb1a3e09"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="aec66cf466c32b2ead30a56c3fb1a3e09" args="" -->
+<a class="anchor" id="aec66cf466c32b2ead30a56c3fb1a3e09"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a> <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a></td>
+          <td class="memname">typedef struct <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a> <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">StpuiGammaCurveClass</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="ae52edc31b54a94c1e4e106f1966af6e4"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="ae52edc31b54a94c1e4e106f1966af6e4" args="(void) G_GNUC_CONST" -->
+<a class="anchor" id="ae52edc31b54a94c1e4e106f1966af6e4"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -208,12 +213,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a39433a30aa8d9b5a4e3fd1aa4176eb2f"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="a39433a30aa8d9b5a4e3fd1aa4176eb2f" args="(void)" -->
+<a class="anchor" id="a39433a30aa8d9b5a4e3fd1aa4176eb2f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -225,14 +229,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index 74c16b2..5658530 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,7 +46,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -51,7 +57,7 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 <div class="textblock">Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:</div>
 
@@ -375,9 +381,12 @@
 : <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 2738f90..df6ef1e 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,10 +46,10 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li class="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li class="current"><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>STPUI_CURVE
@@ -95,9 +101,12 @@
 , <a class="el" href="t_8h.html#a7c68a632b60b65d497e2933fa1b78a77">t.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 433c7d0..94981af 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,10 +46,10 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li class="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>command_t
@@ -56,9 +62,12 @@
 : <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">curve.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 43aa2d7..21c84fb 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,10 +46,10 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li class="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>COMMAND_TYPE_CUSTOM
@@ -80,9 +86,12 @@
 : <a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996ba6cef8a118ee2829db63f812874a412c1">curve.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 1b1889e..9b6e0e6 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,7 +46,7 @@
       <li><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
   <div id="navrow4" class="tabs3">
@@ -50,7 +56,7 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;
 
@@ -262,9 +268,12 @@
 : <a class="el" href="gutenprintui_8h.html#afcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index c89e061..048e60a 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Globals</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -40,10 +46,10 @@
       <li class="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
       <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
       <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
-      <li><a href="globals_defs.html"><span>Defines</span></a></li>
+      <li><a href="globals_defs.html"><span>Macros</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="contents">
 &#160;<ul>
 <li>get_thumbnail_func_t
@@ -65,9 +71,12 @@
 : <a class="el" href="gammacurve_8h.html#aec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index ffd7cf0..e89bbd4 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gutenprintui.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,7 +39,11 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#nested-classes">Data Structures</a> &#124;
@@ -41,8 +51,8 @@
 <a href="#enum-members">Enumerations</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprintui2/gutenprintui.h File Reference</div>  </div>
-</div>
+<div class="title">gutenprintui.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;gtk/gtk.h&gt;</code><br/>
 <code>#include &lt;gutenprint/gutenprint.h&gt;</code><br/>
@@ -50,17 +60,19 @@
 <code>#include &lt;<a class="el" href="gammacurve_8h.html">gutenprintui2/gammacurve.h</a>&gt;</code><br/>
 <code>#include &lt;<a class="el" href="typebuiltins_8h.html">gutenprintui2/typebuiltins.h</a>&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="nested-classes"></a>
+<tr class="heading"><td colspan="2"><h2><a name="nested-classes"></a>
 Data Structures</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html">stpui_image</a></td></tr>
-<tr><td colspan="2"><h2><a name="typedef-members"></a>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">struct &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html">stpui_image</a></td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">typedef guchar *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
-<tr><td colspan="2"><h2><a name="enum-members"></a>
+<tr class="memitem:a195aac96c77c6de3925cd3d13c6ce2f1"><td class="memItemLeft" align="right" valign="top">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a></td></tr>
+<tr class="memitem:a9b59c94766b4713803ec6e1daaa84e70"><td class="memItemLeft" align="right" valign="top">typedef guchar *(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="enum-members"></a>
 Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a> { <br/>
+<tr class="memitem:ac33232f845969eb04b32e1006c8240a0"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a> { <br/>
 &#160;&#160;<a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0a06af5eabe5d18a247c02641283fe4481">ORIENT_AUTO</a> =  -1, 
 <a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0af81c23cf1763365fba8e36db87131ff5">ORIENT_PORTRAIT</a> =  0, 
 <a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0a4dc9735e5b3e4c86b60141acc08e5db1">ORIENT_LANDSCAPE</a> =  1, 
@@ -69,94 +81,93 @@ Enumerations</h2></td></tr>
 &#160;&#160;<a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0a7de33495add2d66cc743f2edcbb548e3">ORIENT_SEASCAPE</a> =  3
 <br/>
  }</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> { <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10aa6a7840c2276bfe38dd68b4fe3a8babf">COMMAND_TYPE_DEFAULT</a>, 
+<tr class="memitem:ab31350eb38b009cbd282027630a1ee10"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> { <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10aa6a7840c2276bfe38dd68b4fe3a8babf">COMMAND_TYPE_DEFAULT</a>, 
 <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10acb7cf14821d9fcbaa983ee33d7b8e926">COMMAND_TYPE_CUSTOM</a>, 
 <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10a5e9a887a5dab88a425cb52c8b1e49a7f">COMMAND_TYPE_FILE</a>
  }</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#af54293f58c474e133e4a60054779c9be">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a90a9ed90e03acd443d08350a62aa3762">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a342817c9f4311f0ac827c94b0e62cbbb">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8a4fa7000900cb4813000048c322dcdb">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aec75fb2ec25a5a69d270d70ea33c81eb">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aacf031afbe7e9682f7367f1ae0ef1895">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a248eae3ae0a96506fa8c92807f70d457">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aea9ddb061703368f7ea1e3b861b8550d">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a856c534e664748c9a419104357312dfd">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a72ee8e1bb9bee2e13c15a9aecd9582bd">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a9899c88da60069b72d7ddb601bcad548">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a4956cdd55680ed20a92e991d4cf52ee8">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#af127a39a7ea466ca73e5a511f36ae985">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a567c7c6c13930e398def69f2829bd038">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#abc624051678aac91a2ffa6c7c5393b8d">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a02092bb706d3770870ed5f64efb1ea2a">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a7d4511d9e9c69136fabf9f9c64734c51">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a79e27ac73e0f082abcdde41ee76879ce">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa405ef9e03818fedcff5746b9701c3c3">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#afdc574a731f6697c3e48c6001a51b3af">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa920697330124635ca464662caf975d5">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> val)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a3c9ed1191c6a03edba14f7b98d03ef55">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aeb3ea1fd028cb28211bac9e88f9ca8ac">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a28c71e75188d60a243755deaab31b5fd">stpui_get_global_parameter</a> (const char *param)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a01db968552106a84a49f76d7203bd3f5">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ab2e655748deab72a24c25bfaf4ee9052">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54daa32f5d5d64c644131570eab01c2b">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a26ebbd1948a457740cd75ff630969487">stpui_get_current_printer</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a97f0f11c41859d80d9bb3803f81a671f">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a443905f09bfd6cad7fd06aa029ac306c">stpui_set_printrc_file</a> (const char *name)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8faab74e1f9c2b372efa56ae6fea713e">stpui_get_printrc_file</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54f67bb1819c7135a0ca1f005a22d28b">stpui_printrc_load</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ada642fd5eeff02d4c6b84d3125ca2da2">stpui_get_system_printers</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8c4bddac236a6557ec126fd659ceade0">stpui_printrc_save</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a701289a198a313c5b6758ab1cd678c58">stpui_set_image_filename</a> (const char *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8bc64271197449021140ce2d17ad71e2">stpui_get_image_filename</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#acc06b85ae6af8ca0003584da411213fb">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">stp_outfunc_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ada3d388496b4b7d689f4cf8a957c75b2">stpui_get_errfunc</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ad013cb96f40b5da4bca5dd9485aaa213">stpui_set_errdata</a> (void *errdata)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a15368f674e52b511ad665cb2be45576c">stpui_get_errdata</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aac1066fa59dc8a04b90415994587ec1a">stpui_do_print_dialog</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a6932b380986d06d6dd7671439aaf93a0">stpui_compute_orientation</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa52f1b5d60ea21d09cfbab998df7ff33">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a3fa4a6d1300a470016744badf81daa43">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a7b2f104989fb67ca20e1b9874e047293">stpui_set_image_type</a> (const char *image_type)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a0d40ca93fed8c7d10dcc516e6fb61ea1">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a845898656d91fbf462db9c9b3e7c976f">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#afcaf0ce6ff01c073cdfb2d2f80ede234">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a74c1f441bf3fbb2198cf4cbaca8c23ef">stpui_get_thumbnail_func</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a965e5950073e3ef6775f3355556517f6">stpui_set_thumbnail_data</a> (void *)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aee04dfc45b26093bd65d3025b817cfd5">stpui_get_thumbnail_data</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a1ffdddfb6efd3353d403192b2b2c1e20">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
+<tr class="memitem:af54293f58c474e133e4a60054779c9be"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#af54293f58c474e133e4a60054779c9be">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:a90a9ed90e03acd443d08350a62aa3762"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a90a9ed90e03acd443d08350a62aa3762">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:a342817c9f4311f0ac827c94b0e62cbbb"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a342817c9f4311f0ac827c94b0e62cbbb">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:a8a4fa7000900cb4813000048c322dcdb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8a4fa7000900cb4813000048c322dcdb">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:aec75fb2ec25a5a69d270d70ea33c81eb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aec75fb2ec25a5a69d270d70ea33c81eb">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:aacf031afbe7e9682f7367f1ae0ef1895"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aacf031afbe7e9682f7367f1ae0ef1895">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:a248eae3ae0a96506fa8c92807f70d457"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a248eae3ae0a96506fa8c92807f70d457">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:aea9ddb061703368f7ea1e3b861b8550d"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aea9ddb061703368f7ea1e3b861b8550d">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:a856c534e664748c9a419104357312dfd"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a856c534e664748c9a419104357312dfd">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:a72ee8e1bb9bee2e13c15a9aecd9582bd"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a72ee8e1bb9bee2e13c15a9aecd9582bd">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:a9899c88da60069b72d7ddb601bcad548"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a9899c88da60069b72d7ddb601bcad548">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:a4956cdd55680ed20a92e991d4cf52ee8"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a4956cdd55680ed20a92e991d4cf52ee8">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:af127a39a7ea466ca73e5a511f36ae985"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#af127a39a7ea466ca73e5a511f36ae985">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:a567c7c6c13930e398def69f2829bd038"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a567c7c6c13930e398def69f2829bd038">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:abc624051678aac91a2ffa6c7c5393b8d"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#abc624051678aac91a2ffa6c7c5393b8d">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:a02092bb706d3770870ed5f64efb1ea2a"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a02092bb706d3770870ed5f64efb1ea2a">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
+<tr class="memitem:a7d4511d9e9c69136fabf9f9c64734c51"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a7d4511d9e9c69136fabf9f9c64734c51">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:a79e27ac73e0f082abcdde41ee76879ce"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a79e27ac73e0f082abcdde41ee76879ce">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr class="memitem:aa405ef9e03818fedcff5746b9701c3c3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa405ef9e03818fedcff5746b9701c3c3">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr class="memitem:afdc574a731f6697c3e48c6001a51b3af"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#afdc574a731f6697c3e48c6001a51b3af">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:aa920697330124635ca464662caf975d5"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa920697330124635ca464662caf975d5">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> val)</td></tr>
+<tr class="memitem:a3c9ed1191c6a03edba14f7b98d03ef55"><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a3c9ed1191c6a03edba14f7b98d03ef55">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr class="memitem:aeb3ea1fd028cb28211bac9e88f9ca8ac"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aeb3ea1fd028cb28211bac9e88f9ca8ac">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
+<tr class="memitem:a28c71e75188d60a243755deaab31b5fd"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a28c71e75188d60a243755deaab31b5fd">stpui_get_global_parameter</a> (const char *param)</td></tr>
+<tr class="memitem:a01db968552106a84a49f76d7203bd3f5"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a01db968552106a84a49f76d7203bd3f5">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
+<tr class="memitem:ab2e655748deab72a24c25bfaf4ee9052"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ab2e655748deab72a24c25bfaf4ee9052">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
+<tr class="memitem:a54daa32f5d5d64c644131570eab01c2b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54daa32f5d5d64c644131570eab01c2b">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
+<tr class="memitem:a26ebbd1948a457740cd75ff630969487"><td class="memItemLeft" align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a26ebbd1948a457740cd75ff630969487">stpui_get_current_printer</a> (void)</td></tr>
+<tr class="memitem:a97f0f11c41859d80d9bb3803f81a671f"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a97f0f11c41859d80d9bb3803f81a671f">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
+<tr class="memitem:a443905f09bfd6cad7fd06aa029ac306c"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a443905f09bfd6cad7fd06aa029ac306c">stpui_set_printrc_file</a> (const char *name)</td></tr>
+<tr class="memitem:a8faab74e1f9c2b372efa56ae6fea713e"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8faab74e1f9c2b372efa56ae6fea713e">stpui_get_printrc_file</a> (void)</td></tr>
+<tr class="memitem:a54f67bb1819c7135a0ca1f005a22d28b"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54f67bb1819c7135a0ca1f005a22d28b">stpui_printrc_load</a> (void)</td></tr>
+<tr class="memitem:ada642fd5eeff02d4c6b84d3125ca2da2"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ada642fd5eeff02d4c6b84d3125ca2da2">stpui_get_system_printers</a> (void)</td></tr>
+<tr class="memitem:a8c4bddac236a6557ec126fd659ceade0"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8c4bddac236a6557ec126fd659ceade0">stpui_printrc_save</a> (void)</td></tr>
+<tr class="memitem:a701289a198a313c5b6758ab1cd678c58"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a701289a198a313c5b6758ab1cd678c58">stpui_set_image_filename</a> (const char *)</td></tr>
+<tr class="memitem:a8bc64271197449021140ce2d17ad71e2"><td class="memItemLeft" align="right" valign="top">const char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a8bc64271197449021140ce2d17ad71e2">stpui_get_image_filename</a> (void)</td></tr>
+<tr class="memitem:acc06b85ae6af8ca0003584da411213fb"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#acc06b85ae6af8ca0003584da411213fb">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
+<tr class="memitem:ada3d388496b4b7d689f4cf8a957c75b2"><td class="memItemLeft" align="right" valign="top">stp_outfunc_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ada3d388496b4b7d689f4cf8a957c75b2">stpui_get_errfunc</a> (void)</td></tr>
+<tr class="memitem:ad013cb96f40b5da4bca5dd9485aaa213"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ad013cb96f40b5da4bca5dd9485aaa213">stpui_set_errdata</a> (void *errdata)</td></tr>
+<tr class="memitem:a15368f674e52b511ad665cb2be45576c"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a15368f674e52b511ad665cb2be45576c">stpui_get_errdata</a> (void)</td></tr>
+<tr class="memitem:aac1066fa59dc8a04b90415994587ec1a"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aac1066fa59dc8a04b90415994587ec1a">stpui_do_print_dialog</a> (void)</td></tr>
+<tr class="memitem:a6932b380986d06d6dd7671439aaf93a0"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a6932b380986d06d6dd7671439aaf93a0">stpui_compute_orientation</a> (void)</td></tr>
+<tr class="memitem:aa52f1b5d60ea21d09cfbab998df7ff33"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aa52f1b5d60ea21d09cfbab998df7ff33">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
+<tr class="memitem:a3fa4a6d1300a470016744badf81daa43"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a3fa4a6d1300a470016744badf81daa43">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
+<tr class="memitem:a7b2f104989fb67ca20e1b9874e047293"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a7b2f104989fb67ca20e1b9874e047293">stpui_set_image_type</a> (const char *image_type)</td></tr>
+<tr class="memitem:a0d40ca93fed8c7d10dcc516e6fb61ea1"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a0d40ca93fed8c7d10dcc516e6fb61ea1">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
+<tr class="memitem:a845898656d91fbf462db9c9b3e7c976f"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a845898656d91fbf462db9c9b3e7c976f">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
+<tr class="memitem:afcaf0ce6ff01c073cdfb2d2f80ede234"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#afcaf0ce6ff01c073cdfb2d2f80ede234">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>)</td></tr>
+<tr class="memitem:a74c1f441bf3fbb2198cf4cbaca8c23ef"><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a74c1f441bf3fbb2198cf4cbaca8c23ef">stpui_get_thumbnail_func</a> (void)</td></tr>
+<tr class="memitem:a965e5950073e3ef6775f3355556517f6"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a965e5950073e3ef6775f3355556517f6">stpui_set_thumbnail_data</a> (void *)</td></tr>
+<tr class="memitem:aee04dfc45b26093bd65d3025b817cfd5"><td class="memItemLeft" align="right" valign="top">void *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aee04dfc45b26093bd65d3025b817cfd5">stpui_get_thumbnail_data</a> (void)</td></tr>
+<tr class="memitem:a1ffdddfb6efd3353d403192b2b2c1e20"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a1ffdddfb6efd3353d403192b2b2c1e20">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="gutenprintui_8h.html#a195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a> *im)</td></tr>
 </table>
 <hr/><h2>Typedef Documentation</h2>
-<a class="anchor" id="a9b59c94766b4713803ec6e1daaa84e70"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="a9b59c94766b4713803ec6e1daaa84e70" args=")(void *data, gint *width, gint *height, gint *bpp, gint page)" -->
+<a class="anchor" id="a9b59c94766b4713803ec6e1daaa84e70"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef guchar*(* <a class="el" href="gutenprintui_8h.html#a9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)</td>
+          <td class="memname">typedef guchar*(* get_thumbnail_func_t)(void *data, gint *width, gint *height, gint *bpp, gint page)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a195aac96c77c6de3925cd3d13c6ce2f1"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="a195aac96c77c6de3925cd3d13c6ce2f1" args="" -->
+<a class="anchor" id="a195aac96c77c6de3925cd3d13c6ce2f1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>  <a class="el" href="structstpui__image.html">stpui_image_t</a></td>
+          <td class="memname">typedef struct <a class="el" href="structstpui__image.html">stpui_image</a>  <a class="el" href="gutenprintui_8h.html#a195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Enumeration Type Documentation</h2>
-<a class="anchor" id="ab31350eb38b009cbd282027630a1ee10"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="ab31350eb38b009cbd282027630a1ee10" args="" -->
+<a class="anchor" id="ab31350eb38b009cbd282027630a1ee10"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -164,14 +175,13 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10aa6a7840c2276bfe38dd68b4fe3a8babf"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="ab31350eb38b009cbd282027630a1ee10aa6a7840c2276bfe38dd68b4fe3a8babf" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10aa6a7840c2276bfe38dd68b4fe3a8babf"></a>COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10acb7cf14821d9fcbaa983ee33d7b8e926"></a><!-- doxytag: member="COMMAND_TYPE_CUSTOM" ref="ab31350eb38b009cbd282027630a1ee10acb7cf14821d9fcbaa983ee33d7b8e926" args="" -->COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10acb7cf14821d9fcbaa983ee33d7b8e926"></a>COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10a5e9a887a5dab88a425cb52c8b1e49a7f"></a><!-- doxytag: member="COMMAND_TYPE_FILE" ref="ab31350eb38b009cbd282027630a1ee10a5e9a887a5dab88a425cb52c8b1e49a7f" args="" -->COMMAND_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ab31350eb38b009cbd282027630a1ee10a5e9a887a5dab88a425cb52c8b1e49a7f"></a>COMMAND_TYPE_FILE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -179,7 +189,7 @@ Functions</h2></td></tr>
 
 </div>
 </div>
-<a class="anchor" id="ac33232f845969eb04b32e1006c8240a0"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="ac33232f845969eb04b32e1006c8240a0" args="" -->
+<a class="anchor" id="ac33232f845969eb04b32e1006c8240a0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -187,18 +197,17 @@ Functions</h2></td></tr>
           <td class="memname">enum <a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 <dl><dt><b>Enumerator: </b></dt><dd><table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a06af5eabe5d18a247c02641283fe4481"></a><!-- doxytag: member="ORIENT_AUTO" ref="ac33232f845969eb04b32e1006c8240a0a06af5eabe5d18a247c02641283fe4481" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a06af5eabe5d18a247c02641283fe4481"></a>ORIENT_AUTO</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0af81c23cf1763365fba8e36db87131ff5"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="ac33232f845969eb04b32e1006c8240a0af81c23cf1763365fba8e36db87131ff5" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0af81c23cf1763365fba8e36db87131ff5"></a>ORIENT_PORTRAIT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a4dc9735e5b3e4c86b60141acc08e5db1"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="ac33232f845969eb04b32e1006c8240a0a4dc9735e5b3e4c86b60141acc08e5db1" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a4dc9735e5b3e4c86b60141acc08e5db1"></a>ORIENT_LANDSCAPE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a3ca76babc9953cc92305856ac00a2350"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="ac33232f845969eb04b32e1006c8240a0a3ca76babc9953cc92305856ac00a2350" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a3ca76babc9953cc92305856ac00a2350"></a>ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a7de33495add2d66cc743f2edcbb548e3"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="ac33232f845969eb04b32e1006c8240a0a7de33495add2d66cc743f2edcbb548e3" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" id="ac33232f845969eb04b32e1006c8240a0a7de33495add2d66cc743f2edcbb548e3"></a>ORIENT_SEASCAPE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dd>
@@ -207,7 +216,7 @@ Functions</h2></td></tr>
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a97f0f11c41859d80d9bb3803f81a671f"></a><!-- doxytag: member="gutenprintui.h::stpui_build_standard_print_command" ref="a97f0f11c41859d80d9bb3803f81a671f" args="(const stpui_plist_t *plist, const stp_printer_t *printer)" -->
+<a class="anchor" id="a97f0f11c41859d80d9bb3803f81a671f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -229,12 +238,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a6932b380986d06d6dd7671439aaf93a0"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="a6932b380986d06d6dd7671439aaf93a0" args="(void)" -->
+<a class="anchor" id="a6932b380986d06d6dd7671439aaf93a0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -246,12 +254,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aac1066fa59dc8a04b90415994587ec1a"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="aac1066fa59dc8a04b90415994587ec1a" args="(void)" -->
+<a class="anchor" id="aac1066fa59dc8a04b90415994587ec1a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -263,12 +270,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a26ebbd1948a457740cd75ff630969487"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="a26ebbd1948a457740cd75ff630969487" args="(void)" -->
+<a class="anchor" id="a26ebbd1948a457740cd75ff630969487"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -280,12 +286,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a15368f674e52b511ad665cb2be45576c"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="a15368f674e52b511ad665cb2be45576c" args="(void)" -->
+<a class="anchor" id="a15368f674e52b511ad665cb2be45576c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -297,12 +302,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ada3d388496b4b7d689f4cf8a957c75b2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="ada3d388496b4b7d689f4cf8a957c75b2" args="(void)" -->
+<a class="anchor" id="ada3d388496b4b7d689f4cf8a957c75b2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -314,12 +318,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a28c71e75188d60a243755deaab31b5fd"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="a28c71e75188d60a243755deaab31b5fd" args="(const char *param)" -->
+<a class="anchor" id="a28c71e75188d60a243755deaab31b5fd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -331,12 +334,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8bc64271197449021140ce2d17ad71e2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="a8bc64271197449021140ce2d17ad71e2" args="(void)" -->
+<a class="anchor" id="a8bc64271197449021140ce2d17ad71e2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -348,12 +350,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8faab74e1f9c2b372efa56ae6fea713e"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="a8faab74e1f9c2b372efa56ae6fea713e" args="(void)" -->
+<a class="anchor" id="a8faab74e1f9c2b372efa56ae6fea713e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -365,12 +366,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ada642fd5eeff02d4c6b84d3125ca2da2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="ada642fd5eeff02d4c6b84d3125ca2da2" args="(void)" -->
+<a class="anchor" id="ada642fd5eeff02d4c6b84d3125ca2da2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -382,12 +382,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aee04dfc45b26093bd65d3025b817cfd5"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="aee04dfc45b26093bd65d3025b817cfd5" args="(void)" -->
+<a class="anchor" id="aee04dfc45b26093bd65d3025b817cfd5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -399,12 +398,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a74c1f441bf3fbb2198cf4cbaca8c23ef"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="a74c1f441bf3fbb2198cf4cbaca8c23ef" args="(void)" -->
+<a class="anchor" id="a74c1f441bf3fbb2198cf4cbaca8c23ef"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -416,12 +414,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab2e655748deab72a24c25bfaf4ee9052"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_add" ref="ab2e655748deab72a24c25bfaf4ee9052" args="(const stpui_plist_t *key, int add_only)" -->
+<a class="anchor" id="ab2e655748deab72a24c25bfaf4ee9052"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -443,12 +440,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a01db968552106a84a49f76d7203bd3f5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_copy" ref="a01db968552106a84a49f76d7203bd3f5" args="(stpui_plist_t *vd, const stpui_plist_t *vs)" -->
+<a class="anchor" id="a01db968552106a84a49f76d7203bd3f5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -470,12 +466,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3c9ed1191c6a03edba14f7b98d03ef55"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="a3c9ed1191c6a03edba14f7b98d03ef55" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="a3c9ed1191c6a03edba14f7b98d03ef55"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -487,12 +482,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7d4511d9e9c69136fabf9f9c64734c51"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="a7d4511d9e9c69136fabf9f9c64734c51" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="a7d4511d9e9c69136fabf9f9c64734c51"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -504,12 +498,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afdc574a731f6697c3e48c6001a51b3af"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_current_standard_command" ref="afdc574a731f6697c3e48c6001a51b3af" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="afdc574a731f6697c3e48c6001a51b3af"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -521,12 +514,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="abc624051678aac91a2ffa6c7c5393b8d"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="abc624051678aac91a2ffa6c7c5393b8d" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="abc624051678aac91a2ffa6c7c5393b8d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -538,12 +530,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4956cdd55680ed20a92e991d4cf52ee8"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_extra_printer_options" ref="a4956cdd55680ed20a92e991d4cf52ee8" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="a4956cdd55680ed20a92e991d4cf52ee8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -555,12 +546,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a342817c9f4311f0ac827c94b0e62cbbb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="a342817c9f4311f0ac827c94b0e62cbbb" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="a342817c9f4311f0ac827c94b0e62cbbb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -572,12 +562,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a856c534e664748c9a419104357312dfd"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="a856c534e664748c9a419104357312dfd" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="a856c534e664748c9a419104357312dfd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -589,12 +578,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aacf031afbe7e9682f7367f1ae0ef1895"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="aacf031afbe7e9682f7367f1ae0ef1895" args="(const stpui_plist_t *p)" -->
+<a class="anchor" id="aacf031afbe7e9682f7367f1ae0ef1895"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -606,12 +594,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa920697330124635ca464662caf975d5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_command_type" ref="aa920697330124635ca464662caf975d5" args="(stpui_plist_t *p, command_t val)" -->
+<a class="anchor" id="aa920697330124635ca464662caf975d5"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -633,12 +620,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a02092bb706d3770870ed5f64efb1ea2a"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_copy_count" ref="a02092bb706d3770870ed5f64efb1ea2a" args="(stpui_plist_t *p, gint count)" -->
+<a class="anchor" id="a02092bb706d3770870ed5f64efb1ea2a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -660,12 +646,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a79e27ac73e0f082abcdde41ee76879ce"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command" ref="a79e27ac73e0f082abcdde41ee76879ce" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="a79e27ac73e0f082abcdde41ee76879ce"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -687,12 +672,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa405ef9e03818fedcff5746b9701c3c3"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command_n" ref="aa405ef9e03818fedcff5746b9701c3c3" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="aa405ef9e03818fedcff5746b9701c3c3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -720,12 +704,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af127a39a7ea466ca73e5a511f36ae985"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command" ref="af127a39a7ea466ca73e5a511f36ae985" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="af127a39a7ea466ca73e5a511f36ae985"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -747,12 +730,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a567c7c6c13930e398def69f2829bd038"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command_n" ref="a567c7c6c13930e398def69f2829bd038" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="a567c7c6c13930e398def69f2829bd038"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -780,12 +762,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a72ee8e1bb9bee2e13c15a9aecd9582bd"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options" ref="a72ee8e1bb9bee2e13c15a9aecd9582bd" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="a72ee8e1bb9bee2e13c15a9aecd9582bd"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -807,12 +788,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a9899c88da60069b72d7ddb601bcad548"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options_n" ref="a9899c88da60069b72d7ddb601bcad548" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="a9899c88da60069b72d7ddb601bcad548"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -840,12 +820,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af54293f58c474e133e4a60054779c9be"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name" ref="af54293f58c474e133e4a60054779c9be" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="af54293f58c474e133e4a60054779c9be"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -867,12 +846,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a90a9ed90e03acd443d08350a62aa3762"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name_n" ref="a90a9ed90e03acd443d08350a62aa3762" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="a90a9ed90e03acd443d08350a62aa3762"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -900,12 +878,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a248eae3ae0a96506fa8c92807f70d457"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename" ref="a248eae3ae0a96506fa8c92807f70d457" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="a248eae3ae0a96506fa8c92807f70d457"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -927,12 +904,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aea9ddb061703368f7ea1e3b861b8550d"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename_n" ref="aea9ddb061703368f7ea1e3b861b8550d" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="aea9ddb061703368f7ea1e3b861b8550d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -960,12 +936,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8a4fa7000900cb4813000048c322dcdb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name" ref="a8a4fa7000900cb4813000048c322dcdb" args="(stpui_plist_t *p, const char *val)" -->
+<a class="anchor" id="a8a4fa7000900cb4813000048c322dcdb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -987,12 +962,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aec75fb2ec25a5a69d270d70ea33c81eb"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name_n" ref="aec75fb2ec25a5a69d270d70ea33c81eb" args="(stpui_plist_t *p, const char *val, int n)" -->
+<a class="anchor" id="aec75fb2ec25a5a69d270d70ea33c81eb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1020,12 +994,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1ffdddfb6efd3353d403192b2b2c1e20"></a><!-- doxytag: member="gutenprintui.h::stpui_print" ref="a1ffdddfb6efd3353d403192b2b2c1e20" args="(const stpui_plist_t *printer, stpui_image_t *im)" -->
+<a class="anchor" id="a1ffdddfb6efd3353d403192b2b2c1e20"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1038,7 +1011,7 @@ Functions</h2></td></tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype"><a class="el" href="structstpui__image.html">stpui_image_t</a> *&#160;</td>
+          <td class="paramtype"><a class="el" href="gutenprintui_8h.html#a195aac96c77c6de3925cd3d13c6ce2f1">stpui_image_t</a> *&#160;</td>
           <td class="paramname"><em>im</em>&#160;</td>
         </tr>
         <tr>
@@ -1047,12 +1020,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a54daa32f5d5d64c644131570eab01c2b"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="a54daa32f5d5d64c644131570eab01c2b" args="(stpui_plist_t *printer)" -->
+<a class="anchor" id="a54daa32f5d5d64c644131570eab01c2b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1064,12 +1036,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a54f67bb1819c7135a0ca1f005a22d28b"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="a54f67bb1819c7135a0ca1f005a22d28b" args="(void)" -->
+<a class="anchor" id="a54f67bb1819c7135a0ca1f005a22d28b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1081,12 +1052,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a8c4bddac236a6557ec126fd659ceade0"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="a8c4bddac236a6557ec126fd659ceade0" args="(void)" -->
+<a class="anchor" id="a8c4bddac236a6557ec126fd659ceade0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1098,12 +1068,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad013cb96f40b5da4bca5dd9485aaa213"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="ad013cb96f40b5da4bca5dd9485aaa213" args="(void *errdata)" -->
+<a class="anchor" id="ad013cb96f40b5da4bca5dd9485aaa213"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1115,12 +1084,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="acc06b85ae6af8ca0003584da411213fb"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="acc06b85ae6af8ca0003584da411213fb" args="(stp_outfunc_t wfunc)" -->
+<a class="anchor" id="acc06b85ae6af8ca0003584da411213fb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1132,12 +1100,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aeb3ea1fd028cb28211bac9e88f9ca8ac"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="aeb3ea1fd028cb28211bac9e88f9ca8ac" args="(const char *param, const char *value)" -->
+<a class="anchor" id="aeb3ea1fd028cb28211bac9e88f9ca8ac"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1159,12 +1126,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a845898656d91fbf462db9c9b3e7c976f"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="a845898656d91fbf462db9c9b3e7c976f" args="(gint bit_depth)" -->
+<a class="anchor" id="a845898656d91fbf462db9c9b3e7c976f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1176,12 +1142,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa52f1b5d60ea21d09cfbab998df7ff33"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="aa52f1b5d60ea21d09cfbab998df7ff33" args="(gint width, gint height)" -->
+<a class="anchor" id="aa52f1b5d60ea21d09cfbab998df7ff33"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1203,12 +1168,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a701289a198a313c5b6758ab1cd678c58"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="a701289a198a313c5b6758ab1cd678c58" args="(const char *)" -->
+<a class="anchor" id="a701289a198a313c5b6758ab1cd678c58"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1220,12 +1184,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0d40ca93fed8c7d10dcc516e6fb61ea1"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="a0d40ca93fed8c7d10dcc516e6fb61ea1" args="(gint channels)" -->
+<a class="anchor" id="a0d40ca93fed8c7d10dcc516e6fb61ea1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1237,12 +1200,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3fa4a6d1300a470016744badf81daa43"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="a3fa4a6d1300a470016744badf81daa43" args="(gdouble xres, gdouble yres)" -->
+<a class="anchor" id="a3fa4a6d1300a470016744badf81daa43"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1264,12 +1226,11 @@ Functions</h2></td></tr>
           <td></td><td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7b2f104989fb67ca20e1b9874e047293"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="a7b2f104989fb67ca20e1b9874e047293" args="(const char *image_type)" -->
+<a class="anchor" id="a7b2f104989fb67ca20e1b9874e047293"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1281,12 +1242,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a443905f09bfd6cad7fd06aa029ac306c"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="a443905f09bfd6cad7fd06aa029ac306c" args="(const char *name)" -->
+<a class="anchor" id="a443905f09bfd6cad7fd06aa029ac306c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1298,12 +1258,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a965e5950073e3ef6775f3355556517f6"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="a965e5950073e3ef6775f3355556517f6" args="(void *)" -->
+<a class="anchor" id="a965e5950073e3ef6775f3355556517f6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1315,12 +1274,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afcaf0ce6ff01c073cdfb2d2f80ede234"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="afcaf0ce6ff01c073cdfb2d2f80ede234" args="(get_thumbnail_func_t)" -->
+<a class="anchor" id="afcaf0ce6ff01c073cdfb2d2f80ede234"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -1332,14 +1290,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 8082462..34843a5 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: Main Page</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li class="current"><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -27,15 +33,18 @@
       <li><a href="files.html"><span>Files</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="headertitle">
 <div class="title">libgutenprintui2 API Reference Documentation</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/jquery.js b/doc/gutenprintui2/html/jquery.js
index c052173..63939e7 100644
--- a/doc/gutenprintui2/html/jquery.js
+++ b/doc/gutenprintui2/html/jquery.js
@@ -1,54 +1,8 @@
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){
-var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
-/*
- * Sizzle CSS Selector Engine - v0.9.3
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0)
-{I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function()
-{G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
-/*
- * jQuery UI 1.7.2
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
-jQuery.ui||(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.7.2",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n||!j.element[0].parentNode){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;k.stopImmediatePropagation();return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){l.originalEvent=l.originalEvent||{};if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(j.target==this._mouseDownEvent.target);this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);;/* * jQuery UI Resizable 1.7.2
- *
- * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	ui.core.js
- */
-(function(c){c.widget("ui.resizable",c.extend({},c.ui.mouse,{_init:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f<k.length;f++){var h=c.trim(k[f]),d="ui-resizable-"+h;var g=c('<div class="ui-resizable-handle '+d+'"></div>');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.parent().append(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).end().remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement)},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return this.options.disabled||!!f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidth<k.width),l=a(k.height)&&h.maxHeight&&(h.maxHeight<k.height),g=a(k.width)&&h.minWidth&&(h.minWidth>k.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e<this._proportionallyResizeElements.length;e++){var g=this._proportionallyResizeElements[e];if(!this.borderDif){var d=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],h=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=c.map(d,function(k,m){var l=parseInt(k,10)||0,n=parseInt(h[m],10)||0;return l+n})}if(c.browser.msie&&!(!(c(f).is(":hidden")||c(f).parents(":hidden").length))){continue}g.css({height:(f.height()-this.borderDif[0]-this.borderDif[2])||0,width:(f.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var e=this.element,h=this.options;this.elementOffset=e.offset();if(this._helper){this.helper=this.helper||c('<div style="overflow:hidden;"></div>');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));c.extend(c.ui.resizable,{version:"1.7.2",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000}});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),g=d.options;_store=function(h){c(h).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(g.alsoResize)=="object"&&!g.alsoResize.parentNode){if(g.alsoResize.length){g.alsoResize=g.alsoResize[0];_store(g.alsoResize)}else{c.each(g.alsoResize,function(h,i){_store(h)})}}else{_store(g.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0))
-{s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);;
-/**
- * jQuery.ScrollTo - Easy element scrolling using jQuery.
- * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com
- * Licensed under GPL license (http://www.opensource.org/licenses/gpl-license.php).
- * Date: 2/8/2008
- * @author Ariel Flesler
- * @version 1.3.2
- */
-;(function($){var o=$.scrollTo=function(a,b,c){o.window().scrollTo(a,b,c)};o.defaults={axis:'y',duration:1};o.window=function(){return $($.browser.safari?'body':'html')};$.fn.scrollTo=function(l,m,n){if(typeof m=='object'){n=m;m=0}n=$.extend({},o.defaults,n);m=m||n.speed||n.duration;n.queue=n.queue&&n.axis.length>1;if(n.queue)m/=2;n.offset=j(n.offset);n.over=j(n.over);return this.each(function(){var a=this,b=$(a),t=l,c,d={},w=b.is('html,body');switch(typeof t){case'number':case'string':if(/^([+-]=)?\d+(px)?$/.test(t)){t=j(t);break}t=$(t,this);case'object':if(t.is||t.style)c=(t=$(t)).offset()}$.each(n.axis.split(''),function(i,f){var P=f=='x'?'Left':'Top',p=P.toLowerCase(),k='scroll'+P,e=a[k],D=f=='x'?'Width':'Height';if(c){d[k]=c[p]+(w?0:e-b.offset()[p]);if(n.margin){d[k]-=parseInt(t.css('margin'+P))||0;d[k]-=parseInt(t.css('border'+P+'Width'))||0}d[k]+=n.offset[p]||0;if(n.over[p])d[k]+=t[D.toLowerCase()]()*n.over[p]}else d[k]=t[p];if(/^\d+$/.test(d[k]))d[k]=d[k]<=0?0:Math.min(d[k],h(D));if(!i&&n.queue){if(e!=d[k])g(n.onAfterFirst);delete d[k]}});g(n.onAfter);function g(a){b.animate(d,m,n.easing,a&&function(){a.call(this,l)})};function h(D){var b=w?$.browser.opera?document.body:document.documentElement:a;return b['scroll'+D]-b['client'+D]}})};function j(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
-
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function()
+{g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d
+&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),
+f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c)
+{if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
diff --git a/doc/gutenprintui2/html/nav_f.png b/doc/gutenprintui2/html/nav_f.png
index 1b07a16..72a58a5 100644
--- a/doc/gutenprintui2/html/nav_f.png
+++ b/doc/gutenprintui2/html/nav_f.png
diff --git a/doc/gutenprintui2/html/nav_g.png b/doc/gutenprintui2/html/nav_g.png
new file mode 100644
index 0000000..2093a23
--- /dev/null
+++ b/doc/gutenprintui2/html/nav_g.png
diff --git a/doc/gutenprintui2/html/nav_h.png b/doc/gutenprintui2/html/nav_h.png
index 01f5fa6..33389b1 100644
--- a/doc/gutenprintui2/html/nav_h.png
+++ b/doc/gutenprintui2/html/nav_h.png
diff --git a/doc/gutenprintui2/html/open.png b/doc/gutenprintui2/html/open.png
index 7b35d2c..30f75c7 100644
--- a/doc/gutenprintui2/html/open.png
+++ b/doc/gutenprintui2/html/open.png
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index 1090a83..c8ac60a 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: _StpuiCurve Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,237 +40,225 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">_StpuiCurve Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="_StpuiCurve" -->
+
 <p><code>#include &lt;curve.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkDrawingArea&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ade1a0d11481ca5e94e31025b5815c88f">graph</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a5a45de0c0dd843601eb678cf898b6588">cursor_type</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa2e971c049f0f314e9459b21d591dde2">min_x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a873e40a32b9a0e863ecf5af33233819d">max_x</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a035fd7e1c773ea3291dc40f6c2a95f07">min_y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa4fbc033c9dc17d11be58786f5bfe817">max_y</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GdkPixmap *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa1e237c2fafc8ce7b06f73b8af401de1">pixmap</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ac88de71f409ac73ffe41489313cacff2">curve_type</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ac679cbbcaa013aa84ac1e799d7299479">height</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a30591159410734580ff586f4c62ac622">grab_point</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a4866f6481ca65da32e4beda66c71381b">last</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ad8005c397affa21ad090cd0868e4fb60">num_points</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GdkPoint *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#af7e80ace854c3b42cfcb419eacd7766f">point</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a875906e982189427a2a3dda0e7cc38ed">num_ctlpoints</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a05e34073df0ce5bf7575b2e7383577a8">ctlpoint</a> )[2]</td></tr>
+<tr class="memitem:ade1a0d11481ca5e94e31025b5815c88f"><td class="memItemLeft" align="right" valign="top">GtkDrawingArea&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ade1a0d11481ca5e94e31025b5815c88f">graph</a></td></tr>
+<tr class="memitem:a5a45de0c0dd843601eb678cf898b6588"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a5a45de0c0dd843601eb678cf898b6588">cursor_type</a></td></tr>
+<tr class="memitem:aa2e971c049f0f314e9459b21d591dde2"><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa2e971c049f0f314e9459b21d591dde2">min_x</a></td></tr>
+<tr class="memitem:a873e40a32b9a0e863ecf5af33233819d"><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a873e40a32b9a0e863ecf5af33233819d">max_x</a></td></tr>
+<tr class="memitem:a035fd7e1c773ea3291dc40f6c2a95f07"><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a035fd7e1c773ea3291dc40f6c2a95f07">min_y</a></td></tr>
+<tr class="memitem:aa4fbc033c9dc17d11be58786f5bfe817"><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa4fbc033c9dc17d11be58786f5bfe817">max_y</a></td></tr>
+<tr class="memitem:aa1e237c2fafc8ce7b06f73b8af401de1"><td class="memItemLeft" align="right" valign="top">GdkPixmap *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aa1e237c2fafc8ce7b06f73b8af401de1">pixmap</a></td></tr>
+<tr class="memitem:ac88de71f409ac73ffe41489313cacff2"><td class="memItemLeft" align="right" valign="top"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ac88de71f409ac73ffe41489313cacff2">curve_type</a></td></tr>
+<tr class="memitem:ac679cbbcaa013aa84ac1e799d7299479"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ac679cbbcaa013aa84ac1e799d7299479">height</a></td></tr>
+<tr class="memitem:a30591159410734580ff586f4c62ac622"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a30591159410734580ff586f4c62ac622">grab_point</a></td></tr>
+<tr class="memitem:a4866f6481ca65da32e4beda66c71381b"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a4866f6481ca65da32e4beda66c71381b">last</a></td></tr>
+<tr class="memitem:ad8005c397affa21ad090cd0868e4fb60"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#ad8005c397affa21ad090cd0868e4fb60">num_points</a></td></tr>
+<tr class="memitem:af7e80ace854c3b42cfcb419eacd7766f"><td class="memItemLeft" align="right" valign="top">GdkPoint *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#af7e80ace854c3b42cfcb419eacd7766f">point</a></td></tr>
+<tr class="memitem:a875906e982189427a2a3dda0e7cc38ed"><td class="memItemLeft" align="right" valign="top">gint&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a875906e982189427a2a3dda0e7cc38ed">num_ctlpoints</a></td></tr>
+<tr class="memitem:a05e34073df0ce5bf7575b2e7383577a8"><td class="memItemLeft" align="right" valign="top">gfloat(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a05e34073df0ce5bf7575b2e7383577a8">ctlpoint</a> )[2]</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a05e34073df0ce5bf7575b2e7383577a8"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="a05e34073df0ce5bf7575b2e7383577a8" args=")[2]" -->
+<a class="anchor" id="a05e34073df0ce5bf7575b2e7383577a8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat(* <a class="el" href="struct__StpuiCurve.html#a05e34073df0ce5bf7575b2e7383577a8">_StpuiCurve::ctlpoint</a>)[2]</td>
+          <td class="memname">gfloat(* _StpuiCurve::ctlpoint)[2]</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5a45de0c0dd843601eb678cf898b6588"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="a5a45de0c0dd843601eb678cf898b6588" args="" -->
+<a class="anchor" id="a5a45de0c0dd843601eb678cf898b6588"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#a5a45de0c0dd843601eb678cf898b6588">_StpuiCurve::cursor_type</a></td>
+          <td class="memname">gint _StpuiCurve::cursor_type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac88de71f409ac73ffe41489313cacff2"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="ac88de71f409ac73ffe41489313cacff2" args="" -->
+<a class="anchor" id="ac88de71f409ac73ffe41489313cacff2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#ac88de71f409ac73ffe41489313cacff2">_StpuiCurve::curve_type</a></td>
+          <td class="memname"><a class="el" href="curve_8h.html#a59cb8817385039367325d6dbb4a0996b">StpuiCurveType</a> _StpuiCurve::curve_type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a30591159410734580ff586f4c62ac622"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="a30591159410734580ff586f4c62ac622" args="" -->
+<a class="anchor" id="a30591159410734580ff586f4c62ac622"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#a30591159410734580ff586f4c62ac622">_StpuiCurve::grab_point</a></td>
+          <td class="memname">gint _StpuiCurve::grab_point</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ade1a0d11481ca5e94e31025b5815c88f"></a><!-- doxytag: member="_StpuiCurve::graph" ref="ade1a0d11481ca5e94e31025b5815c88f" args="" -->
+<a class="anchor" id="ade1a0d11481ca5e94e31025b5815c88f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#ade1a0d11481ca5e94e31025b5815c88f">_StpuiCurve::graph</a></td>
+          <td class="memname">GtkDrawingArea _StpuiCurve::graph</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac679cbbcaa013aa84ac1e799d7299479"></a><!-- doxytag: member="_StpuiCurve::height" ref="ac679cbbcaa013aa84ac1e799d7299479" args="" -->
+<a class="anchor" id="ac679cbbcaa013aa84ac1e799d7299479"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#ac679cbbcaa013aa84ac1e799d7299479">_StpuiCurve::height</a></td>
+          <td class="memname">gint _StpuiCurve::height</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a4866f6481ca65da32e4beda66c71381b"></a><!-- doxytag: member="_StpuiCurve::last" ref="a4866f6481ca65da32e4beda66c71381b" args="" -->
+<a class="anchor" id="a4866f6481ca65da32e4beda66c71381b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#a4866f6481ca65da32e4beda66c71381b">_StpuiCurve::last</a></td>
+          <td class="memname">gint _StpuiCurve::last</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a873e40a32b9a0e863ecf5af33233819d"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="a873e40a32b9a0e863ecf5af33233819d" args="" -->
+<a class="anchor" id="a873e40a32b9a0e863ecf5af33233819d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#a873e40a32b9a0e863ecf5af33233819d">_StpuiCurve::max_x</a></td>
+          <td class="memname">gfloat _StpuiCurve::max_x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa4fbc033c9dc17d11be58786f5bfe817"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="aa4fbc033c9dc17d11be58786f5bfe817" args="" -->
+<a class="anchor" id="aa4fbc033c9dc17d11be58786f5bfe817"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#aa4fbc033c9dc17d11be58786f5bfe817">_StpuiCurve::max_y</a></td>
+          <td class="memname">gfloat _StpuiCurve::max_y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa2e971c049f0f314e9459b21d591dde2"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="aa2e971c049f0f314e9459b21d591dde2" args="" -->
+<a class="anchor" id="aa2e971c049f0f314e9459b21d591dde2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#aa2e971c049f0f314e9459b21d591dde2">_StpuiCurve::min_x</a></td>
+          <td class="memname">gfloat _StpuiCurve::min_x</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a035fd7e1c773ea3291dc40f6c2a95f07"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="a035fd7e1c773ea3291dc40f6c2a95f07" args="" -->
+<a class="anchor" id="a035fd7e1c773ea3291dc40f6c2a95f07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat <a class="el" href="struct__StpuiCurve.html#a035fd7e1c773ea3291dc40f6c2a95f07">_StpuiCurve::min_y</a></td>
+          <td class="memname">gfloat _StpuiCurve::min_y</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a875906e982189427a2a3dda0e7cc38ed"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="a875906e982189427a2a3dda0e7cc38ed" args="" -->
+<a class="anchor" id="a875906e982189427a2a3dda0e7cc38ed"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#a875906e982189427a2a3dda0e7cc38ed">_StpuiCurve::num_ctlpoints</a></td>
+          <td class="memname">gint _StpuiCurve::num_ctlpoints</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad8005c397affa21ad090cd0868e4fb60"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="ad8005c397affa21ad090cd0868e4fb60" args="" -->
+<a class="anchor" id="ad8005c397affa21ad090cd0868e4fb60"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gint <a class="el" href="struct__StpuiCurve.html#ad8005c397affa21ad090cd0868e4fb60">_StpuiCurve::num_points</a></td>
+          <td class="memname">gint _StpuiCurve::num_points</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aa1e237c2fafc8ce7b06f73b8af401de1"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="aa1e237c2fafc8ce7b06f73b8af401de1" args="" -->
+<a class="anchor" id="aa1e237c2fafc8ce7b06f73b8af401de1"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#aa1e237c2fafc8ce7b06f73b8af401de1">_StpuiCurve::pixmap</a></td>
+          <td class="memname">GdkPixmap* _StpuiCurve::pixmap</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af7e80ace854c3b42cfcb419eacd7766f"></a><!-- doxytag: member="_StpuiCurve::point" ref="af7e80ace854c3b42cfcb419eacd7766f" args="" -->
+<a class="anchor" id="af7e80ace854c3b42cfcb419eacd7766f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GdkPoint* <a class="el" href="struct__StpuiCurve.html#af7e80ace854c3b42cfcb419eacd7766f">_StpuiCurve::point</a></td>
+          <td class="memname">GdkPoint* _StpuiCurve::point</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 4ccda63..d1875c2 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: _StpuiCurveClass Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,111 +40,108 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">_StpuiCurveClass Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="_StpuiCurveClass" -->
+
 <p><code>#include &lt;curve.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkDrawingAreaClass&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a60fce1a46ad405750d42c7aff83707bb">parent_class</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a3098d1e480ba77e57785667ccf0b1c9f">curve_type_changed</a> )(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a97e1aa40263796ab3dada695e40193cb">_gtk_reserved1</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a053157829bb7c073427955e16c93c863">_gtk_reserved2</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a64b1fa1cf35f409932139752569ca1f9">_gtk_reserved3</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#af1b28ac82d8fa56fbc0a84f17d26d7b0">_gtk_reserved4</a> )(void)</td></tr>
+<tr class="memitem:a60fce1a46ad405750d42c7aff83707bb"><td class="memItemLeft" align="right" valign="top">GtkDrawingAreaClass&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a60fce1a46ad405750d42c7aff83707bb">parent_class</a></td></tr>
+<tr class="memitem:a3098d1e480ba77e57785667ccf0b1c9f"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a3098d1e480ba77e57785667ccf0b1c9f">curve_type_changed</a> )(<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve)</td></tr>
+<tr class="memitem:a97e1aa40263796ab3dada695e40193cb"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a97e1aa40263796ab3dada695e40193cb">_gtk_reserved1</a> )(void)</td></tr>
+<tr class="memitem:a053157829bb7c073427955e16c93c863"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a053157829bb7c073427955e16c93c863">_gtk_reserved2</a> )(void)</td></tr>
+<tr class="memitem:a64b1fa1cf35f409932139752569ca1f9"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#a64b1fa1cf35f409932139752569ca1f9">_gtk_reserved3</a> )(void)</td></tr>
+<tr class="memitem:af1b28ac82d8fa56fbc0a84f17d26d7b0"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#af1b28ac82d8fa56fbc0a84f17d26d7b0">_gtk_reserved4</a> )(void)</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a97e1aa40263796ab3dada695e40193cb"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="a97e1aa40263796ab3dada695e40193cb" args=")(void)" -->
+<a class="anchor" id="a97e1aa40263796ab3dada695e40193cb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#a97e1aa40263796ab3dada695e40193cb">_StpuiCurveClass::_gtk_reserved1</a>)(void)</td>
+          <td class="memname">void(* _StpuiCurveClass::_gtk_reserved1)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a053157829bb7c073427955e16c93c863"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="a053157829bb7c073427955e16c93c863" args=")(void)" -->
+<a class="anchor" id="a053157829bb7c073427955e16c93c863"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#a053157829bb7c073427955e16c93c863">_StpuiCurveClass::_gtk_reserved2</a>)(void)</td>
+          <td class="memname">void(* _StpuiCurveClass::_gtk_reserved2)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a64b1fa1cf35f409932139752569ca1f9"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="a64b1fa1cf35f409932139752569ca1f9" args=")(void)" -->
+<a class="anchor" id="a64b1fa1cf35f409932139752569ca1f9"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#a64b1fa1cf35f409932139752569ca1f9">_StpuiCurveClass::_gtk_reserved3</a>)(void)</td>
+          <td class="memname">void(* _StpuiCurveClass::_gtk_reserved3)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af1b28ac82d8fa56fbc0a84f17d26d7b0"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="af1b28ac82d8fa56fbc0a84f17d26d7b0" args=")(void)" -->
+<a class="anchor" id="af1b28ac82d8fa56fbc0a84f17d26d7b0"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiCurveClass.html#af1b28ac82d8fa56fbc0a84f17d26d7b0">_StpuiCurveClass::_gtk_reserved4</a>)(void)</td>
+          <td class="memname">void(* _StpuiCurveClass::_gtk_reserved4)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a3098d1e480ba77e57785667ccf0b1c9f"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="a3098d1e480ba77e57785667ccf0b1c9f" args=")(StpuiCurve *curve)" -->
+<a class="anchor" id="a3098d1e480ba77e57785667ccf0b1c9f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(*  <a class="el" href="struct__StpuiCurveClass.html#a3098d1e480ba77e57785667ccf0b1c9f">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td>
+          <td class="memname">void(*  _StpuiCurveClass::curve_type_changed)(<a class="el" href="curve_8h.html#a5c0213fede0b7d8a91b66e4679cc899a">StpuiCurve</a> *curve)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a60fce1a46ad405750d42c7aff83707bb"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="a60fce1a46ad405750d42c7aff83707bb" args="" -->
+<a class="anchor" id="a60fce1a46ad405750d42c7aff83707bb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#a60fce1a46ad405750d42c7aff83707bb">_StpuiCurveClass::parent_class</a></td>
+          <td class="memname">GtkDrawingAreaClass _StpuiCurveClass::parent_class</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 95bfea4..d3878b0 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: _StpuiGammaCurve Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,125 +40,121 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">_StpuiGammaCurve Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="_StpuiGammaCurve" -->
+
 <p><code>#include &lt;gammacurve.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkVBox&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a07e6d5e4479cbca4a927635cc6d02f26">vbox</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#af4a067c4f9e19c57d080b07aca9252b3">table</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aef8d7f12bd9a16784147cc3841d966c6">curve</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a6ec3a772b95ebde518266e23d2c6d351">button</a> [5]</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a7783842531471a1605b5d38c7a02a52e">gamma</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aef9135d931e5a99a0d35c40a8fc79b5b">gamma_dialog</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aabe5eae4e5aa05c6a62aab34d236c26b">gamma_text</a></td></tr>
+<tr class="memitem:a07e6d5e4479cbca4a927635cc6d02f26"><td class="memItemLeft" align="right" valign="top">GtkVBox&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a07e6d5e4479cbca4a927635cc6d02f26">vbox</a></td></tr>
+<tr class="memitem:af4a067c4f9e19c57d080b07aca9252b3"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#af4a067c4f9e19c57d080b07aca9252b3">table</a></td></tr>
+<tr class="memitem:aef8d7f12bd9a16784147cc3841d966c6"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aef8d7f12bd9a16784147cc3841d966c6">curve</a></td></tr>
+<tr class="memitem:a6ec3a772b95ebde518266e23d2c6d351"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a6ec3a772b95ebde518266e23d2c6d351">button</a> [5]</td></tr>
+<tr class="memitem:a7783842531471a1605b5d38c7a02a52e"><td class="memItemLeft" align="right" valign="top">gfloat&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#a7783842531471a1605b5d38c7a02a52e">gamma</a></td></tr>
+<tr class="memitem:aef9135d931e5a99a0d35c40a8fc79b5b"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aef9135d931e5a99a0d35c40a8fc79b5b">gamma_dialog</a></td></tr>
+<tr class="memitem:aabe5eae4e5aa05c6a62aab34d236c26b"><td class="memItemLeft" align="right" valign="top">GtkWidget *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aabe5eae4e5aa05c6a62aab34d236c26b">gamma_text</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a6ec3a772b95ebde518266e23d2c6d351"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="a6ec3a772b95ebde518266e23d2c6d351" args="[5]" -->
+<a class="anchor" id="a6ec3a772b95ebde518266e23d2c6d351"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#a6ec3a772b95ebde518266e23d2c6d351">_StpuiGammaCurve::button</a>[5]</td>
+          <td class="memname">GtkWidget* _StpuiGammaCurve::button[5]</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aef8d7f12bd9a16784147cc3841d966c6"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="aef8d7f12bd9a16784147cc3841d966c6" args="" -->
+<a class="anchor" id="aef8d7f12bd9a16784147cc3841d966c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#aef8d7f12bd9a16784147cc3841d966c6">_StpuiGammaCurve::curve</a></td>
+          <td class="memname">GtkWidget* _StpuiGammaCurve::curve</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7783842531471a1605b5d38c7a02a52e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="a7783842531471a1605b5d38c7a02a52e" args="" -->
+<a class="anchor" id="a7783842531471a1605b5d38c7a02a52e"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">gfloat <a class="el" href="struct__StpuiGammaCurve.html#a7783842531471a1605b5d38c7a02a52e">_StpuiGammaCurve::gamma</a></td>
+          <td class="memname">gfloat _StpuiGammaCurve::gamma</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aef9135d931e5a99a0d35c40a8fc79b5b"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="aef9135d931e5a99a0d35c40a8fc79b5b" args="" -->
+<a class="anchor" id="aef9135d931e5a99a0d35c40a8fc79b5b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#aef9135d931e5a99a0d35c40a8fc79b5b">_StpuiGammaCurve::gamma_dialog</a></td>
+          <td class="memname">GtkWidget* _StpuiGammaCurve::gamma_dialog</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aabe5eae4e5aa05c6a62aab34d236c26b"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="aabe5eae4e5aa05c6a62aab34d236c26b" args="" -->
+<a class="anchor" id="aabe5eae4e5aa05c6a62aab34d236c26b"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#aabe5eae4e5aa05c6a62aab34d236c26b">_StpuiGammaCurve::gamma_text</a></td>
+          <td class="memname">GtkWidget* _StpuiGammaCurve::gamma_text</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af4a067c4f9e19c57d080b07aca9252b3"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="af4a067c4f9e19c57d080b07aca9252b3" args="" -->
+<a class="anchor" id="af4a067c4f9e19c57d080b07aca9252b3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#af4a067c4f9e19c57d080b07aca9252b3">_StpuiGammaCurve::table</a></td>
+          <td class="memname">GtkWidget* _StpuiGammaCurve::table</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a07e6d5e4479cbca4a927635cc6d02f26"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="a07e6d5e4479cbca4a927635cc6d02f26" args="" -->
+<a class="anchor" id="a07e6d5e4479cbca4a927635cc6d02f26"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#a07e6d5e4479cbca4a927635cc6d02f26">_StpuiGammaCurve::vbox</a></td>
+          <td class="memname">GtkVBox _StpuiGammaCurve::vbox</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index 5d74034..3a07f11 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: _StpuiGammaCurveClass Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,97 +40,95 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">_StpuiGammaCurveClass Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="_StpuiGammaCurveClass" -->
+
 <p><code>#include &lt;gammacurve.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GtkVBoxClass&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#ae784cb24d21ce7c707727c5996fed405">parent_class</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#a11f61971dbf7791712b4ea447b00518d">_gtk_reserved1</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#af471d7067cff6f4f8908c147f4d7c99c">_gtk_reserved2</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#a337220ca7c1966c911dd856d8377c66d">_gtk_reserved3</a> )(void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#ad6007664d93b51b3f533998dfc836634">_gtk_reserved4</a> )(void)</td></tr>
+<tr class="memitem:ae784cb24d21ce7c707727c5996fed405"><td class="memItemLeft" align="right" valign="top">GtkVBoxClass&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#ae784cb24d21ce7c707727c5996fed405">parent_class</a></td></tr>
+<tr class="memitem:a11f61971dbf7791712b4ea447b00518d"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#a11f61971dbf7791712b4ea447b00518d">_gtk_reserved1</a> )(void)</td></tr>
+<tr class="memitem:af471d7067cff6f4f8908c147f4d7c99c"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#af471d7067cff6f4f8908c147f4d7c99c">_gtk_reserved2</a> )(void)</td></tr>
+<tr class="memitem:a337220ca7c1966c911dd856d8377c66d"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#a337220ca7c1966c911dd856d8377c66d">_gtk_reserved3</a> )(void)</td></tr>
+<tr class="memitem:ad6007664d93b51b3f533998dfc836634"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#ad6007664d93b51b3f533998dfc836634">_gtk_reserved4</a> )(void)</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a11f61971dbf7791712b4ea447b00518d"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="a11f61971dbf7791712b4ea447b00518d" args=")(void)" -->
+<a class="anchor" id="a11f61971dbf7791712b4ea447b00518d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#a11f61971dbf7791712b4ea447b00518d">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)</td>
+          <td class="memname">void(* _StpuiGammaCurveClass::_gtk_reserved1)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af471d7067cff6f4f8908c147f4d7c99c"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="af471d7067cff6f4f8908c147f4d7c99c" args=")(void)" -->
+<a class="anchor" id="af471d7067cff6f4f8908c147f4d7c99c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#af471d7067cff6f4f8908c147f4d7c99c">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)</td>
+          <td class="memname">void(* _StpuiGammaCurveClass::_gtk_reserved2)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a337220ca7c1966c911dd856d8377c66d"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="a337220ca7c1966c911dd856d8377c66d" args=")(void)" -->
+<a class="anchor" id="a337220ca7c1966c911dd856d8377c66d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#a337220ca7c1966c911dd856d8377c66d">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)</td>
+          <td class="memname">void(* _StpuiGammaCurveClass::_gtk_reserved3)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ad6007664d93b51b3f533998dfc836634"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="ad6007664d93b51b3f533998dfc836634" args=")(void)" -->
+<a class="anchor" id="ad6007664d93b51b3f533998dfc836634"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#ad6007664d93b51b3f533998dfc836634">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)</td>
+          <td class="memname">void(* _StpuiGammaCurveClass::_gtk_reserved4)(void)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae784cb24d21ce7c707727c5996fed405"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="ae784cb24d21ce7c707727c5996fed405" args="" -->
+<a class="anchor" id="ae784cb24d21ce7c707727c5996fed405"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#ae784cb24d21ce7c707727c5996fed405">_StpuiGammaCurveClass::parent_class</a></td>
+          <td class="memname">GtkVBoxClass _StpuiGammaCurveClass::parent_class</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index aa00850..496c9ab 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: stpui_image Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,139 +40,134 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stpui_image Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stpui_image" -->
+
 <p><code>#include &lt;gutenprintui.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">stp_image_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a00862540482f307175e9fbf252751320">im</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a5f2a75c7187c6abcf20e15e2aad22549">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#af2733a318654d50214c94fccd9a018b7">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#ac378339fe87fa21d5f117fc11b3f5b6c">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a0a31280def8cd739184192dbe8d34fa8">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#ae111082f0f23096d89e024c4fde9c0d6">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#aaaae08fdabffb3d31ac761dfe0624506">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a96e6cc155230793c8aa847e5a7cd7255">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
+<tr class="memitem:a00862540482f307175e9fbf252751320"><td class="memItemLeft" align="right" valign="top">stp_image_t&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a00862540482f307175e9fbf252751320">im</a></td></tr>
+<tr class="memitem:a5f2a75c7187c6abcf20e15e2aad22549"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a5f2a75c7187c6abcf20e15e2aad22549">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:af2733a318654d50214c94fccd9a018b7"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#af2733a318654d50214c94fccd9a018b7">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:ac378339fe87fa21d5f117fc11b3f5b6c"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#ac378339fe87fa21d5f117fc11b3f5b6c">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:a0a31280def8cd739184192dbe8d34fa8"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a0a31280def8cd739184192dbe8d34fa8">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:ae111082f0f23096d89e024c4fde9c0d6"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#ae111082f0f23096d89e024c4fde9c0d6">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:aaaae08fdabffb3d31ac761dfe0624506"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#aaaae08fdabffb3d31ac761dfe0624506">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr class="memitem:a96e6cc155230793c8aa847e5a7cd7255"><td class="memItemLeft" align="right" valign="top">void(*&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#a96e6cc155230793c8aa847e5a7cd7255">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a96e6cc155230793c8aa847e5a7cd7255"></a><!-- doxytag: member="stpui_image::crop" ref="a96e6cc155230793c8aa847e5a7cd7255" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" -->
+<a class="anchor" id="a96e6cc155230793c8aa847e5a7cd7255"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#a96e6cc155230793c8aa847e5a7cd7255">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td>
+          <td class="memname">void(* stpui_image::crop)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af2733a318654d50214c94fccd9a018b7"></a><!-- doxytag: member="stpui_image::hflip" ref="af2733a318654d50214c94fccd9a018b7" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="af2733a318654d50214c94fccd9a018b7"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#af2733a318654d50214c94fccd9a018b7">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::hflip)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a00862540482f307175e9fbf252751320"></a><!-- doxytag: member="stpui_image::im" ref="a00862540482f307175e9fbf252751320" args="" -->
+<a class="anchor" id="a00862540482f307175e9fbf252751320"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">stp_image_t <a class="el" href="structstpui__image.html#a00862540482f307175e9fbf252751320">stpui_image::im</a></td>
+          <td class="memname">stp_image_t stpui_image::im</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aaaae08fdabffb3d31ac761dfe0624506"></a><!-- doxytag: member="stpui_image::rotate_180" ref="aaaae08fdabffb3d31ac761dfe0624506" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="aaaae08fdabffb3d31ac761dfe0624506"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#aaaae08fdabffb3d31ac761dfe0624506">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::rotate_180)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a0a31280def8cd739184192dbe8d34fa8"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="a0a31280def8cd739184192dbe8d34fa8" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="a0a31280def8cd739184192dbe8d34fa8"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#a0a31280def8cd739184192dbe8d34fa8">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::rotate_ccw)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ae111082f0f23096d89e024c4fde9c0d6"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="ae111082f0f23096d89e024c4fde9c0d6" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="ae111082f0f23096d89e024c4fde9c0d6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#ae111082f0f23096d89e024c4fde9c0d6">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::rotate_cw)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a5f2a75c7187c6abcf20e15e2aad22549"></a><!-- doxytag: member="stpui_image::transpose" ref="a5f2a75c7187c6abcf20e15e2aad22549" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="a5f2a75c7187c6abcf20e15e2aad22549"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#a5f2a75c7187c6abcf20e15e2aad22549">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::transpose)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac378339fe87fa21d5f117fc11b3f5b6c"></a><!-- doxytag: member="stpui_image::vflip" ref="ac378339fe87fa21d5f117fc11b3f5b6c" args=")(struct stpui_image *image)" -->
+<a class="anchor" id="ac378339fe87fa21d5f117fc11b3f5b6c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">void(* <a class="el" href="structstpui__image.html#ac378339fe87fa21d5f117fc11b3f5b6c">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
+          <td class="memname">void(* stpui_image::vflip)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index a9bdd2d..0f744f1 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: stpui_plist_t Struct Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -34,209 +40,199 @@
       <li><a href="functions.html"><span>Data&#160;Fields</span></a></li>
     </ul>
   </div>
-</div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-attribs">Data Fields</a>  </div>
   <div class="headertitle">
 <div class="title">stpui_plist_t Struct Reference</div>  </div>
-</div>
+</div><!--header-->
 <div class="contents">
-<!-- doxytag: class="stpui_plist_t" -->
+
 <p><code>#include &lt;gutenprintui.h&gt;</code></p>
 <table class="memberdecls">
-<tr><td colspan="2"><h2><a name="pub-attribs"></a>
+<tr class="heading"><td colspan="2"><h2><a name="pub-attribs"></a>
 Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a95d5e51f00ae03f4ca085120fc7b88e6">name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#ac1243181065442af4c72c24c0d3901f3">command_type</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a34155aeda35a97423a70071478a94469">queue_name</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#aff2ab5a8193a99dc8014d804281173c6">extra_printer_options</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a783211034ef118e102c9c07eb9f9a4fa">custom_command</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#adde7851705ff38bb9b14c1ec11bb53cb">current_standard_command</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#aee538bc59fd77730a5f73d3ea7d51d18">output_filename</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">float&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a7325ec55acf12db60e799b4532d50d0d">scaling</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a394eafe3058457db432eeecb49addf07">orientation</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a55bd8ba78e4f839d2897100cabd1c62f">unit</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a9f02a46dd284eeaf56a643e0e4b17ffb">auto_size_roll_feed_paper</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a49e854e792c73fee7bebcfb4de9ac78a">invalid_mask</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">stp_vars_t *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#afbdf87548a3132b7270aa88ffcf52a8a">v</a></td></tr>
+<tr class="memitem:a95d5e51f00ae03f4ca085120fc7b88e6"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a95d5e51f00ae03f4ca085120fc7b88e6">name</a></td></tr>
+<tr class="memitem:ac1243181065442af4c72c24c0d3901f3"><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#ac1243181065442af4c72c24c0d3901f3">command_type</a></td></tr>
+<tr class="memitem:a34155aeda35a97423a70071478a94469"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a34155aeda35a97423a70071478a94469">queue_name</a></td></tr>
+<tr class="memitem:aff2ab5a8193a99dc8014d804281173c6"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#aff2ab5a8193a99dc8014d804281173c6">extra_printer_options</a></td></tr>
+<tr class="memitem:a783211034ef118e102c9c07eb9f9a4fa"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a783211034ef118e102c9c07eb9f9a4fa">custom_command</a></td></tr>
+<tr class="memitem:adde7851705ff38bb9b14c1ec11bb53cb"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#adde7851705ff38bb9b14c1ec11bb53cb">current_standard_command</a></td></tr>
+<tr class="memitem:aee538bc59fd77730a5f73d3ea7d51d18"><td class="memItemLeft" align="right" valign="top">char *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#aee538bc59fd77730a5f73d3ea7d51d18">output_filename</a></td></tr>
+<tr class="memitem:a7325ec55acf12db60e799b4532d50d0d"><td class="memItemLeft" align="right" valign="top">float&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a7325ec55acf12db60e799b4532d50d0d">scaling</a></td></tr>
+<tr class="memitem:a394eafe3058457db432eeecb49addf07"><td class="memItemLeft" align="right" valign="top"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a394eafe3058457db432eeecb49addf07">orientation</a></td></tr>
+<tr class="memitem:a55bd8ba78e4f839d2897100cabd1c62f"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a55bd8ba78e4f839d2897100cabd1c62f">unit</a></td></tr>
+<tr class="memitem:a9f02a46dd284eeaf56a643e0e4b17ffb"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a9f02a46dd284eeaf56a643e0e4b17ffb">auto_size_roll_feed_paper</a></td></tr>
+<tr class="memitem:a49e854e792c73fee7bebcfb4de9ac78a"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#a49e854e792c73fee7bebcfb4de9ac78a">invalid_mask</a></td></tr>
+<tr class="memitem:afbdf87548a3132b7270aa88ffcf52a8a"><td class="memItemLeft" align="right" valign="top">stp_vars_t *&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#afbdf87548a3132b7270aa88ffcf52a8a">v</a></td></tr>
 </table>
 <hr/><h2>Field Documentation</h2>
-<a class="anchor" id="a9f02a46dd284eeaf56a643e0e4b17ffb"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="a9f02a46dd284eeaf56a643e0e4b17ffb" args="" -->
+<a class="anchor" id="a9f02a46dd284eeaf56a643e0e4b17ffb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstpui__plist__t.html#a9f02a46dd284eeaf56a643e0e4b17ffb">stpui_plist_t::auto_size_roll_feed_paper</a></td>
+          <td class="memname">int stpui_plist_t::auto_size_roll_feed_paper</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ac1243181065442af4c72c24c0d3901f3"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="ac1243181065442af4c72c24c0d3901f3" args="" -->
+<a class="anchor" id="ac1243181065442af4c72c24c0d3901f3"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> <a class="el" href="structstpui__plist__t.html#ac1243181065442af4c72c24c0d3901f3">stpui_plist_t::command_type</a></td>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#ab31350eb38b009cbd282027630a1ee10">command_t</a> stpui_plist_t::command_type</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="adde7851705ff38bb9b14c1ec11bb53cb"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="adde7851705ff38bb9b14c1ec11bb53cb" args="" -->
+<a class="anchor" id="adde7851705ff38bb9b14c1ec11bb53cb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#adde7851705ff38bb9b14c1ec11bb53cb">stpui_plist_t::current_standard_command</a></td>
+          <td class="memname">char* stpui_plist_t::current_standard_command</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a783211034ef118e102c9c07eb9f9a4fa"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="a783211034ef118e102c9c07eb9f9a4fa" args="" -->
+<a class="anchor" id="a783211034ef118e102c9c07eb9f9a4fa"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#a783211034ef118e102c9c07eb9f9a4fa">stpui_plist_t::custom_command</a></td>
+          <td class="memname">char* stpui_plist_t::custom_command</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aff2ab5a8193a99dc8014d804281173c6"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="aff2ab5a8193a99dc8014d804281173c6" args="" -->
+<a class="anchor" id="aff2ab5a8193a99dc8014d804281173c6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#aff2ab5a8193a99dc8014d804281173c6">stpui_plist_t::extra_printer_options</a></td>
+          <td class="memname">char* stpui_plist_t::extra_printer_options</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a49e854e792c73fee7bebcfb4de9ac78a"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="a49e854e792c73fee7bebcfb4de9ac78a" args="" -->
+<a class="anchor" id="a49e854e792c73fee7bebcfb4de9ac78a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstpui__plist__t.html#a49e854e792c73fee7bebcfb4de9ac78a">stpui_plist_t::invalid_mask</a></td>
+          <td class="memname">int stpui_plist_t::invalid_mask</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a95d5e51f00ae03f4ca085120fc7b88e6"></a><!-- doxytag: member="stpui_plist_t::name" ref="a95d5e51f00ae03f4ca085120fc7b88e6" args="" -->
+<a class="anchor" id="a95d5e51f00ae03f4ca085120fc7b88e6"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#a95d5e51f00ae03f4ca085120fc7b88e6">stpui_plist_t::name</a></td>
+          <td class="memname">char* stpui_plist_t::name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a394eafe3058457db432eeecb49addf07"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="a394eafe3058457db432eeecb49addf07" args="" -->
+<a class="anchor" id="a394eafe3058457db432eeecb49addf07"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a> <a class="el" href="structstpui__plist__t.html#a394eafe3058457db432eeecb49addf07">stpui_plist_t::orientation</a></td>
+          <td class="memname"><a class="el" href="gutenprintui_8h.html#ac33232f845969eb04b32e1006c8240a0">orient_t</a> stpui_plist_t::orientation</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="aee538bc59fd77730a5f73d3ea7d51d18"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="aee538bc59fd77730a5f73d3ea7d51d18" args="" -->
+<a class="anchor" id="aee538bc59fd77730a5f73d3ea7d51d18"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#aee538bc59fd77730a5f73d3ea7d51d18">stpui_plist_t::output_filename</a></td>
+          <td class="memname">char* stpui_plist_t::output_filename</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a34155aeda35a97423a70071478a94469"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="a34155aeda35a97423a70071478a94469" args="" -->
+<a class="anchor" id="a34155aeda35a97423a70071478a94469"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">char* <a class="el" href="structstpui__plist__t.html#a34155aeda35a97423a70071478a94469">stpui_plist_t::queue_name</a></td>
+          <td class="memname">char* stpui_plist_t::queue_name</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7325ec55acf12db60e799b4532d50d0d"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="a7325ec55acf12db60e799b4532d50d0d" args="" -->
+<a class="anchor" id="a7325ec55acf12db60e799b4532d50d0d"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">float <a class="el" href="structstpui__plist__t.html#a7325ec55acf12db60e799b4532d50d0d">stpui_plist_t::scaling</a></td>
+          <td class="memname">float stpui_plist_t::scaling</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a55bd8ba78e4f839d2897100cabd1c62f"></a><!-- doxytag: member="stpui_plist_t::unit" ref="a55bd8ba78e4f839d2897100cabd1c62f" args="" -->
+<a class="anchor" id="a55bd8ba78e4f839d2897100cabd1c62f"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">int <a class="el" href="structstpui__plist__t.html#a55bd8ba78e4f839d2897100cabd1c62f">stpui_plist_t::unit</a></td>
+          <td class="memname">int stpui_plist_t::unit</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="afbdf87548a3132b7270aa88ffcf52a8a"></a><!-- doxytag: member="stpui_plist_t::v" ref="afbdf87548a3132b7270aa88ffcf52a8a" args="" -->
+<a class="anchor" id="afbdf87548a3132b7270aa88ffcf52a8a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">stp_vars_t* <a class="el" href="structstpui__plist__t.html#afbdf87548a3132b7270aa88ffcf52a8a">stpui_plist_t::v</a></td>
+          <td class="memname">stp_vars_t* stpui_plist_t::v</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <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></li>
 </ul>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/t_8h.html b/doc/gutenprintui2/html/t_8h.html
index 7c7154c..a3b3427 100644
--- a/doc/gutenprintui2/html/t_8h.html
+++ b/doc/gutenprintui2/html/t_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: include/gutenprintui2/t.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,70 +39,72 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprintui2/t.h File Reference</div>  </div>
-</div>
+<div class="title">t.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;glib-object.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&#160;&#160;&#160;(orient_t_orient_t_get_type())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#ab213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&#160;&#160;&#160;(command_t_command_t_get_type())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#af0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&#160;&#160;&#160;(stpui_curve_type_get_type())</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a7c68a632b60b65d497e2933fa1b78a77"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a>())</td></tr>
+<tr class="memitem:ab213314f887b8b4f48f9aa1531673a9c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#ab213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a>())</td></tr>
+<tr class="memitem:af0561b03a3bfb203b40c37f9bb373ffb"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#af0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a>())</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">G_BEGIN_DECLS GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
+<tr class="memitem:ab05fb37a6c79f2b6b417ff107d9bb881"><td class="memItemLeft" align="right" valign="top">G_BEGIN_DECLS GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
+<tr class="memitem:a5e6b50173b88263be23734e76f4a39f2"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
+<tr class="memitem:a1252245c3967f9e655de3d62c3999230"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
 </table>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ab213314f887b8b4f48f9aa1531673a9c"></a><!-- doxytag: member="t.h::STPUI_TYPE_COMMAND_T" ref="ab213314f887b8b4f48f9aa1531673a9c" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ab213314f887b8b4f48f9aa1531673a9c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_COMMAND_T&#160;&#160;&#160;(command_t_command_t_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_COMMAND_T&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af0561b03a3bfb203b40c37f9bb373ffb"></a><!-- doxytag: member="t.h::STPUI_TYPE_CURVE_TYPE" ref="af0561b03a3bfb203b40c37f9bb373ffb" args="" -->
+<a class="anchor" id="af0561b03a3bfb203b40c37f9bb373ffb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&#160;&#160;&#160;(stpui_curve_type_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7c68a632b60b65d497e2933fa1b78a77"></a><!-- doxytag: member="t.h::STPUI_TYPE_ORIENT_T" ref="a7c68a632b60b65d497e2933fa1b78a77" args="" -->
+<a class="anchor" id="a7c68a632b60b65d497e2933fa1b78a77"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_ORIENT_T&#160;&#160;&#160;(orient_t_orient_t_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_ORIENT_T&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a5e6b50173b88263be23734e76f4a39f2"></a><!-- doxytag: member="t.h::command_t_command_t_get_type" ref="a5e6b50173b88263be23734e76f4a39f2" args="(void)" -->
+<a class="anchor" id="a5e6b50173b88263be23734e76f4a39f2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -108,12 +116,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab05fb37a6c79f2b6b417ff107d9bb881"></a><!-- doxytag: member="t.h::orient_t_orient_t_get_type" ref="ab05fb37a6c79f2b6b417ff107d9bb881" args="(void)" -->
+<a class="anchor" id="ab05fb37a6c79f2b6b417ff107d9bb881"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -125,12 +132,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1252245c3967f9e655de3d62c3999230"></a><!-- doxytag: member="t.h::stpui_curve_type_get_type" ref="a1252245c3967f9e655de3d62c3999230" args="(void)" -->
+<a class="anchor" id="a1252245c3967f9e655de3d62c3999230"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -142,14 +148,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/tab_a.png b/doc/gutenprintui2/html/tab_a.png
index 2d99ef2..3b725c4 100644
--- a/doc/gutenprintui2/html/tab_a.png
+++ b/doc/gutenprintui2/html/tab_a.png
diff --git a/doc/gutenprintui2/html/tab_b.png b/doc/gutenprintui2/html/tab_b.png
index b2c3d2b..258c141 100644
--- a/doc/gutenprintui2/html/tab_b.png
+++ b/doc/gutenprintui2/html/tab_b.png
diff --git a/doc/gutenprintui2/html/tab_h.png b/doc/gutenprintui2/html/tab_h.png
index c11f48f..4ca9102 100644
--- a/doc/gutenprintui2/html/tab_h.png
+++ b/doc/gutenprintui2/html/tab_h.png
diff --git a/doc/gutenprintui2/html/tab_s.png b/doc/gutenprintui2/html/tab_s.png
index 978943a..ab478c9 100644
--- a/doc/gutenprintui2/html/tab_s.png
+++ b/doc/gutenprintui2/html/tab_s.png
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index e23584d..822211f 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -2,24 +2,30 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <title>libgutenprintui2 API Reference: include/gutenprintui2/typebuiltins.h File Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
-<link href="doxygen.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<!-- Generated by Doxygen 1.7.4 -->
-<div id="top">
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
-   <div id="projectname">libgutenprintui2 API Reference&#160;<span id="projectnumber">5.2.7</span></div>
+   <div id="projectname">libgutenprintui2 API Reference
+   &#160;<span id="projectnumber">5.2.8</span>
+   </div>
   </td>
  </tr>
  </tbody>
 </table>
 </div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.1 -->
   <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="index.html"><span>Main&#160;Page</span></a></li>
@@ -33,70 +39,72 @@
       <li><a href="globals.html"><span>Globals</span></a></li>
     </ul>
   </div>
+<div id="nav-path" class="navpath">
+  <ul>
+<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_6692d22cad271f22063fae9b501c7ab3.html">gutenprintui2</a></li>  </ul>
 </div>
+</div><!-- top -->
 <div class="header">
   <div class="summary">
-<a href="#define-members">Defines</a> &#124;
+<a href="#define-members">Macros</a> &#124;
 <a href="#func-members">Functions</a>  </div>
   <div class="headertitle">
-<div class="title">include/gutenprintui2/typebuiltins.h File Reference</div>  </div>
-</div>
+<div class="title">typebuiltins.h File Reference</div>  </div>
+</div><!--header-->
 <div class="contents">
 <div class="textblock"><code>#include &lt;glib-object.h&gt;</code><br/>
 </div><table class="memberdecls">
-<tr><td colspan="2"><h2><a name="define-members"></a>
-Defines</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&#160;&#160;&#160;(orient_t_orient_t_get_type())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#ab213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&#160;&#160;&#160;(command_t_command_t_get_type())</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#af0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&#160;&#160;&#160;(stpui_curve_type_get_type())</td></tr>
-<tr><td colspan="2"><h2><a name="func-members"></a>
+<tr class="heading"><td colspan="2"><h2><a name="define-members"></a>
+Macros</h2></td></tr>
+<tr class="memitem:a7c68a632b60b65d497e2933fa1b78a77"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a>())</td></tr>
+<tr class="memitem:ab213314f887b8b4f48f9aa1531673a9c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#ab213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a>())</td></tr>
+<tr class="memitem:af0561b03a3bfb203b40c37f9bb373ffb"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#af0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a>())</td></tr>
+</table><table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2><a name="func-members"></a>
 Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">G_BEGIN_DECLS GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
+<tr class="memitem:ab05fb37a6c79f2b6b417ff107d9bb881"><td class="memItemLeft" align="right" valign="top">G_BEGIN_DECLS GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
+<tr class="memitem:a5e6b50173b88263be23734e76f4a39f2"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
+<tr class="memitem:a1252245c3967f9e655de3d62c3999230"><td class="memItemLeft" align="right" valign="top">GType&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
 </table>
-<hr/><h2>Define Documentation</h2>
-<a class="anchor" id="ab213314f887b8b4f48f9aa1531673a9c"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="ab213314f887b8b4f48f9aa1531673a9c" args="" -->
+<hr/><h2>Macro Definition Documentation</h2>
+<a class="anchor" id="ab213314f887b8b4f48f9aa1531673a9c"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_COMMAND_T&#160;&#160;&#160;(command_t_command_t_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_COMMAND_T&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="af0561b03a3bfb203b40c37f9bb373ffb"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="af0561b03a3bfb203b40c37f9bb373ffb" args="" -->
+<a class="anchor" id="af0561b03a3bfb203b40c37f9bb373ffb"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&#160;&#160;&#160;(stpui_curve_type_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#a1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a7c68a632b60b65d497e2933fa1b78a77"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="a7c68a632b60b65d497e2933fa1b78a77" args="" -->
+<a class="anchor" id="a7c68a632b60b65d497e2933fa1b78a77"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STPUI_TYPE_ORIENT_T&#160;&#160;&#160;(orient_t_orient_t_get_type())</td>
+          <td class="memname">#define STPUI_TYPE_ORIENT_T&#160;&#160;&#160;(<a class="el" href="typebuiltins_8h.html#ab05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a>())</td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
 <hr/><h2>Function Documentation</h2>
-<a class="anchor" id="a5e6b50173b88263be23734e76f4a39f2"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="a5e6b50173b88263be23734e76f4a39f2" args="(void)" -->
+<a class="anchor" id="a5e6b50173b88263be23734e76f4a39f2"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -108,12 +116,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="ab05fb37a6c79f2b6b417ff107d9bb881"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="ab05fb37a6c79f2b6b417ff107d9bb881" args="(void)" -->
+<a class="anchor" id="ab05fb37a6c79f2b6b417ff107d9bb881"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -125,12 +132,11 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-<a class="anchor" id="a1252245c3967f9e655de3d62c3999230"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="a1252245c3967f9e655de3d62c3999230" args="(void)" -->
+<a class="anchor" id="a1252245c3967f9e655de3d62c3999230"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -142,14 +148,16 @@ Functions</h2></td></tr>
           <td></td>
         </tr>
       </table>
-</div>
-<div class="memdoc">
+</div><div class="memdoc">
 
 </div>
 </div>
-</div>
-<hr class="footer"/><address class="footer"><small>Generated by&#160;
-<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.7.4 </small></address>
+</div><!-- contents -->
+<!-- start footer part -->
+<hr class="footer"/><address class="footer"><small>
+Generated by &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="doxygen.png" alt="doxygen"/>
+</a> 1.8.1
+</small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index 42d05de..863a6f1 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -128,6 +128,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -204,6 +205,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +226,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -247,6 +251,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -293,7 +298,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index b0940be..fa778f2 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -118,6 +118,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -194,6 +195,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -214,6 +216,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -237,6 +241,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -283,7 +288,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h
index 9e0fcc5..6c6a42d 100644
--- a/include/gutenprint/bit-ops.h
+++ b/include/gutenprint/bit-ops.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.h,v 1.4 2009/05/17 19:25:36 rlk Exp $"
+ * "$Id: bit-ops.h,v 1.5 2012/04/19 14:41:03 gernot2270 Exp $"
  *
  *   Softweave calculator for gimp-print.
  *
@@ -77,6 +77,17 @@ extern void	stp_fold_4bit(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
 /**
+ * Interleave a buffer consisting of eight bit strings of length single_length
+ * into one string of packed eight-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_8bit(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
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index c2870a0..796e796 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -438,6 +438,14 @@ extern void *stp_get_errdata(const stp_vars_t *v);
  */
 extern void stp_merge_printvars(stp_vars_t *user, const stp_vars_t *print);
 
+/**
+ * Copy settings from one vars object to another, not modifying anything
+ * unset in the source.
+ * @param to the destination vars.
+ * @param from the vars to merge into user.
+ */
+extern void stp_copy_vars_from(stp_vars_t *to, const stp_vars_t *from);
+
 
 /****************************************************************
 *                                                               *
@@ -1537,5 +1545,5 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
 
 #endif /* GUTENPRINT_VARS_H */
 /*
- * End of "$Id: vars.h,v 1.8 2010/12/05 21:38:14 rlk Exp $".
+ * End of "$Id: vars.h,v 1.10 2011/06/12 00:47:15 rlk Exp $".
  */
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 23c35e3..f0e2dc5 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -116,6 +116,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -192,6 +193,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -212,6 +214,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -235,6 +239,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -281,7 +286,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b1251be..d812584 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,7 +1,8 @@
 # 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.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@ esac
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -160,10 +168,13 @@ _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_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -179,7 +190,6 @@ fi
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +203,6 @@ aix3*)
   ;;
 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
@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify 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'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],
 # 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"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
 # 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"`'
+#    <var>='`$ECHO "$<var>" | $SED "$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)])])])
@@ -517,12 +532,20 @@ LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +556,9 @@ done
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \
     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_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT
 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
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -601,7 +637,7 @@ 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.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"
 # 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_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)
 ])# LT_OUTPUT
 
 
@@ -684,6 +718,7 @@ _LT_CONFIG_SAVE_COMMANDS([
 
 # `$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
@@ -716,15 +751,12 @@ _LT_EOF
   # 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 '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -830,11 +862,13 @@ 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)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 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], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -939,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -966,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -986,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   _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)=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -994,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     _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}"
@@ -1010,203 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # 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.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 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
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`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 "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+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
+[m4_divert_text([M4SH-INIT], [$1
+])])# _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.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
 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!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 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
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 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
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-	  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
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# 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
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-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_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1235,7 +1237,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "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
@@ -1353,14 +1355,47 @@ need_locks="$enable_libtool_lock"
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _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])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1387,10 +1422,19 @@ if test -n "$RANLIB"; then
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _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_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1415,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],
    -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 echo "\"\$as_me:$LINENO: $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
+   echo "$as_me:$LINENO: \$? = $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
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -1463,7 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],
      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
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1526,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    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.
@@ -1590,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # 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 &&
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1642,7 +1691,7 @@ 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"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1683,7 +1732,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1692,7 +1747,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -1868,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    -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 echo "\"\$as_me:$LINENO: $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
+   echo "$as_me:$LINENO: \$? = $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
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/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
@@ -2036,6 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2044,16 +2104,23 @@ if test "$GCC" = yes; then
     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
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # 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
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # 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=
@@ -2066,7 +2133,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;
@@ -2086,7 +2153,13 @@ 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`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2174,7 +2247,7 @@ amigaos*)
   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'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''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
   ;;
@@ -2205,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2227,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)
     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"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     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
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        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
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # 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'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2343,6 +2464,19 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  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=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  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.
@@ -2385,8 +2519,10 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
@@ -2444,7 +2580,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2453,16 +2589,21 @@ 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_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
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    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],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -2471,7 +2612,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;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2704,6 +2845,8 @@ _LT_DECL([], [library_names_spec], [1],
     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([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -2816,6 +2959,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -2937,6 +3081,11 @@ case $reload_flag in
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -2945,8 +3094,8 @@ case $host_os in
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -2998,16 +3147,18 @@ 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
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && 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)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+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'
@@ -3037,6 +3188,10 @@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@ -3045,11 +3200,11 @@ hpux10.20* | hpux11*)
     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_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? 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_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
@@ -3071,7 +3226,7 @@ irix5* | irix6* | nonstopux*)
   ;;
 
 # This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3149,6 +3304,21 @@ tpf*)
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 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
@@ -3156,7 +3326,11 @@ 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"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3213,7 +3387,19 @@ 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"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -3226,13 +3412,13 @@ _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 echo "\"\$as_me:$LINENO: $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 echo "\"\$as_me:$LINENO: $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)
+  (eval echo "\"\$as_me:$LINENO: 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"
@@ -3247,6 +3433,67 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3255,7 +3502,7 @@ AC_DEFUN([LT_LIB_M],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3283,7 +3530,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
 _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'
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3300,6 +3552,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3367,8 +3620,8 @@ esac
 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'"
+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=
@@ -3404,6 +3657,7 @@ for ac_symprfx in "" "_"; do
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3425,7 +3679,7 @@ _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
+    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"
@@ -3437,6 +3691,18 @@ _LT_EOF
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3448,7 +3714,7 @@ _LT_EOF
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3474,15 +3740,15 @@ static const void *lt_preloaded_setup() {
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_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"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3515,6 +3781,13 @@ else
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+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],
@@ -3525,6 +3798,8 @@ _LT_DECL([global_symbol_to_c_name_address],
 _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_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3536,7 +3811,6 @@ _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
@@ -3587,6 +3861,11 @@ m4_if([$1], [CXX], [
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3636,6 +3915,12 @@ m4_if([$1], [CXX], [
 	  ;;
 	esac
 	;;
+      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).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3692,7 +3977,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -3725,8 +4010,8 @@ m4_if([$1], [CXX], [
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3788,7 +4073,7 @@ m4_if([$1], [CXX], [
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # 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'
@@ -3892,6 +4177,12 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     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
@@ -3934,6 +4225,13 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -3976,7 +4274,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -3997,7 +4295,13 @@ m4_if([$1], [CXX], [
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4009,25 +4313,25 @@ m4_if([$1], [CXX], [
         # 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
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_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
+	*Sun\ F* | *Sun*Fortran*)
+	  # 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)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	*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)=''
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
 	esac
 	;;
@@ -4059,7 +4363,7 @@ m4_if([$1], [CXX], [
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4116,9 +4420,11 @@ case $host_os in
     _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])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4137,6 +4443,8 @@ fi
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4157,6 +4465,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4165,27 +4474,35 @@ 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'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   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
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     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'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([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'
-  ;;
+    case $cc_basename in
+    cl*) ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
   *)
     _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)=
@@ -4248,7 +4565,33 @@ dnl Note also adjust exclude_expsyms for C++ above.
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4266,6 +4609,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
     fi
     supports_anon_versioning=no
     case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [[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 ...
@@ -4281,11 +4625,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
 	_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
+*** Warning: the GNU linker, at least up to release 2.19, 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.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4321,10 +4666,12 @@ _LT_EOF
       # _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(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _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'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       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'
@@ -4342,6 +4689,11 @@ _LT_EOF
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4357,7 +4709,7 @@ _LT_EOF
       _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)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -4367,15 +4719,16 @@ _LT_EOF
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	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'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# 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; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4386,13 +4739,17 @@ _LT_EOF
 	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)
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	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(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -4408,17 +4765,17 @@ _LT_EOF
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # 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'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_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'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4432,8 +4789,8 @@ _LT_EOF
 	_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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4451,8 +4808,8 @@ _LT_EOF
 
 _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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $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
@@ -4498,8 +4855,8 @@ _LT_EOF
 
     *)
       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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $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
@@ -4539,8 +4896,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
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	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'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([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
@@ -4627,9 +4986,9 @@ _LT_EOF
 	_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_SYS_MODULE_PATH_AIX([$1])
         _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"
+        _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 func_echo_all "${wl}${allow_undefined_flag}"; 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'
@@ -4638,14 +4997,19 @@ _LT_EOF
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _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'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _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'
@@ -4677,20 +5041,63 @@ _LT_EOF
       # 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
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# 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 $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_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'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_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 `func_echo_all "$deplibs" | $SED '\''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(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4728,7 +5135,7 @@ _LT_EOF
 
     # 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(archive_cmds, $1)='$CC -shared $pic_flag -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
@@ -4736,7 +5143,7 @@ _LT_EOF
 
     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'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${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
@@ -4751,8 +5158,8 @@ _LT_EOF
       ;;
 
     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'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${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
@@ -4770,16 +5177,16 @@ _LT_EOF
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$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 $pic_flag ${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'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -4791,7 +5198,14 @@ _LT_EOF
 	  _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'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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
@@ -4819,19 +5233,34 @@ _LT_EOF
 
     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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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" && func_echo_all "-set_version $verstring"` -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'
@@ -4893,17 +5322,17 @@ _LT_EOF
       _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(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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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'
@@ -4913,13 +5342,13 @@ _LT_EOF
     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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4932,9 +5361,9 @@ _LT_EOF
       _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_cmds, $1)='$CC -shared $pic_flag ${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'
+	  $CC -shared $pic_flag ${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"*)
@@ -5110,36 +5539,38 @@ 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.
-      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)])
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$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_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_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*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5204,8 +5635,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
     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],
@@ -5216,6 +5645,8 @@ _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([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5309,37 +5740,22 @@ 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_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+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
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5361,6 +5777,8 @@ _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(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5392,6 +5810,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5409,6 +5828,7 @@ if test "$_lt_caught_CXX_error" != yes; then
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5430,8 +5850,8 @@ if test "$_lt_caught_CXX_error" != yes; then
       # 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(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -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'
@@ -5463,7 +5883,7 @@ if test "$_lt_caught_CXX_error" != yes; then
       # 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"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -5572,10 +5992,10 @@ if test "$_lt_caught_CXX_error" != yes; then
           _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_SYS_MODULE_PATH_AIX([$1])
           _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"
+          _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 func_echo_all "${wl}${allow_undefined_flag}"; 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'
@@ -5584,14 +6004,19 @@ if test "$_lt_caught_CXX_error" != yes; then
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _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'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -5621,28 +6046,75 @@ if test "$_lt_caught_CXX_error" != yes; then
         ;;
 
       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
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # 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
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # 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 $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _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(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _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
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -5684,6 +6156,11 @@ if test "$_lt_caught_CXX_error" != yes; then
       gnu*)
         ;;
 
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
       hpux9*)
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5708,11 +6185,11 @@ if test "$_lt_caught_CXX_error" != yes; then
             # 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'
+            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; func_echo_all "$list"'
             ;;
           *)
             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'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${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
@@ -5773,7 +6250,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    # 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'
+	    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; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -5783,10 +6260,10 @@ if test "$_lt_caught_CXX_error" != yes; then
 	            _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 $pic_flag ${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'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5816,7 +6293,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         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'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-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
@@ -5827,9 +6304,9 @@ if test "$_lt_caught_CXX_error" != yes; then
           *)
 	    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'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5840,7 +6317,7 @@ if test "$_lt_caught_CXX_error" != yes; then
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5858,7 +6335,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    # 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'
+	    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; func_echo_all "$list"'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5895,26 +6372,26 @@ if test "$_lt_caught_CXX_error" != yes; then
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	    *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`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $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`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $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'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $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'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above 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'
 	      ;;
@@ -5922,7 +6399,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 
 	    _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'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -5941,9 +6418,9 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    # 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'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$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; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # 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'
@@ -5963,13 +6440,13 @@ if test "$_lt_caught_CXX_error" != yes; then
 	      _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(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$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'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6038,7 +6515,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    _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
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6073,15 +6550,15 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -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_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -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~
+	          $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_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6097,17 +6574,17 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    # 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'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$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; func_echo_all "$list"'
 	    ;;
 	  *)
 	    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}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${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'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6117,7 +6594,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	      # 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"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6153,7 +6630,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6174,7 +6651,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6194,14 +6671,14 @@ if test "$_lt_caught_CXX_error" != yes; then
 	    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_cmds, $1)='$CC -shared $pic_flag -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'
+		  $CC -shared $pic_flag -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"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6212,7 +6689,7 @@ if test "$_lt_caught_CXX_error" != yes; then
 	        # 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"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6266,6 +6743,10 @@ if test "$_lt_caught_CXX_error" != yes; then
           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(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6321,6 +6802,7 @@ if test "$_lt_caught_CXX_error" != yes; then
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6335,6 +6817,29 @@ AC_LANG_POP
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf 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).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6343,6 +6848,7 @@ AC_LANG_POP
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6393,6 +6899,13 @@ public class foo {
 };
 _LT_EOF
 ])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6404,7 +6917,7 @@ if AC_TRY_EVAL(ac_compile); then
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -6413,13 +6926,22 @@ if AC_TRY_EVAL(ac_compile); then
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} 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.
@@ -6439,8 +6961,10 @@ if AC_TRY_EVAL(ac_compile); then
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6476,6 +7000,7 @@ else
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6512,7 +7037,7 @@ linux*)
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -6556,32 +7081,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
 ])# _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)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6600,6 +7109,8 @@ _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(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6639,7 +7150,9 @@ if test "$_lt_disable_F77" != yes; then
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6693,38 +7206,24 @@ if test "$_lt_disable_F77" != yes; then
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 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)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6743,6 +7242,8 @@ _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(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6782,7 +7283,9 @@ if test "$_lt_disable_FC" != yes; then
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6838,7 +7341,8 @@ if test "$_lt_disable_FC" != yes; then
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -6875,10 +7379,12 @@ _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -6888,6 +7394,8 @@ _LT_CC_BASENAME([$compiler])
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -6907,7 +7415,8 @@ fi
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
@@ -6942,9 +7451,11 @@ _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -6957,7 +7468,8 @@ fi
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7016,6 +7528,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7109,8 +7630,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7149,208 +7670,162 @@ _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_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-_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
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # 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}"}])
 
-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.
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${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_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
-}
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# 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"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# 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_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
 
-_LT_EOF
-esac
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    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
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
 ])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 34151a3..17cfd51 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 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
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@ case $host in
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index f3c5309..9c7b5d4 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -7,17 +7,17 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3017 ltversion.m4
+# serial 3293 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4'
+macro_revision='1.3293'
 _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
index 637bb20..c573da9 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 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
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@ 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])])
@@ -90,3 +89,10 @@ 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])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 51aca56..2e4aa4c 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="01 May 2011"
+RELEASE_DATE="07 Jun 2012"
 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 7efa3d8..cec6a9a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -117,6 +117,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -193,6 +194,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -213,6 +215,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -236,6 +240,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -282,7 +287,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d25e610..874afd5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -67,6 +67,7 @@ src/cups/genppd.c
 src/escputil/escputil.c
 
 # GIMP sources
+src/gimp2/print-gutenprint.c
 src/gimp2/print-image-gimp.c
 src/gimp2/print.c
 
diff --git a/po/cs.gmo b/po/cs.gmo
index cba5165..ef8e438 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 9f54077..a9be4af 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -139,138 +139,158 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tiskárny:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Typ inkoustu"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Typ inkoustu v tiskárně"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -278,55 +298,55 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 DPI Nejvyšší kvalita"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -334,7 +354,7 @@ msgstr "Upravit vyrovnání modrozelené tisku"
 msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -342,102 +362,82 @@ msgstr "Světle modrozelená"
 msgid "Light Magenta Transition"
 msgstr "Světle fialová"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastní"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "Ru�ní"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standardní"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Obojí"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -486,154 +486,197 @@ msgstr "Obojí"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Černá"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografie"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Ru�ní"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standardní"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -669,7 +712,7 @@ msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -686,11 +729,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -804,8 +847,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -857,178 +900,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -1038,8 +1081,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1091,178 +1134,178 @@ msgstr "Upravit vyrovnání modrozelené tisku"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -1272,8 +1315,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1325,178 +1368,178 @@ msgstr "Upravit vyrovnání fialové tisku"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -1506,18 +1549,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1536,14 +1579,14 @@ msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1557,7 +1600,7 @@ msgstr "Upravit vyrovnání žluté tisku"
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1566,7 +1609,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
@@ -1576,7 +1619,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
@@ -1881,11 +1924,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Typ inkoustu"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1894,14 +1932,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1911,7 +1941,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
@@ -2309,143 +2339,151 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Světle fialová"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Nastavit implicitní"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Model tiskárny:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Normální papír"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2499,104 +2537,104 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
@@ -2915,25 +2953,18 @@ msgstr "Ru�ní bez přestávky"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
@@ -2942,36 +2973,36 @@ msgstr "Matný papír"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
@@ -3004,7 +3035,7 @@ msgstr "Rychleschnoucí foto"
 msgid "Quick-dry Transparency"
 msgstr "Rychleschnoucí fólie"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Ru�ní"
 
@@ -3094,28 +3125,20 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Výška:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografie"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Barevná a �erná cartridge"
@@ -3147,15 +3170,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -3163,7 +3186,7 @@ msgstr "Vlastní"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3172,35 +3195,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3923,123 +3949,123 @@ msgstr "Vytisknout"
 msgid "(Default Printer)"
 msgstr "Nastavit tiskárnu"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Název tiskárny:"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Příkaz:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "Podava� 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "Podava� 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "Podava� 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "Podava� 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Czech"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Velikost média:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Barva"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Odstíny šedi"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Barva"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Barvy CMY"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4312,28 +4338,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nemohu �íst z %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Stav tiskárny vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Nemohu otevřít %s pro �tení i zápis: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Neznámý přepína� %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4342,7 +4368,7 @@ msgstr ""
 "\n"
 "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4353,7 +4379,7 @@ msgstr ""
 "Nemohu detekovat typ tiskárny.\n"
 "Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4395,23 +4421,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4433,84 +4459,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4532,116 +4558,116 @@ msgstr "Světle modrozelená"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4683,338 +4709,338 @@ msgstr "Černá"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papír"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Černá"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Velikost"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Sytost:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Chyba ve vstupu\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Chyba ve vstupu\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Chyba ve vstupu\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Název tiskárny:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Barva inkoustu"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Zbývá procent"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistím hlavy...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spouštím test trysek, přesvěd�te se prosím, že v tiskárně je papír.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5087,7 +5113,7 @@ msgstr ""
 "abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5151,17 +5177,17 @@ msgstr ""
 "Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nemohu odeslat příkaz tiskárně, kon�ím.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5180,13 +5206,13 @@ msgstr ""
 "Pak budete požádáni o potvrzení svého výběru.\n"
 "Co chcete udělat (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5194,7 +5220,7 @@ msgstr ""
 "Potvr�te prosím, že chcete skon�it bez ukládání, opětovným\n"
 "napsáním 'q':\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5203,7 +5229,7 @@ msgstr ""
 "Dobře, vaše tiskárna je zarovnaná, ale zarovnání nebylo uloženo.\n"
 "Pokud chcete zarovnání uložit, musíte tento proces zopakovat.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5212,12 +5238,12 @@ msgstr ""
 "Potvr�te prosím, že chcete zopakovat proces zarovnávání, opětovným\n"
 "napsáním 'r':\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5232,17 +5258,17 @@ msgstr ""
 "Potvr�te prosím, že chcete uložit nastavení do své tiskárny, opětovným\n"
 "napsáním 's':\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Připravuji se uložit nastavení..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "selhalo!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5251,27 +5277,27 @@ msgstr ""
 "Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
 "zarovnávání.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "uspělo!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vaše nastavení zarovnání bylo uloženo do tiskárny.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Poslední příkaz nebyl potvrzen.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5288,12 +5314,12 @@ msgstr ""
 "Pro spuštění procedury zarovnání hlav prosím vložte do své tiskárny\n"
 "list papíru.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Pokra�ujte stisknutím enter > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5303,42 +5329,42 @@ msgstr ""
 "Zkontrolujte prosím výtisk a zvolte nejlepší dvojici �ar v každém vzorku.\n"
 "Napište �íslo dvojice, '?' pro nápovědu nebo 'r' pro zopakování procedury.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Průchod #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vložte prosím nový list papíru.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo mimo rozsah!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nemohu pochopit, co jste napsali!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Nejlepší dvojice �ar by měla mít �íslo mezi 1 a %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokouším se nastavit zarovnání..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspělo.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5351,11 +5377,20 @@ msgstr ""
 "vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
 "zopakovat.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba ve vstupu\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Obrázek>/Soubor/Tisk..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Tisknu..."
@@ -5624,21 +5659,21 @@ msgstr "Tisknu..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5667,7 +5702,7 @@ msgstr "Matný papír"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Pohlednice"
 
@@ -5963,29 +5998,29 @@ msgstr "Extra lesklý fotopapír"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6347,8 +6382,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Å est barev foto"
@@ -6424,8 +6459,8 @@ msgstr "Å est barev foto"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6438,10 +6473,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6584,6 +6619,7 @@ msgstr "600 DPI vysoká kvalita"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6645,6 +6681,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
@@ -6706,6 +6743,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6835,7 +6873,8 @@ msgstr "1200 DPI vysoká kvalita"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6918,6 +6957,7 @@ msgstr "1200 DPI nejvyšší kvalita"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -6955,13 +6995,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
@@ -6984,6 +7025,7 @@ msgstr "Černá/tmavá žlutá"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -7068,8122 +7110,8732 @@ msgstr "Světle fialová"
 msgid "Vivid Magenta"
 msgstr "Fialová"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Podava�"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografie"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Podava�"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Ru�ní"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Ru�ní výběr"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Ru�ní"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapír"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Ru�ní výběr"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Podava� 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Podava� 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Podava� 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Podava� 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Podava� 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Matný papír"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Nastavit implicitní"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 #, fuzzy
 msgid "ArchA transposed"
 msgstr "ArchA pří�ně"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 #, fuzzy
 msgid "ArchB transposed"
 msgstr "ArchB pří�ně"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 #, fuzzy
 msgid "ArchC transposed"
 msgstr "ArchC pří�ně"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 #, fuzzy
 msgid "ArchD transposed"
 msgstr "ArchD pří�ně"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 #, fuzzy
 msgid "ArchE transposed"
 msgstr "ArchE pří�ně"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Americký foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Evropský foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Malá brožura"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Malá brožura Penguin"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Velká brožura Penguin"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Karta Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Karta Oufuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japonská dlouhá obálka #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japonská dlouhá obálka #4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japonská dlouhá obálka #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japonská dlouhá obálka #3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "Pozvánka A2"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Obálka Monarch"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka Monarch"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohlednice"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "Rolovaný papír 89 mm"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "Rolovaný papír 5 palců"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "Rolovaný papír 210 mm"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "Rolovaný papír 22 palce"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "Rolovaný papír 24 palce"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "Rolovaný papír 44 palce"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavit tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C50"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C50"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Ru�ní"
 
@@ -15797,9 +16449,6 @@ msgstr ""
 #~ msgid "Printer does not support listing ink types!\n"
 #~ msgstr "Tiskárna nepodporuje barevný výstup\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Obrázek>/Soubor/Tisk..."
-
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
 #~ msgstr "ijs_server_get_page_header selhalo %d\n"
diff --git a/po/da.gmo b/po/da.gmo
index b72652e..e579ead 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index f1b0560..ca449a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2011-03-13 10:57+0100\n"
 "Last-Translator: Mogens Jaeger <mogensjaeger@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Standard"
 
@@ -146,284 +146,284 @@ msgstr "Farveomsætningsmodul"
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Papirstørrelse"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Cd center størrelse"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Print kun udenfor centeret af cd'en, eller helt ind til hullet"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "Cd størrelse (egendefineret)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Variabel justering af udvendig diameter på cd"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "Cd center størrelse (egendefineret)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Variabel justering af centeret på cd'en"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Cd vandret finjustering"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Finjustering i vandret plan til printning på cd"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "Cd lodret finjustering"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Opløsning og kvalitet af udskriften"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blæktype"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Blæktype i printeren"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Blækkanaler"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Blæk sæt"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Blæktype i printeren"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Med/uden margin"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Print uden margin"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Tosidet printning"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble indstilling"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Udskriftskvalitet"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Justér tæthed for sort"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Afbrudt"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "Cd - egendefineret"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Manuel kontrol"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Begge"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -472,154 +472,195 @@ msgstr "Begge"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Sort"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Ingen"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Manuel kontrol"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Høj præcision"
@@ -653,7 +694,7 @@ msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -669,11 +710,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -775,8 +816,8 @@ msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -828,178 +869,178 @@ msgstr "Gammaværdi som formodet af program"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1008,8 +1049,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for cyan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1061,178 +1102,178 @@ msgstr "Justér gamma for cyan"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1241,8 +1282,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1294,178 +1335,178 @@ msgstr "Justér gamma for magenta"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Gul"
 
@@ -1474,18 +1515,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Rød"
 
@@ -1502,14 +1543,14 @@ msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Blå"
 
@@ -1521,7 +1562,7 @@ msgstr "Justér gamma for blå"
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
@@ -1529,7 +1570,7 @@ msgstr "Cyan balance"
 msgid "Adjust the cyan gray balance"
 msgstr "Justér cyans gråbalance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
@@ -1537,7 +1578,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
@@ -1821,10 +1862,6 @@ msgstr "Forbedret glans"
 msgid "Add gloss enhancement"
 msgstr "Tilføj glansforbedring"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Blæk sæt"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Printretning"
@@ -1833,14 +1870,6 @@ msgstr "Printretning"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Med/uden margin"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Print uden margin"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Udjævningsmetode"
@@ -1850,7 +1879,7 @@ msgid "Interleave pattern to use"
 msgstr "Udjævningsmønster der skal bruges"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Udskriftsrækkefølge"
 
@@ -2186,136 +2215,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Hextonegrå 1 (lyseste) tæthedsskala"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Tørretid pr. side"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Sæt tørretid pr. side"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Tørretid pr. skan"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Sæt tørretid pr. skan"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimum tørretid pr. skan"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Sæt minimum tørretid pr. skan"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Kvalitetsforbedring"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Øg udskriftskvalitet ved yderligere gennemløb"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Papirtykkelse"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Sæt printerens papirtykkelse"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Vakuumintensitet"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Sæt vakuumintensitet (printerspecifikt)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Fødningsrækkefølge"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Sæt papirfødningsrækkefølge (printerspecifikt)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Printmetode"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Sæt printmetode (printer specifikt)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Valse afstand"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Sæt valse afstand (printerspecifikt)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Fødningsjustering"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Sæt papirfødningsjustering (0.01% units)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -2369,104 +2406,104 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
@@ -2785,24 +2822,17 @@ msgstr "Manuel fødning uden pause"
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Ingen"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Glittet"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Mat"
 
@@ -2810,32 +2840,32 @@ msgstr "Mat"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Udskrifts niveaujustering"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
@@ -2867,7 +2897,7 @@ msgstr "Hurtigttørrende foto"
 msgid "Quick-dry Transparency"
 msgstr "Hurtigttørrende klar film"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -2956,26 +2986,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Kladde"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Høj"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Foto"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Farve + sort patroner"
@@ -3004,15 +3027,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:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Egendefineret"
 
@@ -3020,7 +3043,7 @@ msgstr "Egendefineret"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Billedets størrelse skal passe til papirets størrelse"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Fatal fejl!"
 
@@ -3030,33 +3053,36 @@ msgid ""
 msgstr ""
 "Rapportér ovenstående information til gimp-print-devel@lists.sourceforge.net"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Hurtig økonomisk"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Økonomisk"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super foto"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Bedst"
 
@@ -3742,113 +3768,113 @@ msgstr "Printer"
 msgid "(Default Printer)"
 msgstr "(Standard printer)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Printer egenskaber"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Udskriftskontrol"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Almindelig"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Ekstra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Danish"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Mediestørrelse"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Farvemodel"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Inverteret gråtoneskala"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB farver"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY farver"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Farvepræcision"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Værdi"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Omvendt"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "2-sidet udskrivning"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Formindsk side så den passer til kanter"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Formindsk (udskriv hele siden)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Beskær (bevar format)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Udvid (brug hele arket)"
 
@@ -4134,28 +4160,28 @@ msgstr "Læsning fra printer overskred tidsgrænsen\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke læse fra %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Angiv en ufiltreret enhed\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åbne %s læse/skrive: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Ukendt printer %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4164,7 +4190,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4175,7 +4201,7 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4217,22 +4243,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Foto sort"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4254,83 +4280,83 @@ msgstr "Ukendt"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4352,114 +4378,114 @@ msgstr "Lys cyan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4501,154 +4527,154 @@ msgstr "Lys sort"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Mat sort"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Lys lys-sort"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Orange"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fejl\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Selv-printning\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Optaget\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Venter\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Ledig\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Sat til pause\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status; Renser\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Fabriksindstillet\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Lukker ned\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fejl: Fatal fejl\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Fejl: Anden tilslutning valgt\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Fejl: Låg åbent\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Fejl: Papir problemer\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fejl: Blæk slut\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fejl: Papir slut\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Fejl: Diverse papirfejl\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Fejl: Overløb vedligeholdelsespatron\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Fejl: Afvent returnering fra afrivningsposition\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Fejl: Dobbeltfødningsfejl\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4657,181 +4683,181 @@ msgstr ""
 "Fejl: Blækpatron-udløserarm aktiveret\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Fejl: Uoprettelig papirskærerfejl\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Fejl: Genoprettelig papirskærerproblem\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Fejl: Ingen vedligeholdelsespatron fundet\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Fejl: Bagsidelåg åben\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Fejl: cd-skuffe tom\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fejl: Kortlæsningsfejl\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Fejl: Skuffelåg åben\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Fejl: Vedligeholdelsespatronlåg åben\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Fejl: Frontlåg åben\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Fejl: Vedligeholdelses anmodning\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fejl: Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Advarsel: %s blækniveau lavt\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Advarsel: Kanal %d blækniveau lavt\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Advarsel: %s rensning fravalgt\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Advarsel: Kanal %d rensning\n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Advarsel: Vedligeholdelsespatron næsten fuld\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Advarsel: Vedligeholdelse anmodning pågår\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Advarsel: Ukendt (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Printer dyse selv-test\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Printernavn: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Blækniveauer:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Blæk farve"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Procent tilbage"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Job-navn: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "blækniveauer"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Blækpatron"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Del nummer"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Dato"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan ikke identificere printermodel.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoveder...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4909,7 +4935,7 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4982,17 +5008,17 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Ikke i stand til at sende kommando til printeren, afbryder.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Afbryder\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5011,19 +5037,19 @@ msgstr ""
 "Du vil så blive bedt om at bekræfte dit valg.\n"
 "Hvad vil du gøre (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5032,19 +5058,19 @@ msgstr ""
 "O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
 "Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gentager processen med at retten-ind.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5059,17 +5085,17 @@ msgstr ""
 "Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
 "printer:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Klar til at gemme indstillingerne..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "mislykkedes!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5078,27 +5104,27 @@ msgstr ""
 "Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
 "processen.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "lykkedes!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dine retten-ind indstillinger er blevet gemt i printeren.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen blev ikke genkendt.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Afsluttende kommando blev ikke bekræftet.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5115,12 +5141,12 @@ msgstr ""
 "Placer et ark papir i printeren, og begynd retten-ind\n"
 "processen af print hovedet.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Tryk på enter-tasten for at fortsætte > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5130,42 +5156,42 @@ msgstr ""
 "Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
 "Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Gennemløb #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Indsæt et nyt ark papir.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Antal uden for givet område!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jeg kan ikke tolke hvad du tastede!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver at sætte retten-ind..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "lykkedes.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5179,11 +5205,20 @@ msgstr ""
 "Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
 "bedste kvalitet i printning.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Fejl i inddata\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Print uden margin"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Udskriver..."
@@ -5452,21 +5487,21 @@ msgstr "Udskriver..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
@@ -5494,7 +5529,7 @@ msgstr "Lyst hvidt papir"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postkort"
 
@@ -5780,29 +5815,29 @@ msgstr "Førsteklasses blankt fotopapir 250 gram"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6162,8 +6197,8 @@ msgstr "Vandfarvepapir - strålende hvidt"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
@@ -6238,8 +6273,8 @@ msgstr "UltraChrome foto sort"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
@@ -6252,10 +6287,10 @@ msgstr "UltraChrome mat sort"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr "Hextone"
 
@@ -6396,6 +6431,7 @@ msgstr "360 DPI høj kvalitet"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6456,6 +6492,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6516,6 +6553,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6641,7 +6679,8 @@ msgstr "720 DPI høj kvalitet"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6719,6 +6758,7 @@ msgstr "2880 x 720 DPI højeste kvalitet"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6755,12 +6795,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Mørk gul"
 
@@ -6782,6 +6823,7 @@ msgstr "Mørk gul"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6855,7631 +6897,8282 @@ msgstr "Livlig lys magenta"
 msgid "Vivid Magenta"
 msgstr "Livlig magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Hovedbakke"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Fotobakke"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Udskriv på cd"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Bagerste bakke"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Frontbakke"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Manuel fødning"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rulle fødning"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Manuel ark guide"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Manuel fødning (front)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Rullefødning (uden margin med enkelt skæring)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Rullefødning (uden margin med dobbelt skæring)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Foto plade"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Tilskårne ark, bakke 1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Tilskårne ark, bakke 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Manuel udvælgelse"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "Grå 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "Grå 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "Grå 1"
 
 # MIS - fermstiller af farvepatroner.
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr "MIS Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr "MIS Sixtone"
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "Grå 5"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "Grå 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "Matsort"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Standard sort"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Otte farver foto"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Otte farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Fire farver foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Udjævning"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Fire gennemløb"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Udjævning 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Otte gennemløb"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Tændt"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 msgid "L"
 msgstr "L"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr "KG"
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapir (riv-af kanter)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson L fotopapir (riv-af kanter)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 msgid "4x8"
 msgstr "4x8"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr "2L"
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr "Rokukire"
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr "YonKire"
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr "HanKire"
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL tværformat"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
 msgstr "EA5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
 msgstr "EA5 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA vendt"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB vendt"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC vendt"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD vendt"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE vendt"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japanese lang kuvert #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese lang kuvert #3 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japanese lang kuvert #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese lang kuvert #4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japanese lang kuvert #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japanese lang kuvert #4 tværformat"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japanese lang kuvert #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japanese lang kuvert #3 tværformat"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku kuvert #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese Kaku kuvert #4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 tværformat"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarch kuvert"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Monarch kuvert tværformat"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr "Wide 101.6x180.6"
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Card"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 msgid "A3+"
 msgstr "A3+"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210mm rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "Postscript Level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "Postscript Level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
-msgstr "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S830D"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S900"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S9000"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1500"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP1900"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr "Canon PIXMA iP1900"
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6866
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2200"
-msgstr "Canon PIXMA iP2000"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP2700"
-
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4700"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP250"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP270"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP280"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP370"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP390"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP450"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP460"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP480"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP510"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP540"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP550"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP960"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP970"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MG5100"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MG5200"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MG6100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MG8100"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MX330"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MX350"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MX700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MX860"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MX870"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MX7600"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 50"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 710"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 810"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Epson B-310"
 msgstr "Epson B-310"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Epson B-310N"
 msgstr "Epson B-310N"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Epson B-510DN"
 msgstr "Epson B-510DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B1100"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T1100"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T1110"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290s"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo P50"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R3000"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX710W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX810FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 3800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 3880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 3885"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 4000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 4800/4880 bagudkompatibel"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 4800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 4880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7700"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7890"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9700"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9890"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11800/11880 bagudkompatibel"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11800"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX115"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX215"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX415"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX515"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo PX650"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo PX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo PX710W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo PX810FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S21"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus S50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX110"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX115"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX210"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX215"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX410"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX415"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX510W"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX615"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus SX650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T21"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T26"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T30"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus T40W"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus T59"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus T60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX110"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX210"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus TX300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX410"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX510FN"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus TX550W"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX610FW"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX659"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 310"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 315"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 610"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 615"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 1100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
 msgstr "Epson EP 302"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
 msgstr "Epson EP 702A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
 msgstr "Epson ME 320"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 600F"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 620F"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 1100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
 msgstr "Epson PX 1001"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr "Brother HL-2030"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr "Brother HL-2035"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-3360"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
 msgstr "Epson AL-C2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AL-C2000 PS3"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
 msgstr "Epson AL-C8500"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
 msgstr "Epson AL-C8500PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
 msgstr "Epson AL-C8600"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson AL-C8600 PS3"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900 PS3"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100 PS3"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500 PS3"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr "Kyocera CS-1815"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-920"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1018MFP"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-1020D"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-1030D"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1118MFP"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1714M"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1920"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-2000D"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-3718M"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3820N"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3830N"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-3900DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-4000DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-6020"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-6026"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-6300"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-6750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-6900"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-6950DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-7028M"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9130DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9530DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1510"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1815"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1820"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3050"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4050"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-4230/5230"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5050"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-6030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-8030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr "Oki B4350"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr "Tektronix Phaser 750DP"
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr "Tektronix Phaser 750DX"
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr "Tektronix Phaser 750N"
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr "Tektronix Phaser 750P"
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr "Xerox Phaser 2135"
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Phaser 4400B"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr "Xerox Phaser 4400DT"
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr "Xerox Phaser 4400DX"
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Phaser 4400N"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox Phaser 4500B"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox Phaser 4500DT"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox Phaser 4500DX"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox Phaser 4500N"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox Phaser 4510B"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox Phaser 4510DT"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox Phaser 4510DX"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox Phaser 4510N"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr "Xerox Phaser 5500B"
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr "Xerox Phaser 5500DN"
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr "Xerox Phaser 5500DT"
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr "Xerox Phaser 5500DX"
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr "Xerox Phaser 5500N"
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Phaser 6130N"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr "Xerox Phaser 6180DN"
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr "Xerox Phaser 6180MFP-D"
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr "Xerox Phaser 6200B"
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr "Xerox Phaser 6200DP"
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr "Xerox Phaser 6200DX"
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr "Xerox Phaser 6200N"
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr "Xerox Phaser 6250B"
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr "Xerox Phaser 6250DP"
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr "Xerox Phaser 6250DT"
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr "Xerox Phaser 6250DX"
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr "Xerox Phaser 6250N"
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr "Xerox Phaser 6300DN"
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr "Xerox Phaser 6300N"
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr "Xerox Phaser 6350DP"
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr "Xerox Phaser 6350DT"
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr "Xerox Phaser 6350DX"
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr "Xerox Phaser 6360DN"
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr "Xerox Phaser 6360DX"
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr "Xerox Phaser 7300B"
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr "Xerox Phaser 7300DN"
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr "Xerox Phaser 7300DT"
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr "Xerox Phaser 7300DX"
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr "Xerox Phaser 7300N"
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr "Xerox Phaser 7400DN"
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr "Xerox Phaser 7400DT"
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr "Xerox Phaser 7400DX"
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr "Xerox Phaser 7400DXF"
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Phaser 7400N"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr "Xerox Phaser 7700DN"
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr "Xerox Phaser 7700DX"
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr "Xerox Phaser 7700GX"
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr "Xerox Phaser 7750B"
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr "Xerox Phaser 7750DN"
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr "Xerox Phaser 7750DXF"
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr "Xerox Phaser 7750GX"
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr "Xerox Phaser 7760DN"
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr "Xerox Phaser 7760DX"
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr "Xerox Phaser 7760GX"
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Phaser 8400B"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr "Xerox Phaser 8400BD"
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr "Xerox Phaser 8400DP"
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr "Xerox Phaser 8400DX"
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Phaser 8400N"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr "Xerox Phaser 8500DN"
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr "Xerox Phaser 8500N"
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr "Xerox Phaser 8550DP"
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr "Xerox Phaser 8550DT"
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr "Xerox Phaser 8550DX"
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr "Xerox Phaser 8560DN"
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre 7345"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-530"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-800"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak EasyShare-G600-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr "Kodak PD-4000"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr "Kodak PD-6000"
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Photo-Printer"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Photo-Printer-500"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Printer-Dock-Plus"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Printer-Dock-Plus-S3"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
+#, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP1900"
+
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
 #~ msgid "Screening Adjustment"
 #~ msgstr "Visningsjustering"
 
diff --git a/po/de.gmo b/po/de.gmo
index ec639ed..c6cee5b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index c0f8489..7a41e9b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2009-11-08 22:50+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Standard"
 
@@ -141,137 +141,157 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Rasteralgorithmus"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Seitengröße"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Medienart"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Medienquelle"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "in welchem Schacht ist das Druckmedium"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintenart"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Druckermodel:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Tintentype"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tintenart im Drucker"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -279,55 +299,55 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 DPI höchste Qualität"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -335,7 +355,7 @@ msgstr "Stellen sie die Cyan-Balance ein"
 msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -343,102 +363,82 @@ msgstr "helles Cyan"
 msgid "Light Magenta Transition"
 msgstr "helles Magenta"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Auto"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "Ausgabeart:"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Beides"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -487,154 +487,197 @@ msgstr "Beides"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Schwarz"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Ausgabeart:"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -670,7 +713,7 @@ msgid "Pre-Dithered"
 msgstr "Drucken"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -687,11 +730,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -805,8 +848,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -858,178 +901,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1039,8 +1082,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1092,178 +1135,178 @@ msgstr "Stellen sie die Cyan-Balance ein"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1273,8 +1316,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1326,178 +1369,178 @@ msgstr "Stellen sie die Magenta-Balance ein"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -1507,18 +1550,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1537,14 +1580,14 @@ msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1558,7 +1601,7 @@ msgstr "Stellen sie die Cyan-Balance ein"
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1567,7 +1610,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1577,7 +1620,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
@@ -1883,11 +1926,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Tintentype"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1896,14 +1934,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1913,7 +1943,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Ausgabeart:"
@@ -2298,143 +2328,151 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr ""
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Qualitätsverbesserung"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Druckqualität durch mehrere Durchläufe verbessern"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Dicke des Druckerpapiers festlegen"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Ansaugstärke"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Ansaugstärke festlegen (druckerabhängig)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Einzugsreihenfolge"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Einzugsreihenfolge festlegen (druckerabhängig)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Druckermodel:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Druckmethode festlegen (druckerabhängig)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Normalpapier"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Tiegelabstand festlegen (druckerabhängig)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Einzugskorrektur"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Steuerung der automatischen Einstellungen"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Alternierende Füllung"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Ansteigende Füllung"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Absteigende Füllung"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Kurze Kante (Umklappen)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -2488,104 +2526,104 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
@@ -2904,25 +2942,18 @@ msgstr "Handeinzug ohne Pause"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
@@ -2931,36 +2962,36 @@ msgstr "Mattes Papier"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
@@ -2993,7 +3024,7 @@ msgstr "Schnelltrocknendes Glanzpapier"
 msgid "Quick-dry Transparency"
 msgstr "Schnelltrocknende Folie"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuell"
 
@@ -3083,28 +3114,20 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Höhe:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Foto"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Farbige + schwarze Patronen"
@@ -3136,15 +3159,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 #, fuzzy
 msgid "Custom"
 msgstr "Auto"
@@ -3153,7 +3176,7 @@ msgstr "Auto"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3162,35 +3185,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Sieben Farb Foto"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Beste"
 
@@ -3910,113 +3936,113 @@ msgstr "Drucker"
 msgid "(Default Printer)"
 msgstr "(Standarddrucker)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Druckerfeatures"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Ausgabesteuerung"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "German"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Mediengröße"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Farbmodell"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Invertierte Graustufen"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB-Farbe"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY-Farbe"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Nein"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Wert"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Feineinstellung"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4216,28 +4242,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kann nicht von %s lesen: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Bitte geben Sie ein \"rohes\" Gerät an\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kann %s nicht lesen/beschreiben: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Unbekannter Drucker %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kann nicht auf %s schreiben: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4246,7 +4272,7 @@ msgstr ""
 "\n"
 "Kann auf %s nicht schreiben: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4257,7 +4283,7 @@ msgstr ""
 "Kann den Druckertyp nicht feststellen.\n"
 "Bitte nutzen sie die Option -m, um das Modell mitzuteilen.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4299,22 +4325,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Foto-Schwarz"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4336,83 +4362,83 @@ msgstr "Unbekannt"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Hellcyan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4434,114 +4460,114 @@ msgstr "Hellcyan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Hellmagenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Hellschwarz"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4583,337 +4609,337 @@ msgstr "Hellschwarz"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Mattes Schwarz"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Hellhellschwarz"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Orange"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fehler\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Selbstdruckend\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Beschäftigt\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Wartend\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Leerlauf\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Pausiert\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Reinigend\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Werksauslieferung\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Herunterfahren\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Unbekannt (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fehler: Fataler Fehler\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Fehler: Papierstau\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fehler: Tinte alle\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fehler: Papier alle\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Fehler: Sonstiger Papierfehler\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Fehler: Doppeleinzugsfehler\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fehler: Unbekannt (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Warnung %s Tinte fast alle\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Warnung Kanal %d wird gereinigt \n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Warnung: Unbekannt (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Druckername: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Farbtinte"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Prozent verbleibend"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Auftragsname: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "Tintenfüllstände"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "Status"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Tintenpatrone"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Bauteilnummer"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Reinige die Druckköpfe...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Teste die Druckköpfe. Bitte stellen Sie sicher, dass Papier im Drucker ist.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4991,7 +5017,7 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5057,17 +5083,17 @@ msgstr ""
 "Ausrichtung nicht auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Beenden\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5086,13 +5112,13 @@ msgstr ""
 "Sie werden dann um eine Bestätigung gebeten.\n"
 "Was möchten sie tun (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5100,7 +5126,7 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'q', dass sie die Einstellungen wirklich "
 "nicht sichern möchten:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5111,7 +5137,7 @@ msgstr ""
 "Wenn sie die Ausrichtung speichern möchten, müssen sie diesen Ablauf "
 "wiederholen.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5120,12 +5146,12 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'r', dass sie die Kopf-Ausrichtung\n"
 "wiederholen möchten:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5140,17 +5166,17 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
 "Drucker sichern möchten.\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Speichere die Einstellungen sichert..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "gescheitert!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5159,27 +5185,27 @@ msgstr ""
 "Die Sicherung ihrer Einstellungen scheiterte. Sie müssen\n"
 "die Kopf-Ausrichtung wiederholen. \n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "fertig!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5195,12 +5221,12 @@ msgstr ""
 "\n"
 "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Drücken sie Eingabe um fortzufahren > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5212,42 +5238,42 @@ msgstr ""
 "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Durchgang #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Bitte legen sie ein neues Blatt ein.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Die Zahl ist ungültig!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Wie bitte???\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Die Nummer des besten Paares sollte zwischen 1 und %d liegen.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Beginne die Köpfe einzurichten..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "fertig.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5261,11 +5287,20 @@ msgstr ""
 "jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Eingabefehler\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Datei/Drucken..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Drucken..."
@@ -5534,21 +5569,21 @@ msgstr "Drucken..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "EPSON Standard-Tinten"
 
@@ -5577,7 +5612,7 @@ msgstr "Mattes Papier"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postkarte"
 
@@ -5874,29 +5909,29 @@ msgstr "Premium Glanz Foto Papier"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6258,8 +6293,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
@@ -6335,8 +6370,8 @@ msgstr "Sechs Farben Foto"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6349,10 +6384,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6495,6 +6530,7 @@ msgstr "600 DPI hohe Qualität"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6556,6 +6592,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
@@ -6617,6 +6654,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6746,7 +6784,8 @@ msgstr "1200 DPI hohe Qualität"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6829,6 +6868,7 @@ msgstr "1200 DPI höchste Qualität"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -6866,13 +6906,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
@@ -6895,6 +6936,7 @@ msgstr "Gelb"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -6979,7855 +7021,8505 @@ msgstr "helles Magenta"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Schacht"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Foto"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Schacht"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Einfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Vierfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Schacht 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Schacht 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Schacht 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Schacht 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Schacht 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Mattes Papier"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Zurücksetzen"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Zweistufig Grau"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Zweifarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Sieben Farb Foto"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL Querformat"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "C5 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Amerikanische Narrenmütze"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Europäische Narrenmütze"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm × 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japanischer langer Umschlag #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanischer langer Umschlag #3 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japanischer langer Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanischer langer Umschlag #4 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japanischer langer Umschlag #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japanischer langer Umschlag #4 Querformat"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japanischer langer Umschlag #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japanischer langer Umschlag #3 Querformat"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanischer Kaku-Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanischer Kaku-Umschlag #4 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 Querformat"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Briefumschlag (Monarch, Querformat)"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4×7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Breite Postkarte"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Allgemeiner PCL-4-Drucker"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Allgemeiner PCL-5-Drucker"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Allgemeiner PCL-5c-Drucker"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Allgemeiner PCL-5e-Drucker"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Allgemeiner PCL-5e-LF-Drucker"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 #, fuzzy
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 #, fuzzy
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 #, fuzzy
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "ROHDATEN 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "ROHDATEN 8 bit"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Ausgabeart:"
 
@@ -15100,9 +15792,6 @@ msgstr "ROHDATEN 8 bit"
 #~ msgid "Printer does not support listing ink types!\n"
 #~ msgstr "Drucker unterstützt keine Farbausgabe\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Datei/Drucken..."
-
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
 #~ msgstr "schlechter Farbraum:  bps %d Kanäle %d Abstand %s\n"
diff --git a/po/el.gmo b/po/el.gmo
index dfd5c98..7017a53 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 160e31c..c39e63b 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -140,196 +140,216 @@ msgid "Dither algorithm"
 msgstr ""
 
 #
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 #, fuzzy
 msgid "Media Type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 #, fuzzy
 msgid "Media Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 #, fuzzy
 msgid "Type of ink in the printer"
 msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Ôýðïò MIME"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "ìþâ"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -337,7 +357,7 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 msgid "Light Cyan Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -345,105 +365,85 @@ msgstr "ØéëÞ Âñï÷Þ"
 msgid "Light Magenta Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
 #
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "Byte Åîüäïõ"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Êáíïíéêü"
-
 #
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Êáé ôá äýï"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -492,154 +492,197 @@ msgstr "Êáé ôá äýï"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Ìáýñï"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Êñõðôïãñáößá"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Byte Åîüäïõ"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Êáíïíéêü"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -676,7 +719,7 @@ msgid "Pre-Dithered"
 msgstr "Åêôýðùóç"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
@@ -693,11 +736,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -810,8 +853,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -863,178 +906,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Êõáíü"
 
@@ -1044,8 +1087,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1097,178 +1140,178 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
@@ -1279,8 +1322,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1332,178 +1375,178 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
@@ -1513,18 +1556,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1543,14 +1586,14 @@ msgid "Adjust the green gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1564,7 +1607,7 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 msgid "Adjust the black gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1573,7 +1616,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "ìþâ"
@@ -1583,7 +1626,7 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -1886,11 +1929,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Ôýðïò MIME"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1899,14 +1937,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1916,7 +1946,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Byte Åîüäïõ"
@@ -2315,147 +2345,155 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
 #
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
 #
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2510,104 +2548,104 @@ msgid "test print"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2934,24 +2972,17 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "×áñôß Ìáíßëá"
@@ -2960,36 +2991,36 @@ msgstr "×áñôß Ìáíßëá"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -3029,7 +3060,7 @@ msgid "Quick-dry Transparency"
 msgstr "ÄéáöÜíåéá ×ñïéÜò"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Åã÷åéñßäéï"
 
@@ -3129,28 +3160,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "¾øïò:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Êñõðôïãñáößá"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -3184,17 +3207,17 @@ msgid "None; please provide a PPD file"
 msgstr ""
 
 #
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "ÄéáóôÜóåéò Letter"
 
 #
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "ÄéáóôÜóåéò Á4"
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
@@ -3202,7 +3225,7 @@ msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3211,35 +3234,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Slashdot"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Slashdot"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3998,128 +4024,128 @@ msgstr "Åêôýðùóç"
 msgid "(Default Printer)"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "ÅíôïëÞ:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Greek"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "ÌÝãåèïò ×:"
 
 #
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "×ñþìá"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
 #
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "×ñþìá"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 #, fuzzy
 msgid "CMY Color"
 msgstr "+ ×ñþìá"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4302,35 +4328,35 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "¶ãíùóôïò êùäéêüò op %u"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4338,7 +4364,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4380,23 +4406,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4418,84 +4444,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4517,116 +4543,116 @@ msgstr "ØéëÞ Âñï÷Þ"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4668,341 +4694,341 @@ msgstr "Ìáýñï"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Ìáýñï"
 
 #
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "ÌÝãåèïò"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Êïñåóìüò:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 #, fuzzy
 msgid "Ink color"
 msgstr " ÷ñþìá"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 #, fuzzy
 msgid "Percent remaining"
 msgstr "Åðß ôïéò åêáôü åëåýèåñï"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
 msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5041,7 +5067,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5077,17 +5103,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5099,38 +5125,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, fuzzy, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5140,44 +5166,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, fuzzy, c-format
 msgid "Unrecognized command.\n"
 msgstr "Üãíùóôï ÷ñþìá: %s"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5188,13 +5214,13 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 #, fuzzy
 msgid "Press enter to continue > "
 msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5202,43 +5228,43 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, fuzzy, c-format
 msgid "Number out of range!\n"
 msgstr "Áñéèìüò Óåëßäùí"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5247,11 +5273,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, fuzzy, c-format
 msgid "Error in input\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Ößëôñá/Êåßìåíï/FreeType..."
+
 #: src/gimp2/print-image-gimp.c:225
 #, fuzzy
 msgid "Printing..."
@@ -5521,21 +5556,21 @@ msgstr "Åêôõðþíåôáé .."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5564,7 +5599,7 @@ msgstr "×áñôß Ìáíßëá"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
@@ -5855,29 +5890,29 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6239,8 +6274,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
@@ -6316,8 +6351,8 @@ msgstr "Slashdot"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6330,10 +6365,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6475,6 +6510,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6536,6 +6572,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
@@ -6597,6 +6634,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6725,7 +6763,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6805,6 +6844,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -6842,13 +6882,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Êßôñéíï"
@@ -6871,6 +6912,7 @@ msgstr "Êßôñéíï"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -6955,8156 +6997,8762 @@ msgstr "ØéëÞ Âñï÷Þ"
 msgid "Vivid Magenta"
 msgstr "ìþâ"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Êñõðôïãñáößá"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Åã÷åéñßäéï"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ñüëïò"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Åã÷åéñßäéï"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Åã÷åéñßäéï"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Åñãáóßá"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "ÄéáóôÜóåéò Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 #, fuzzy
 msgid "Tabloid"
 msgstr "Ðßíáêáò"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Executive"
 msgstr "ÅêôÝëåóç"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "Ôåêìçñßùóç"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
 #
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 #, fuzzy
 msgid "RA0"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 #, fuzzy
 msgid "RA1"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 #, fuzzy
 msgid "RA2"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 #, fuzzy
 msgid "RA3"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 #, fuzzy
 msgid "RA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
 #
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 #, fuzzy
 msgid "SRA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 #, fuzzy
 msgid "DL"
 msgstr "Ôåêìçñßùóç"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 #, fuzzy
 msgid "ArchA"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 #, fuzzy
 msgid "ArchB"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 #, fuzzy
 msgid "ArchC"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 #, fuzzy
 msgid "ArchD"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 #, fuzzy
 msgid "ArchE"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 #, fuzzy
 msgid "American foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 #, fuzzy
 msgid "European foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 #, fuzzy
 msgid "Small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 #, fuzzy
 msgid "Hagaki Card"
 msgstr "ÁíáæÞôçóç êáñôÝëáò"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 #, fuzzy
 msgid "A2 Invitation"
 msgstr "Êéíïýìåíá ó÷Ýäéá"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Byte Åîüäïõ"
 
@@ -15654,10 +16302,6 @@ msgstr ""
 #~ msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
 
 #, fuzzy
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Ößëôñá/Êåßìåíï/FreeType..."
-
-#, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index b688438..980236f 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 137e501..0c062f9 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Default"
 
@@ -139,284 +139,284 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Page Size"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Media Type"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Media Source"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "CD Hub Size"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Print only outside of the hub of the CD, or all the way to the hole"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "CD Size (Custom)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Variable adjustment for the outer diameter of CD"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "CD Hub Size (Custom)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Variable adjustment to the inner hub of the CD"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "CD Horizontal Fine Adjustment"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Fine adjustment to horizontal position for CD printing"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "CD Vertical Fine Adjustment"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Resolution"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type of ink in the printer"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Ink Set"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Type of ink in the printer"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Borderless"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Print without borders"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Double-Sided Printing"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Tumble Setting"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Print Quality"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Cyan Density"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan density"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Magenta Density"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta density"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Yellow Density"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow density"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Black Density"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Adjust the black density"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Light Magenta Transition"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Off"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - Custom"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Manual Control"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Both"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -465,154 +465,195 @@ msgstr "Both"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Black"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "None"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Manual Control"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "High Accuracy"
@@ -646,7 +687,7 @@ msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -662,11 +703,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -768,8 +809,8 @@ msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -821,178 +862,178 @@ msgstr "Gamma value assumed by application"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1001,8 +1042,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1054,178 +1095,178 @@ msgstr "Adjust the cyan gamma"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1234,8 +1275,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1287,178 +1328,178 @@ msgstr "Adjust the magenta gamma"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -1467,18 +1508,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Red"
 
@@ -1495,14 +1536,14 @@ msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Blue"
 
@@ -1514,7 +1555,7 @@ msgstr "Adjust the blue gamma"
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
@@ -1522,7 +1563,7 @@ msgstr "Cyan Balance"
 msgid "Adjust the cyan gray balance"
 msgstr "Adjust the cyan gray balance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
@@ -1530,7 +1571,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
@@ -1814,10 +1855,6 @@ msgstr "Enhanced Gloss"
 msgid "Add gloss enhancement"
 msgstr "Add gloss enhancement"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Ink Set"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Printing Direction"
@@ -1826,14 +1863,6 @@ msgstr "Printing Direction"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Borderless"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Print without borders"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Interleave Method"
@@ -1843,7 +1872,7 @@ msgid "Interleave pattern to use"
 msgstr "Interleave pattern to use"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Output Order"
 
@@ -2198,137 +2227,145 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Light Magenta Density Scale"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Drying Time Per Page"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Set drying time per page"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Drying Time Per Scan"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Set drying time per scan"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimum Drying Time Per Scan"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Set minimum drying time per scan"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 #, fuzzy
 msgid "Quality Enhancement"
 msgstr "Add gloss enhancement"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Paper Thickness"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Set printer paper thickness"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Vacuum Intensity"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Set vacuum intensity (printer-specific)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Feed Sequence"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Set paper feed sequence (printer-specific)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Print Method"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Set print method (printer-specific)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Platen Gap"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Set platen gap (printer-specific)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Feed Adjustment"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Set paper feed adjustment (0.01% units)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Short Edge(Flip)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -2382,104 +2419,104 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
@@ -2798,24 +2835,17 @@ msgstr "Manual without Pause"
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "None"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Glossy"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Matte"
 
@@ -2823,32 +2853,32 @@ msgstr "Matte"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Laminate Pattern"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Output Level Adjustment"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
@@ -2880,7 +2910,7 @@ msgstr "Quick-dry Photo"
 msgid "Quick-dry Transparency"
 msgstr "Quick-dry Transparency"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manual"
 
@@ -2970,26 +3000,19 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Draft"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "High"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Photo"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Colour + Black Cartridges"
@@ -3018,15 +3041,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:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Custom"
 
@@ -3034,7 +3057,7 @@ msgstr "Custom"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 #, fuzzy
 msgid "Fatal error!"
 msgstr "Error: Fatal Error\n"
@@ -3044,33 +3067,36 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Fast Economy"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Economy"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Best"
 
@@ -3757,113 +3783,113 @@ msgstr "Printer"
 msgid "(Default Printer)"
 msgstr "(Default Printer)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Printer Features"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Output Control"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Common"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "English-GB"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Media Size"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Colour Model"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Inverted Grayscale"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB Colour"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY Colour"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Colour Precision"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Value"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Reverse"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "2-Sided Printing"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Shrink Page If Necessary to Fit Borders"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Shrink (print the whole page)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Crop (preserve dimensions)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Expand (use maximum page area)"
 
@@ -4142,28 +4168,28 @@ msgstr "Read from printer timed out\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Cannot read from %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Please specify a raw device\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Cannot open %s read/write: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Unknown printer %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4172,7 +4198,7 @@ msgstr ""
 "\n"
 "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4183,7 +4209,7 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4225,22 +4251,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Photo Black"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4262,83 +4288,83 @@ msgstr "Unknown"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Light Cyan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4360,114 +4386,114 @@ msgstr "Light Cyan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Light Magenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Light Black"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4509,154 +4535,154 @@ msgstr "Light Black"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Matte Black"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Light Light Black"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Orange"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Error\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Self-Printing\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Busy\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Waiting\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Idle\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Paused\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Cleaning\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Factory shipment\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Shutting down\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Error: Fatal Error\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Error: Other interface is selected\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Error: Cover Open\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Error: Paper jam\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Error: Ink out\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Error: Paper out\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Error: Miscellaneous paper error\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Error: Maintenance cartridge overflow\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Error: Wait return from the tear-off position\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Error: Double feed error\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4665,180 +4691,180 @@ msgstr ""
 "Error: Ink cartridge lever released\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Error: Unrecoverable cutter error\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Error: Recoverable cutter jam\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Error: No maintenance cartridge present\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Error: Rear cover open\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Error: CD Tray Out\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Error: Card loading error\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Error: Tray cover open\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Error: Maintenance cartridge cover open\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Error: Front cover open\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Error: Maintenance request\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Error: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Warning: %s Ink Low\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Warning: Channel %d Ink Low\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Warning: %s Cleaning Disabled\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Warning: Channel %d Cleaning \n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Warning: Maintenance cartridge near full\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Warning: Maintenance request pending\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Warning: Unknown (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Printing nozzle self-test\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Printer Name: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Ink Levels:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Ink colour"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Percent remaining"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Job Name: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "ink levels"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Obtaining %s requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obtaining extended ink information requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Ink cartridge"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Part number"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Date"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printer identification requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Cannot identify printer model.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Cleaning heads…\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Running nozzle check, please ensure paper is in the printer.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4911,7 +4937,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4978,17 +5004,17 @@ msgstr ""
 "this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Unable to send command to the printer, exiting.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Exiting\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5007,20 +5033,20 @@ msgstr ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5029,7 +5055,7 @@ msgstr ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5038,12 +5064,12 @@ msgstr ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repeating the alignment process.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5058,17 +5084,17 @@ msgstr ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "About to save settings…"
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "failed!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5077,27 +5103,27 @@ msgstr ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "succeeded!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Your alignment settings have been saved to the printer.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unrecognised command.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Final command was not confirmed.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5114,12 +5140,12 @@ msgstr ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Press enter to continue > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5130,42 +5156,42 @@ msgstr ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Please insert a fresh sheet of paper.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Number out of range!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "I cannot understand what you typed!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "The best pair of lines should be numbered between 1 and %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Attempting to set alignment…"
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "succeeded.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5178,11 +5204,20 @@ msgstr ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Error in input\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Print without borders"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Printing…"
@@ -5451,21 +5486,21 @@ msgstr "Printing…"
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "EPSON Standard Inks"
 
@@ -5493,7 +5528,7 @@ msgstr "Bright White Paper"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postcard"
 
@@ -5779,29 +5814,29 @@ msgstr "Premium Lustre Photo Paper 250 wt"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6162,8 +6197,8 @@ msgstr "Watercolour Paper - Radiant White"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
@@ -6238,8 +6273,8 @@ msgstr "UltraChrome Photo Black"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome Matte Black"
 
@@ -6252,10 +6287,10 @@ msgstr "UltraChrome Matte Black"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6396,6 +6431,7 @@ msgstr "360 DPI High Quality"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6456,6 +6492,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
@@ -6516,6 +6553,7 @@ msgstr "720 × 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6641,7 +6679,8 @@ msgstr "720 DPI High Quality"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
@@ -6719,6 +6758,7 @@ msgstr "2880 × 720 DPI Highest Quality"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
@@ -6755,12 +6795,13 @@ msgstr "1440 × 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Dark Yellow"
 
@@ -6782,6 +6823,7 @@ msgstr "Dark Yellow"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
@@ -6857,7980 +6899,8629 @@ msgstr "Light Magenta"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Rear Tray"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Photograph"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Rear Tray"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Front Tray"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Manual Feed"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Manual Sheet Guide"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Manual Feed (Front)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Photo Board"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "One Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Three Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Four Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Five Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Six Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Tray 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Tray 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Tray 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Tray 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Tray 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "One Colour Raw Enhanced Gloss"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Raw Gloss"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Raw Gloss"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Colour Enhanced Gloss Raw"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Colour Enhanced Gloss Raw"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Matte Black"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Default Black"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Seven Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Six Colour Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Seven Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Two Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Eight Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Eight Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Four Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Interleave"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Full Overlap"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Four Pass"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Full Overlap 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Interleave 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Eight Pass"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "On"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3½×5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper (tear-off borders)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper (tear-off borders)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17×22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 landscape"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 landscape"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 landscape"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 landscape"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 landscape"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 landscape"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 landscape"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 landscape"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL landscape"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 landscape"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 landscape"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 landscape"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 landscape"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 landscape"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "C5 landscape"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA transposed"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB transposed"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC transposed"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD transposed"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE transposed"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japanese long envelope #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese long envelope #3 landscape"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japanese long envelope #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese long envelope #4 landscape"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japanese long envelope #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japanese long envelope #4 landscape"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japanese long envelope #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japanese long envelope #3 landscape"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku envelope #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese Kaku envelope #4 landscape"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 landscape"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Monarch Envelope landscape"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4×5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4×7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Card"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 #, fuzzy
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 #, fuzzy
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 #, fuzzy
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 #, fuzzy
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 #, fuzzy
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 #, fuzzy
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 #, fuzzy
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 #, fuzzy
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 #, fuzzy
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 #, fuzzy
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 #, fuzzy
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 #, fuzzy
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 #, fuzzy
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 #, fuzzy
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 #, fuzzy
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 #, fuzzy
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 #, fuzzy
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 #, fuzzy
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 #, fuzzy
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 #, fuzzy
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 #, fuzzy
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 #, fuzzy
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 #, fuzzy
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 #, fuzzy
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 #, fuzzy
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 #, fuzzy
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 #, fuzzy
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 #, fuzzy
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 #, fuzzy
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 #, fuzzy
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 #, fuzzy
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 #, fuzzy
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 #, fuzzy
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 #, fuzzy
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 #, fuzzy
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 #, fuzzy
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 #, fuzzy
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 #, fuzzy
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 #, fuzzy
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 #, fuzzy
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 #, fuzzy
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 #, fuzzy
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 #, fuzzy
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 #, fuzzy
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 #, fuzzy
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2238"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 #, fuzzy
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 2238"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 #, fuzzy
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3205"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 #, fuzzy
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 #, fuzzy
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 #, fuzzy
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 #, fuzzy
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 #, fuzzy
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 2705"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 #, fuzzy
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 #, fuzzy
 msgid "Savin 2535/2235"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 #, fuzzy
 msgid "Savin 2545/2245"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 #, fuzzy
 msgid "Savin 4035/4135g"
 msgstr "Savin 4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 #, fuzzy
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 #, fuzzy
 msgid "Savin 4045/4145g"
 msgstr "Savin 4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 #, fuzzy
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 #, fuzzy
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 #, fuzzy
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
+#: src/xml/xmli18n-tmp.h:8529
 #, fuzzy
-msgid "Canon SELPHY-CP-520"
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 #, fuzzy
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 #, fuzzy
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 #, fuzzy
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Basic Image Adjustment"
 
diff --git a/po/es.gmo b/po/es.gmo
index a8520b7..bb705b9 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 2abeca1..f0ff4ef 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.0beta1\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -149,138 +149,158 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamaño"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Redimensionar la impresión al tamaño de la página"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta de la impresora"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Tipo de Tinta"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tipo de tinta de la impresora"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -288,55 +308,55 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 PPP Altísima Calidad"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -344,7 +364,7 @@ msgstr "Ajustar el balance de cian de la impresión"
 msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -352,102 +372,82 @@ msgstr "Cian Claro"
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 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:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Estándar"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Ambos"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -496,154 +496,197 @@ msgstr "Ambos"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Negro"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografía"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 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:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Estándar"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -679,7 +722,7 @@ msgid "Pre-Dithered"
 msgstr "Imprimir"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -696,11 +739,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -815,8 +858,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -868,178 +911,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cian"
 
@@ -1049,8 +1092,8 @@ msgid "Adjust the cyan gamma"
 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:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1102,178 +1145,178 @@ msgstr "Ajustar el balance de cian de la impresión"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1283,8 +1326,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1336,178 +1379,178 @@ msgstr "Ajusta el balance magenta de la impresión"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -1517,18 +1560,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1547,14 +1590,14 @@ msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1568,7 +1611,7 @@ msgstr "Ajustar el balance de cian de la impresión"
 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:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1577,7 +1620,7 @@ msgstr ""
 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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1587,7 +1630,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajusta el balance amarillo de la impresión"
@@ -1893,11 +1936,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Tipo de Tinta"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1906,14 +1944,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1923,7 +1953,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de salida:"
@@ -2321,145 +2351,153 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Magenta Claro"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Establecer por Omisión"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papel Común"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2513,104 +2551,104 @@ 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:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
@@ -2929,25 +2967,18 @@ msgstr "Manual sin Pausa"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
@@ -2956,36 +2987,36 @@ msgstr "Papel Opaco"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar el balance de cian de la impresión"
@@ -3019,7 +3050,7 @@ msgstr "Fotografía de Secado Rápido"
 msgid "Quick-dry Transparency"
 msgstr "Transparencia de Secado Rápido"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manual"
 
@@ -3109,28 +3140,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 PPP"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Altura:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografía"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Negro + Color"
@@ -3162,15 +3185,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Carta"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -3178,7 +3201,7 @@ msgstr "Personalizado"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3187,35 +3210,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3944,124 +3970,124 @@ msgstr "Imprimir"
 msgid "(Default Printer)"
 msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de salida:"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bandeja 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bandeja 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bandeja 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bandeja 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Spanish"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Tamaño del medio:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Color"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Tonos de gris"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Color"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Color CMY (Cian/Mag/Amar)"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4348,28 +4374,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "No puedo leer %s de: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "El estado de la impresora requiere el uso de un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Opción desconocida %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4378,7 +4404,7 @@ msgstr ""
 "\n"
 "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4389,7 +4415,7 @@ msgstr ""
 "No puedo detectar el tipo de impresora.\n"
 "Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4431,23 +4457,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4469,84 +4495,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4568,116 +4594,116 @@ msgstr "Cian Claro"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4719,343 +4745,343 @@ msgstr "Negro"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Opaco"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Negro"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Tamaño"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Saturación:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Error en entrada\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Error en entrada\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Error en entrada\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Nombre de la Impresora:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Color de tinta"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Porcentaje restante"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpiando inyectores...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que "
 "haya papel en la impresora.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5134,7 +5160,7 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5206,17 +5232,17 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "No puedo enviar comando a la impresora, saliendo.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5235,13 +5261,13 @@ msgstr ""
 "Luego le será requerido confirmar su elección.\n"
 "¿Qué opción elige? (s), (q), (r).\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5249,7 +5275,7 @@ msgstr ""
 "Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
 "guardar:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5258,7 +5284,7 @@ msgstr ""
 "Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
 "Si quiere guardar la alineación, deberá repetir éste proceso.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5267,12 +5293,12 @@ msgstr ""
 "Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
 "proceso de alineado:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5287,17 +5313,17 @@ msgstr ""
 "Favor de confirmar que desea guardar la configuración de su impresora\n"
 "tipeando 's' de nuevo.\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Acerca de guardar configuración..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "¡falló!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5306,27 +5332,27 @@ msgstr ""
 "Su configuración no fue guardada exitosamente. Debe repetir el\n"
 "proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "¡éxito!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Su configuración de alineación fue guardada a la impresora.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando no reconocido.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "El comando final no fue confirmado.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5343,12 +5369,12 @@ msgstr ""
 "Favor de poner una hoja de papel en la impresora para comenzar el\n"
 "procedimiento de alineación del cabezal.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Presione enter para continuar > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5359,42 +5385,42 @@ msgstr ""
 "patrón.\n"
 "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Pasar #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "¡Número fuera de rango!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "El mejor par de líneas  debe ser numerado entre 1 y %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Intentando definir alineación..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "éxito.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5407,11 +5433,20 @@ msgstr ""
 "para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
 "obtener la mejor calidad de impresión.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Error en entrada\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Archivo/Imprimir..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Imprimiendo..."
@@ -5680,21 +5715,21 @@ msgstr "Imprimiendo..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5723,7 +5758,7 @@ msgstr "Papel Opaco"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postal"
 
@@ -6021,29 +6056,29 @@ msgstr "Papel de Fotografía Premium Luster"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6404,8 +6439,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografía de Seis Colores"
@@ -6481,8 +6516,8 @@ msgstr "Fotografía de Seis Colores"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6495,10 +6530,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6641,6 +6676,7 @@ msgstr "1440 x 360 PPP Alta Calidad"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 PPP"
@@ -6702,6 +6738,7 @@ msgstr "600 PPP"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 PPP"
@@ -6763,6 +6800,7 @@ msgstr "720 x 360 PPP"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 PPP"
@@ -6892,7 +6930,8 @@ msgstr "1200 PPP alta calidad"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 PPP"
@@ -6975,6 +7014,7 @@ msgstr "1440 x 360 PPP Altísima Calidad "
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
@@ -7012,13 +7052,14 @@ msgstr "1440 x 1440 PPP"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
@@ -7041,6 +7082,7 @@ msgstr "Amarillo"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
@@ -7125,8140 +7167,8750 @@ msgstr "Magenta Claro"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Bandeja"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografía"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Bandeja"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel para Fotografía"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Bandeja 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Bandeja 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Bandeja 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Bandeja 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Bandeja 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Papel Opaco"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Establecer por Omisión"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Ejecutivo"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel Epson 4x6 de Fotografía"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Papel Epson 4x6 de Fotografía"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 #, fuzzy
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 #, fuzzy
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 #, fuzzy
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 #, fuzzy
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 #, fuzzy
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 #, fuzzy
 msgid "American foolscap"
 msgstr "Foolscap Americano"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 #, fuzzy
 msgid "European foolscap"
 msgstr "Foolscap Europeo"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 #, fuzzy
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 #, fuzzy
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 #, fuzzy
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 #, fuzzy
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 #, fuzzy
 msgid "Small paperback"
 msgstr "Paperback pequeño"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "Penguin paperback pequeño"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 #, fuzzy
 msgid "Penguin large paperback"
 msgstr "Penguin paperback grande"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Tarjeta Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Tarjeta Oufuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Sobre Japonés grande #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Sobre Japonés grande #3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Sobre Japonés grande #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Sobre Japonés grande #4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Sobre Japonés grande #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Sobre Japonés grande #4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Sobre Japonés grande #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Sobre Japonés grande #3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitación"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Sobre"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Sobre"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postal"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "Rollo de Papel de 89 mm"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "Rollo de Papel de 5 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "Rollo de Papel de 210 mm"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "Rollo de Papel de 22 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "Rollo de Papel de 24 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "Rollo de Papel de 44 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configuración de la Impresora"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Tipo de salida:"
 
@@ -15881,9 +16533,6 @@ msgstr ""
 #~ msgid "Printer does not support listing ink types!\n"
 #~ msgstr "La impresora no soporta salida de color\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Archivo/Imprimir..."
-
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
 #~ msgstr "Traer próxima fila falló en %d\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index e408ef1..e37134e 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 2374d4f..b584fe2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2011-01-17 18:07-0500\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Oletus"
 
@@ -142,284 +142,284 @@ msgstr "Värimuunnosmoduuli"
 msgid "Dither algorithm"
 msgstr "Ditterointialgoritmi"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Paperikoko"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Tulostettavan paperin koko"
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Tulostusmateriaali"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Tulostusmateriaalin tyyppi (tavallinen paperi, valokuvapaperi jne.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Tulostusmateriaalin lähde"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Tulostumateriaalin lähde (syöttökaukalo)"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Tarkkuus"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Tulosteen tarkkuus ja laatu"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Musteen tyyppi"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tulostimessa olevan musteen tyyppi"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Mustekanavat"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Tulostustapa"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Tulostuksen ulostulotila"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Musteen asetus"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tulostimessa olevan musteen tyyppi"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Reunaton"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Tulosta ilman reunoja"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Kaksipuolinen tulostus"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Tulostuslaatu"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Syaanin tiheys"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Muuta syaanin tiheyttä"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Magentan tiheys"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Muuta magentan tiheyttä"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Keltaisen tiheys"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Muuta keltaisen tiheyttä"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Mustan tiheys"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Muuta mustan tiheyttä"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Vaalean syaanin siirtymä"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Vaalean magentan siirtymä"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Vaalean keltaisen siirtymä"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Pois"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Pitkä sivu (standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Lyhyt sivu (flip)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 tuumaa"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 tuumaa"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - oma"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Tavallinen"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Väri"
 
-#: src/main/print-canon.c:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Mustavalkoinen"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Käsisäädöt"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Tavallinen"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Molemmat"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -468,154 +468,195 @@ msgstr "Molemmat"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Musta"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Valokuva"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Ei mitään"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Käsisäädöt"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Tavallinen"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Korkea tarkkuus"
@@ -649,7 +690,7 @@ msgid "Pre-Dithered"
 msgstr "Esiditteroitu"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Harmaasävy"
 
@@ -665,11 +706,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -771,8 +812,8 @@ msgid "Gamma value assumed by application"
 msgstr "Sovelluksen olettama gamma-arvo"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -824,178 +865,178 @@ msgstr "Sovelluksen olettama gamma-arvo"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Syaani"
 
@@ -1004,8 +1045,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Muuta syaanin gamma-arvoa"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1057,178 +1098,178 @@ msgstr "Muuta syaanin gamma-arvoa"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1237,8 +1278,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Muuta magentan gamma-arvoa"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1290,178 +1331,178 @@ msgstr "Muuta magentan gamma-arvoa"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Keltainen"
 
@@ -1470,18 +1511,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Muuta keltaisen gamma-arvoa"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Punainen"
 
@@ -1498,14 +1539,14 @@ msgid "Adjust the green gamma"
 msgstr "Muuta vihreän gamma-arvoa"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Sininen"
 
@@ -1517,7 +1558,7 @@ msgstr "Muuta sinisen gamma-arvoa"
 msgid "Adjust the black gamma"
 msgstr "Muuta mustan gamma-arvoa"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Syaanin tasapaino"
 
@@ -1525,7 +1566,7 @@ msgstr "Syaanin tasapaino"
 msgid "Adjust the cyan gray balance"
 msgstr "Muuta syaani-harmaa-tasapainoa"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Magentan tasapaino"
 
@@ -1533,7 +1574,7 @@ msgstr "Magentan tasapaino"
 msgid "Adjust the magenta gray balance"
 msgstr "Muuta magenta-harmaa-tasapainoa"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Keltaisen tasapaino"
 
@@ -1818,10 +1859,6 @@ msgstr "Lisätty kiilto"
 msgid "Add gloss enhancement"
 msgstr "Lisää kiiltoa"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Musteen asetus"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Tulostuksen suunta"
@@ -1830,14 +1867,6 @@ msgstr "Tulostuksen suunta"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Tulostussuunta (yksisuuntainen on korkealaatuisempi, mutta hitaampi)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Reunaton"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Tulosta ilman reunoja"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Lomitustapa"
@@ -1847,7 +1876,7 @@ msgid "Interleave pattern to use"
 msgstr "Käytettävä lomituskuvio"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Ulostulojärjestys"
 
@@ -2182,136 +2211,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Hextone harmaa 1 (vaalein) -tiheysskaala"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Kuivausaika sivua kohden"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Aseta sivua kohden käytettävä kuivausaika"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Kuivausaika lukua kohden"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Aseta kuivausaika lukua kohden"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Pienin kuivausaika lukua kohden"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Aseta pienin kuivausaika lukua kohden"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Laadun lisääminen"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Lisää tulostuslaatua ylimääräisillä toistokerroilla"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Paperin paksuus"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Aseta paperin paksuus"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr ""
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Syöttöjono"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Aseta paperin syöttöjono (tulostinkohtainen)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Tulostustapa"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Aseta tulostustapa (tulostinkohtainen)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr ""
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Syötön säätö"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Aseta paperinsyötön säätö (0,01% units)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Täydet käsisäädöt"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Automaattinen asetusten säätö"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Kaksisuuntainen"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Yksisuuntainen"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Vaihtoehtoinen täyttö"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Nouseva täyttö"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Laskeva täyttö"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Tuplasti nouseva"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Lähimmän naapurin välttäminen"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Lyhyt sivu(flip)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tämä tulostin ei tue raakatulostusulostuloa syvyydellä %d\n"
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Tulostinvalintoja ei varmistettu. Ei voi tulostaa.\n"
@@ -2365,104 +2402,104 @@ msgid "test print"
 msgstr "testitulostus"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr "Neliväristandardi"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr "Kolmivärikomposiitti"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr "Kuuden värin valokuva"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Viiden värin valokuvakomposiitti"
 
@@ -2781,24 +2818,17 @@ msgstr "Käsin ilman taukoa"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Ei mitään"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Kiiltävä"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Tekstuuri"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Matta"
 
@@ -2806,32 +2836,32 @@ msgstr "Matta"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Laminaattikuvio"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Ulostulon tasojen säätö"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Muuta syaanin tasapainoa"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Muuta magentan tasapainoa"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Muuta keltaisen tasapainoa"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Mustan tasapaino"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Muuta mustan tasapainoa"
 
@@ -2863,7 +2893,7 @@ msgstr "Nopeasti kuivuva valokuva"
 msgid "Quick-dry Transparency"
 msgstr "Nopeasti kuivuva kalvo"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Käsin"
 
@@ -2952,26 +2982,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Vedos"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Korkea"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Valokuva"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Väri- ja musta kasetti"
@@ -3000,15 +3023,15 @@ msgstr "PPD-tiedoston mallin nimi"
 msgid "None; please provide a PPD file"
 msgstr "Ei mitään; tarjoa PPD-tiedosto"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Muu"
 
@@ -3016,7 +3039,7 @@ msgstr "Muu"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Kuvan mittojen tulee täsmätä paperin mittojen kanssa"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Vakava virhe"
 
@@ -3027,33 +3050,36 @@ msgstr ""
 "Lähetäthän yllä olevat tiedot osoitteeseen gimp-print-devel@lists."
 "sourceforge.net"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Nopea taloudellinen"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Taloudellinen"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super – valokuva"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra – valokuva"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Paras"
 
@@ -3740,113 +3766,113 @@ msgstr "Tulostin"
 msgid "(Default Printer)"
 msgstr "(Oletustulostin)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Tulostimen ominaisuudet"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Ulostulon hallinta"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Yleiset"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Ekstra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Finnish"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Median koko"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Värimalli"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Käänteinen harmaasävy"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB-värit"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY-värit"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Värien tarkkuus"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Ei"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Arvo"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Hienosäätö"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Käänteinen"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "Kaksipuolinen tulostus"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Kutista sivua tarvittaessa, jotta reunat mahtuvat"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Kutista (tulosta koko sivu)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Rajaa (säilytä mittasuhteet)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Laajenna (käytä täysi paperin pinta-ala)"
 
@@ -4028,35 +4054,35 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4064,7 +4090,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4106,22 +4132,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Valokuvamusta"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4143,83 +4169,83 @@ msgstr "Tuntematon"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Vaalea syaani"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4241,114 +4267,114 @@ msgstr "Vaalea syaani"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Vaalea magenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Vaalea musta"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4390,335 +4416,335 @@ msgstr "Vaalea musta"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Mattamusta"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Kiillon optimointi"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Hyvin vaalea musta"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Oranssi"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Tila: virhe\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Tila: itsetulostus\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Tila: varattu\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Tila: odotetaan\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Tila: jouten\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Tila: pysäytetty\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Tila: puhdistetaan\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Tila: sammutetaan\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Tila: tuntematon (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Virhe: vakava virhe\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Virhe: toinen liitäntä on valittu\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Virhe: kansi auki\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Virhe: paperitukos\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Virhe: muste loppunut\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Virhe: paperi loppunut\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Virhe: sekalainen paperivirhe\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Virhe: huoltokasetin ylivuoto\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Virhe: odota palautumista repäisysijainnista\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Virhe: kaksoissyöttövirhe\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Varoitus: %s muste vähissä\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Tulostimen nimi: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Mustetasot:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Musteen väri"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "prosenttia jäljellä"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Työn nimi: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "musteen tasot"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "tila"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Mustesäiliö"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Osanumero"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Päiväys"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Tulostimen tunnistaminen vaatii raakalaitteen käyttöä.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Tulostinmallin tunnistus ei onnistunut.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Puhdistetaan tulostuspäät...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Suoritetaan suutinten tarkistus, varmista että tulostimessa on paperia.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4757,7 +4783,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4793,17 +4819,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Komentoa ei voitu lähettää tulostimelle, poistutaan.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Poistutaan\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4815,38 +4841,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4856,44 +4882,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Tunnistamaton komento.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -4904,12 +4930,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4917,42 +4943,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "En ymmärrä mitä kirjoitit!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -4961,11 +4987,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr ""
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Tulosta ilman reunoja"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Tulostetaan..."
@@ -5234,21 +5269,21 @@ msgstr "Tulostetaan..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "EPSON-standardimusteet"
 
@@ -5276,7 +5311,7 @@ msgstr "Kirkas valkoinen paperi"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postikortti"
 
@@ -5562,29 +5597,29 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -5944,8 +5979,8 @@ msgstr "Vesiväripaperi - säteilevä valkoinen"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr ""
 
@@ -6020,8 +6055,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6034,10 +6069,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6178,6 +6213,7 @@ msgstr "360 DPI korkea laatu"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6238,6 +6274,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6298,6 +6335,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6423,7 +6461,8 @@ msgstr "720 DPI korkea laatu"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6501,6 +6540,7 @@ msgstr "2880 x 720 DPI korkein laatu"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6537,12 +6577,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Tumma keltainen"
 
@@ -6564,6 +6605,7 @@ msgstr "Tumma keltainen"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6637,7766 +6679,8413 @@ msgstr "Värikäs vaalea magenta"
 msgid "Vivid Magenta"
 msgstr "Värikäs magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Pääkelkka"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Valokuvakelkka"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Tulosta CD-levylle"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Takakelkka"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Etukelkka"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Käsisyöttö"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Rullasyöttö (katkaise jokainen paperi)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Rullasyöttö (älä katkaise)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rullasyöttö"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Käsisyöttö (etu)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Rullasyöttö (älä katkaise)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Rullasyöttö (älä katkaise)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Käsivalinta"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Yksi väri - raaka"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Kolme väriä - raaka"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Neljä väriä - raaka"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Viisi väriä - raaka"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Kuusi väriä - raaka"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "Harmaa 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "Harmaa 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "Harmaa 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "Harmaa 5"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "Harmaa 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "Mattamusta"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Oletusmusta"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Seitsemän värin valokuva"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Lomitus"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Täysi peitto"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Täysi peitto 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Lomitus 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Photo Paper (repäisyreunat)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson L Photo Paper (repäisyreunat)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL vaaka"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
 msgstr "EA5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
 msgstr "EA5 vaaka"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA transponoitu"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB transponoitu"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC transponoitu"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD transponoitu"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE transponoitu"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10 cm x 15 cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki-kortti"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku-kortti"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Kortti"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Leveä postikortti"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64-tuumainen paperirulla"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript taso 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript taso 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 710"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 810"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B1100"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T1100"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T1110"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290s"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo PX650"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX710W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX810FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX115"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX215"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX415"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX515"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo PX650"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo PX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo PX710W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo PX810FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S21"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus S50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX110"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX115"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX210"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX215"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX410"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX415"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX510W"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX615"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus SX650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T21"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T26"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T30"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus T40W"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX110"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX210"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus TX300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX410"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX510FN"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus TX550W"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX610FW"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 310"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 315"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 610"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 615"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 1100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 1100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
 msgstr "Epson PX 1001"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Geneerinen PCL 4 -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Geneerinen PCL 4 LF -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Geneerinen PCL 5 -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Geneerinen PCL 5 LF -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Geneerinen PCL 5c -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Geneerinen PCL 5c LF -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Geneerinen PCL 5e -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Geneerinen PCL 5e LF -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Geneerinen PCL 6/PCL XL -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Geneerinen PCL 6/PCL XL LF -tulostin"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-530"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 #, fuzzy
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 #, fuzzy
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 #, fuzzy
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "Raakadata 16-bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "Raakadata 8-bit"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Kuvan perusasetukset"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 5c5d5d9..502cd2b 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index d2ee908..7cf32b2 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Défaut"
 
@@ -144,289 +144,289 @@ msgstr "Module de conversion de couleur"
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Format papier "
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Type de support"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type de support (papier ordinaire, papier photo etc.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Source du support"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 "Imprime seulement sur le CD en dehors du moyeu ou y compris le moyeu "
 "jusqu'au trou"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 #, fuzzy
 msgid "CD Hub Size (Custom)"
 msgstr "Taille du moyeu du CD"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Dimensionne l'impression par rapport à la taille de la page"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Réglage horizontal précis du CD"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Réglage précis de la position horizontale pour l'impression sur CD"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "Réglage vertical précis du CD"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Résolution et qualité de l'impression"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Encres installées"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Encres (canaux)"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Mode d'impression"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Mode de sortie"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Jeu d'encres"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Encres installées"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "sans marges"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Impression sans marges"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Impression double face"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Paramètres Duplex"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Qualité d'impression"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Densité cyan"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Ajustement de la densité de cyan"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Densité magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Ajustement de la densité de magenta"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Densité jaune"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Ajustement de la densité de jaune"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Densité du noir"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Ajustement du niveau de densité"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Passage cyan clair"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Transition magenta clair"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Transition jaune clair"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Désactivé"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Côté long (standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 pouces"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 pouces"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personnalisé"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Imprimer sue le moyeu"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Controle manuel"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Les deux"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -475,154 +475,195 @@ msgstr "Les deux"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Noir"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Photo"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Aucun"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Controle manuel"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Haute précision"
@@ -656,7 +697,7 @@ msgid "Pre-Dithered"
 msgstr "Pré-tramé"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -672,11 +713,11 @@ msgstr "RVB"
 msgid "CMY"
 msgstr "CMJ"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMJN"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "NCMJ"
 
@@ -781,8 +822,8 @@ msgid "Gamma value assumed by application"
 msgstr "Valeur gamma prévue par l'application"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -834,178 +875,178 @@ msgstr "Valeur gamma prévue par l'application"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1014,8 +1055,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Réglage du gamma pour le cyan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1067,178 +1108,178 @@ msgstr "Réglage du gamma pour le cyan"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1247,8 +1288,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Réglage du gamma pour le magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1300,178 +1341,178 @@ msgstr "Réglage du gamma pour le magenta"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Jaune"
 
@@ -1480,18 +1521,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Réglage du gamma pour le jaune"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Rouge"
 
@@ -1508,14 +1549,14 @@ msgid "Adjust the green gamma"
 msgstr "Réglage du gamma pour le vert"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Bleu"
 
@@ -1527,7 +1568,7 @@ msgstr "Réglage du gamma pour le bleu"
 msgid "Adjust the black gamma"
 msgstr "Réglage du gamma pour le noir"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Niveau de cyan"
 
@@ -1535,7 +1576,7 @@ msgstr "Niveau de cyan"
 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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Niveau de magenta"
 
@@ -1543,7 +1584,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Niveau de jaune"
 
@@ -1830,10 +1871,6 @@ msgstr "Amélioration de la brillance"
 msgid "Add gloss enhancement"
 msgstr "Ajouter l'amélioration de brillance"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Jeu d'encres"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Sens d'impression"
@@ -1843,14 +1880,6 @@ 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:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "sans marges"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Impression sans marges"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Méthode d'entrelacement"
@@ -1860,7 +1889,7 @@ msgid "Interleave pattern to use"
 msgstr "Motif d'entrelacement"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Ordre de sortie"
 
@@ -2236,144 +2265,152 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Densité magenta"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 #, fuzzy
 msgid "Quality Enhancement"
 msgstr "Ajouter l'amélioration de brillance"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Taille du papier"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Valeurs par défaut"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densité du noir"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Mode d'impression"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papier ordinaire"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Réglage fin"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Contrôle manuel complet"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Controle réglage automatique"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Unirectionnel"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "en alternance"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "en montant"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "en descendant"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "en montant - double"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "en évitant les voisins"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 #, fuzzy
 msgid "Short Edge(Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: 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"
@@ -2427,104 +2464,104 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
@@ -2843,24 +2880,17 @@ msgstr "Manuel sans pause"
 msgid "Coated"
 msgstr "Couché"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Aucun"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Brillant"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Mat"
 
@@ -2868,32 +2898,32 @@ msgstr "Mat"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Motif du vernis protecteur"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Réglage du niveau de sortie"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Réglage balance cyan"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Réglage balance magenta"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Réglage balance jaune"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Balance du noir"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Réglage de la balance du noir"
 
@@ -2925,7 +2955,7 @@ msgstr "Photo séchage rapide"
 msgid "Quick-dry Transparency"
 msgstr "Transparent séchage rapide"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuel"
 
@@ -3015,26 +3045,19 @@ msgid "2400x600 DPI"
 msgstr "2400 x 600 ppp"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Brouillon"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Hauteur"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Photo"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Cartouches couleur et noir"
@@ -3064,15 +3087,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -3080,7 +3103,7 @@ msgstr "Personnalisé"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 #, fuzzy
 msgid "Fatal error!"
 msgstr "Erreur: Erreur fatale\n"
@@ -3090,33 +3113,36 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Rapide (économique)"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Economique"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Meilleur"
 
@@ -3809,121 +3835,121 @@ msgstr "Imprimante"
 msgid "(Default Printer)"
 msgstr "(imprimante par défaut)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Caractéristiques de l'imprimante"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "contrôle de sortie"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Commun"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Extra5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "French"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Source du support"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Mode de travail"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Niveaux de gris"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Couleur"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Couleur CMJ"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 #, fuzzy
 msgid "Color Precision"
 msgstr "Correction des couleurs"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Oui"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Non"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 #, fuzzy
 msgid "Value"
 msgstr "Bleu"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Réglage fin"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 #, fuzzy
 msgid "Reverse"
 msgstr "Meilleur"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Impression double face"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4218,28 +4244,28 @@ msgstr "Lecture données de l'imprimante: temps excédé\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Impossible de lire à partir de %s : %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Option inconnue %c\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4248,7 +4274,7 @@ msgstr ""
 "\n"
 "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4259,7 +4285,7 @@ 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:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4301,22 +4327,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Noir photo"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4338,83 +4364,83 @@ msgstr "Inconnu"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4436,114 +4462,114 @@ msgstr "Cyan clair"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Noir clair"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4585,343 +4611,343 @@ msgstr "Noir clair"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Noir Mat"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Optimiseur de brillance"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Noir très clair"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Page"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Etat: Erreur\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Etat: auto-impression\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Etat: occupé\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Etat: Attente\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Etat: Libre\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Etat: Pause\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Etat: Nettoyage\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Etat: Configuration usine\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Etat: Arrêt en cours\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Etat: Inconnu (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Erreur: Erreur fatale\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Erreur: une autre interface est sélectionnée\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Erreur: ouvercle ouvert\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Erreur: Bourrage papier\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Erreur: plus d'encre\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Erreur: Pas de papier\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, fuzzy, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Erreur: Erreur massicot non récupérable\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Erreur: Attente retour à la position de repos\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Erreur: double chargement\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Erreur: Erreur massicot non récupérable\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Erreur: bourrage massicot (récupérable)\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Erreur: couvercle du support ouvert\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Erreur: Support CD sorti\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Erreur: Chargement de la carte\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Erreur: couvercle du support ouvert\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, fuzzy, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Erreur: couvercle du support ouvert\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, fuzzy, c-format
 msgid "Error: Front cover open\n"
 msgstr "Erreur: couvercle du support ouvert\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, fuzzy, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Erreur: une autre interface est sélectionnée\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Error: Inconnue (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, fuzzy, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Attention: Encre noire niveau bas\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, fuzzy, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Attention: Encre noire niveau bas\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Attention: Inconnu (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Impression autotest des buses\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Nom de l'imprimante :"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Niveau d'encres:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Encre couleur"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Pourcentage restant"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Nom du travail: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "niveau d'encres"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "état"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 "Obtenir %s demande d'utiliser un périphérique en mode caractère (raw "
 "device).\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Obtenir les niveaux d'encre demande d'utiliser un périphérique en mode "
 "caractère (raw device)\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Numéro de pièce"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Date"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "L'identification de l'imprimante demande d'utiliser un périphérique "
 "caractère (raw devive)\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ne paut pas identifier le modèle d'imprimante.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Nettoyage des têtes...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
 "dans l'imprimante\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5006,7 +5032,7 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5082,17 +5108,17 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "uitte.\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5112,13 +5138,13 @@ msgstr ""
 "Il vous sera ensuite demandé de confirmer votre choix\n"
 "Que voulez-vous faire (s, q, r) ?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5126,7 +5152,7 @@ msgstr ""
 "Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
 "enregistrer :\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5136,7 +5162,7 @@ msgstr ""
 "Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
 "opération.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5145,12 +5171,12 @@ msgstr ""
 "S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
 "reprendre l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Répétition de l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5165,17 +5191,17 @@ msgstr ""
 "Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
 "enregistrer les réglages de votre imprimante.\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "À propos de l'enregistrement des réglages..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "Échec !\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5184,27 +5210,27 @@ msgstr ""
 "Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
 "l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "Succès !\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Commande non reconnue.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "La dernière commande n'a pas été confirmée.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5221,12 +5247,12 @@ msgstr ""
 "S'il vous plait placez une feuillle de papier dans votre imprimante\n"
 "pour commencer l'opération d'ailgnement des têtes.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Pressez Entrée pour continuer > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5237,42 +5263,42 @@ msgstr ""
 "lignes dans chaque trame.\n"
 "Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Passe #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Veuillez insérer une feuille de papier vierge.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nombre hors-intervalle !\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Je ne comprends pas ce que vous avez tapé !\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentative de réglage de l'alignement..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "Succès.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5285,11 +5311,21 @@ msgstr ""
 "trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
 "devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Erreur en entrée\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Impression sans marges"
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Fichier/Imprimer..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Impression en cours..."
@@ -5558,21 +5594,21 @@ msgstr "Impression en cours..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "Encres standard EPSON"
 
@@ -5601,7 +5637,7 @@ msgstr "Papier Mat"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Carte postale"
 
@@ -5895,29 +5931,29 @@ msgstr "Papier photo Premium Luster"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6278,8 +6314,8 @@ msgstr "Papier aquarelle - radiant white"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "Ultrachrome noir photo"
 
@@ -6354,8 +6390,8 @@ msgstr "Ultrachrome noir photo"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "Ultrachrome noir mat"
 
@@ -6368,10 +6404,10 @@ msgstr "Ultrachrome noir mat"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6512,6 +6548,7 @@ msgstr "360 ppp Haute qualité"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 ppp"
 
@@ -6572,6 +6609,7 @@ msgstr "360 ppp"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 ppp"
 
@@ -6632,6 +6670,7 @@ msgstr "720 x 360 ppp"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 ppp"
 
@@ -6757,7 +6796,8 @@ msgstr "720 ppp Haute qualité"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
@@ -6835,6 +6875,7 @@ msgstr "2880 x 720 ppp Trés haute qualité"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
@@ -6871,12 +6912,13 @@ msgstr "1440 x 1440 ppp"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 ppp"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Jaune foncé"
 
@@ -6898,6 +6940,7 @@ msgstr "Jaune foncé"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 ppp"
 
@@ -6978,8313 +7021,8956 @@ msgstr "Magenta clair"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Bac arrière"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Photographie"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Imprimer un CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Bac arrière"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Bac avant"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Alimentation manuelle"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Alimentation rouleau (couper chaque page)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Alimentation rouleau (sans découpe des pages)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Alimentation guide par feuille (arrière)"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Alimentation manuelle (avant)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Alimentation rouleau (sans découpe des pages)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Alimentation rouleau (sans découpe des pages)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Carte photo"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Coupe papier Bin 1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Coupe papier Bin 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection de coupe automatique"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Sélection manuelle"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Une couleur de base"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Trois couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Quatre couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Cinq couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Six couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Bac 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Bac 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Bac 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Bac 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Bac 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Une couleur de base optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs de base brillant"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs de base brillant"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs de base Optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs de base Optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Noir Mat"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Défaut"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Six couleurs amélioré composite"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Sept couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "EChelle de gris à deux niveaux"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Deux couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Huit couleurs photo"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Huit couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Six couleurs photo"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Entrelacement"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "quatre passes"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Entrelancement 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "huit passes"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Actif"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA sens paysage"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB sens paysage"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArcgC sens paysage"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD sens paysage"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE sens paysage"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Foolscap américain"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Foolscap européen"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Quatro couronne large"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demi-quatro"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Quatro royal"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Octave couronne"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Octave couronne large"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demi-octave"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Octave royale"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Petite reliure"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Petite reliure Penguin"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Grande reliure Penguin"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Carte Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Carte Oufuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Enveloppe longue japonaise n°4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Enveloppe longue japonaise n°4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Enveloppe longue japonaise n°3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Enveloppe longue japonaise n°3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Enveloppe Monarch"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Enveloppe Monarch"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Carte"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Carte postale large"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "Rouleau 89mm"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "Rouleau 5 pouces"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "Rouleau 210mm"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "Rouleau 22 pouces"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "Rouleau 24 pouces"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "Rouleau 44 pouces"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "Postscript level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "Postscript level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJC-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-6500"
+
+#: src/xml/xmli18n-tmp.h:6833
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon CP-300"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon CP-300"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon CP-300"
+msgid "Canon PIXMA mini220"
+msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini360"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA iP90"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA iP90v"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon iP4000"
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon S100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
-msgid "Canon PIXMA iP3000"
+msgid "Canon PIXMA iP3500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6875
 #, fuzzy
-msgid "Canon PIXMA iP3100"
-msgstr "Canon CP-300"
+msgid "Canon PIXMA iP3600"
+msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6880
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon CP-200"
+
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6902
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6946
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6970
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6930
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
-msgid "Canon i865"
+msgid "Canon i865old"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3600"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson  Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Canon CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 #, fuzzy
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 #, fuzzy
 msgid "Brother HL-1430"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 #, fuzzy
 msgid "Brother HL-1450"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 #, fuzzy
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 #, fuzzy
 msgid "Brother HL-1650"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 #, fuzzy
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 #, fuzzy
 msgid "Brother HL-1850"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 #, fuzzy
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 #, fuzzy
 msgid "Brother HL-2460"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 #, fuzzy
 msgid "Brother HL-2460N"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 #, fuzzy
 msgid "Brother HL-5030"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 #, fuzzy
 msgid "Brother HL-5040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 #, fuzzy
 msgid "Brother HL-5050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 #, fuzzy
 msgid "Brother HL-5070N"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 #, fuzzy
 msgid "Brother HL-5140"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 #, fuzzy
 msgid "Brother HL-5150D"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 #, fuzzy
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 #, fuzzy
 msgid "Brother HL-7050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 #, fuzzy
 msgid "Brother HL-7050N"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 #, fuzzy
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 #, fuzzy
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 #, fuzzy
 msgid "Gestetner MP1600/DSm716"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 #, fuzzy
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 #, fuzzy
 msgid "Gestetner MP2500/DSm625"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 #, fuzzy
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 #, fuzzy
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 #, fuzzy
 msgid "Gestetner MP5500/DSm755"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 #, fuzzy
 msgid "Gestetner MP6500/DSm765"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 #, fuzzy
 msgid "Gestetner MP7500/DSm775"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 #, fuzzy
 msgid "Gestetner MP9000/DSm790"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 #, fuzzy
 msgid "Gestetner MP 161/DSm416"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 #, fuzzy
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 #, fuzzy
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4O"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1120"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 1120"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 #, fuzzy
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 #, fuzzy
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 #, fuzzy
 msgid "Infotec IS2035"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 #, fuzzy
 msgid "Infotec IS2045"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 #, fuzzy
 msgid "Infotec IS2105"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 #, fuzzy
 msgid "Infotec IS 2015"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 #, fuzzy
 msgid "Infotec IS 2018"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 #, fuzzy
 msgid "Infotec IS 2060"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 #, fuzzy
 msgid "Infotec IS 2075"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 #, fuzzy
 msgid "Infotec IS 2122"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 #, fuzzy
 msgid "Infotec IS 2127"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 #, fuzzy
 msgid "Infotec IS 2132"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 #, fuzzy
 msgid "Infotec IS 2135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 #, fuzzy
 msgid "Infotec IS 2145"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 #, fuzzy
 msgid "Infotec IS 2151"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 #, fuzzy
 msgid "Infotec IS 2160"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 #, fuzzy
 msgid "Infotec IS 2175"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 #, fuzzy
 msgid "Infotec IS 2215"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 #, fuzzy
 msgid "Infotec IS 2216"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 #, fuzzy
 msgid "Infotec IS 2220"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 #, fuzzy
 msgid "Infotec IS 2225"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 #, fuzzy
 msgid "Infotec IS 2230"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 #, fuzzy
 msgid "Infotec IS 2235"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 #, fuzzy
 msgid "Infotec IS 2245"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 #, fuzzy
 msgid "Infotec IS 2255"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 #, fuzzy
 msgid "Infotec IS 2265"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 #, fuzzy
 msgid "Infotec IS 2275"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 #, fuzzy
 msgid "Infotec IS 2316"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 #, fuzzy
 msgid "Infotec IS 2320"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 #, fuzzy
 msgid "Infotec IS 2325"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 #, fuzzy
 msgid "Infotec IS 2416"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 #, fuzzy
 msgid "Infotec IS 2425"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 #, fuzzy
 msgid "Infotec IS 2430"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 #, fuzzy
 msgid "Infotec IS 2435"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 #, fuzzy
 msgid "Infotec IS 2445"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 #, fuzzy
 msgid "Infotec IS 3090"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 #, fuzzy
 msgid "Infotec IS 3110"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 #, fuzzy
 msgid "Infotec IS 3135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 #, fuzzy
 msgid "Infotec MP 2550"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 #, fuzzy
 msgid "Infotec MP 3350"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 #, fuzzy
 msgid "Infotec MP 4000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 #, fuzzy
 msgid "Infotec MP 5000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 #, fuzzy
 msgid "Lanier MP2500/LD125"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 #, fuzzy
 msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 #, fuzzy
 msgid "Lanier MP 1350/LD1135"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 #, fuzzy
 msgid "Lanier MP 1600/LD316"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 #, fuzzy
 msgid "Lanier MP 161/LD016"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 #, fuzzy
 msgid "Lanier MP 2000/LD320d"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 #, fuzzy
 msgid "Lanier MP 2510/LD325"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 #, fuzzy
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 #, fuzzy
 msgid "Lanier MP 2550/LD425"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 #, fuzzy
 msgid "Lanier MP 3010/LD330"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 #, fuzzy
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 #, fuzzy
 msgid "Lanier MP 3350/LD433"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 #, fuzzy
 msgid "Lanier MP 3500/LD335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 #, fuzzy
 msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 #, fuzzy
 msgid "Lanier MP 4000/LD040"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 #, fuzzy
 msgid "Lanier MP 4500/LD345"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 #, fuzzy
 msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 #, fuzzy
 msgid "Lanier MP 5000/LD050"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 #, fuzzy
 msgid "Lanier MP 5500/LD255"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 #, fuzzy
 msgid "Lanier MP 6500/LD265"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 #, fuzzy
 msgid "Lanier MP 7500/LD275"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 #, fuzzy
 msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 #, fuzzy
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 #, fuzzy
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 #, fuzzy
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 #, fuzzy
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 #, fuzzy
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 #, fuzzy
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 #, fuzzy
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 #, fuzzy
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 #, fuzzy
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 #, fuzzy
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 #, fuzzy
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 #, fuzzy
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 #, fuzzy
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 #, fuzzy
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 #, fuzzy
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 #, fuzzy
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 #, fuzzy
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 #, fuzzy
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 #, fuzzy
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 #, fuzzy
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 #, fuzzy
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 #, fuzzy
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 #, fuzzy
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 #, fuzzy
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 #, fuzzy
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 #, fuzzy
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 #, fuzzy
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 #, fuzzy
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 #, fuzzy
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 #, fuzzy
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 #, fuzzy
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 #, fuzzy
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 #, fuzzy
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 #, fuzzy
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 #, fuzzy
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 #, fuzzy
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 #, fuzzy
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 #, fuzzy
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 #, fuzzy
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 #, fuzzy
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 #, fuzzy
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 #, fuzzy
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 #, fuzzy
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 #, fuzzy
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 #, fuzzy
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 #, fuzzy
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 #, fuzzy
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 #, fuzzy
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 #, fuzzy
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 #, fuzzy
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 #, fuzzy
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 #, fuzzy
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 #, fuzzy
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 #, fuzzy
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 #, fuzzy
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 #, fuzzy
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 #, fuzzy
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 #, fuzzy
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 #, fuzzy
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 #, fuzzy
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 #, fuzzy
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 #, fuzzy
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 #, fuzzy
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 #, fuzzy
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 #, fuzzy
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 #, fuzzy
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 #, fuzzy
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 #, fuzzy
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "\"Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 #, fuzzy
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 #, fuzzy
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 #, fuzzy
 msgid "Savin 2535/2235"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 #, fuzzy
 msgid "Savin 2545/2245"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 #, fuzzy
 msgid "Savin 40105"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 #, fuzzy
 msgid "Savin 4035/4135g"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 #, fuzzy
 msgid "Savin 4035e/4135eG"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 #, fuzzy
 msgid "Savin 4045/4145g"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 #, fuzzy
 msgid "Savin 4045e/4145eG"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 #, fuzzy
 msgid "Savin 8035/8035g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 #, fuzzy
 msgid "Savin 8045/8045g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 #, fuzzy
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-3000"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
+#: src/xml/xmli18n-tmp.h:8529
 #, fuzzy
-msgid "Canon SELPHY-CP-520"
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
-
-#: src/xml/xmli18n-tmp.h:8387
+#: src/xml/xmli18n-tmp.h:8531
 #, fuzzy
-msgid "Canon SELPHY-CP-720"
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8388
+#: src/xml/xmli18n-tmp.h:8532
 #, fuzzy
-msgid "Canon SELPHY-CP-730"
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8389
+#: src/xml/xmli18n-tmp.h:8533
 #, fuzzy
-msgid "Canon SELPHY-CP-740"
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8390
+#: src/xml/xmli18n-tmp.h:8534
 #, fuzzy
-msgid "Canon SELPHY-CP-750"
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8391
-#, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
+#: src/xml/xmli18n-tmp.h:8536
 #, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
+#: src/xml/xmli18n-tmp.h:8537
 #, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "Données brutes (raw) 16 bits"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "Données brutes (raw) 8 bits"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon BJC-85"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon CP-300"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon CP-300"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon CP-300"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon CP-300"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-710"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#, fuzzy
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Réglage fin de base de l'image"
 
@@ -15672,8 +16358,5 @@ msgstr "Données brutes (raw) 8 bits"
 #~ msgid "CMYK Color"
 #~ msgstr "Couleur CMJN"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Fichier/Imprimer..."
-
 #~ msgid "Gutenprint"
 #~ msgstr "Gutenprint"
diff --git a/po/gl.gmo b/po/gl.gmo
new file mode 100644
index 0000000..81563a1
--- /dev/null
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..1e17cd6
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,15235 @@
+# Galician translations for gutenprint package.
+# Copyright (C) 2011 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.
+# Fran Dieguez <frandieguez@gnome.org>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gutenprint 20110308\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
+"PO-Revision-Date: 2011-09-18 23:59+0200\n"
+"Last-Translator: Francisco Diéguez <frandieguez@ubuntu.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/main/dither-main.c:44 src/main/print-color.c:49
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
+msgid "Default"
+msgstr "Predefinido"
+
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
+#: src/main/dither-main.c:47
+msgid "EvenTone"
+msgstr "EvenTone"
+
+#: src/main/dither-main.c:48
+msgid "Hybrid EvenTone"
+msgstr "EvenTone híbrido"
+
+#. 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 híbrido"
+
+#: src/main/dither-main.c:60
+msgid "UniTone"
+msgstr "UniTone"
+
+#: src/main/dither-main.c:61
+msgid "Hybrid UniTone"
+msgstr "UniTone híbrido"
+
+#: src/main/dither-main.c:63
+msgid "Adaptive Hybrid"
+msgstr "Híbrido adaptativo"
+
+#: src/main/dither-main.c:64
+msgid "Ordered"
+msgstr "Ordenado"
+
+#: src/main/dither-main.c:65
+msgid "Ordered New"
+msgstr "Novo ordenado"
+
+#: src/main/dither-main.c:66
+msgid "Fast"
+msgstr "Rápido"
+
+#: src/main/dither-main.c:67
+msgid "Very Fast"
+msgstr "Moi rápido"
+
+#: src/main/dither-main.c:68
+msgid "Hybrid Floyd-Steinberg"
+msgstr "Floyd-Steinberg híbrido"
+
+#: src/main/dither-main.c:69
+msgid "Predithered Input"
+msgstr "Entrada pretramada"
+
+#: src/main/dither-main.c:70
+msgid "Drop Size Segmented"
+msgstr "Retirar o tamaño segmentado"
+
+#: src/main/dither-main.c:71
+msgid "Drop Size Segmented New"
+msgstr "Retirar o novo tamaño segmentado"
+
+#: src/main/dither-main.c:91 src/main/print-color.c:56
+msgid "Density"
+msgstr "Densidade"
+
+#: 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 ""
+"Axusta a densidade (cantidade de tinta) da impresión. Reduza a densidade se "
+"a tinta chorrea ou mancha o papel; incremente a densidade se as áreas negras "
+"non son sólidas"
+
+#: src/main/dither-main.c:100
+msgid "Dither Algorithm"
+msgstr "Algoritmo de tramado"
+
+#: 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 ""
+"Elixa o algoritmo de tramado a usar.\n"
+"O Híbrido adaptiatvo normalmente produce a mellor calidade en xeral.\n"
+"O EvenTone (TonoUniforme) é un algoritmo novo e experimental que a miúdo "
+"produce excelentes resultados.\n"
+"O Ordenado é o máis rápido e produce unha calidade case tan boa como o "
+"anterior para fotografías.\n"
+"O Rápido e o Moi rápido son considerablemente máis rápidos, e funcionan ben "
+"para texto e arte liñal.\n"
+"O Floyd-Steinberg híbrido en xeral produce unha salida inferior."
+
+#: src/main/module.c:52
+msgid "Miscellaneous (unclassified)"
+msgstr "Misceláneo (sen clasificar)"
+
+#: src/main/module.c:53
+msgid "Family driver"
+msgstr "Familia do controlador"
+
+#: src/main/module.c:54
+msgid "Color conversion module"
+msgstr "Módulo de conversión da  cor"
+
+#: src/main/module.c:55
+msgid "Dither algorithm"
+msgstr "Algoritmo de tramado"
+
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
+#: src/main/print-pcl.c:1346 src/main/print-ps.c:74
+msgid "Page Size"
+msgstr "Tamaño da páxina"
+
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1347 src/main/print-ps.c:75
+msgid "Size of the paper being printed to"
+msgstr "Tamaño do papel onde se imprimirá"
+
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
+msgid "Media Type"
+msgstr "Tipo de medio"
+
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
+#: src/main/print-pcl.c:1353
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr "Tipo de papel (papel normal, papel fotográfico, etc.)"
+
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
+msgid "Media Source"
+msgstr "Orixe dos medios"
+
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
+#: src/main/print-pcl.c:1359
+msgid "Source (input slot) of the media"
+msgstr "Orixe do soporte (rañura de entrada)"
+
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
+msgid "CD Hub Size"
+msgstr "Tamaño do oco do CD"
+
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Imprimir só fora do oco do CD, ou ata o fin do burato"
+
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
+msgid "CD Size (Custom)"
+msgstr "Tamaño de CD (personalizado)"
+
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr "Axuste variábel para o diámetro externo do CD"
+
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
+msgid "CD Hub Size (Custom)"
+msgstr "Tamaño do oco do CD (personalizado)"
+
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Axuste variábel ao oco interior do CD"
+
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
+msgid "CD Horizontal Fine Adjustment"
+msgstr "Axuste fino horizontal do CD"
+
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
+#: src/main/print-escp2.c:211 src/main/print-escp2.c:217
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Axuste fino da posición horizontal para impresión de CD"
+
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
+msgid "CD Vertical Fine Adjustment"
+msgstr "Axuste fino vertical do CD"
+
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
+msgid "Resolution"
+msgstr "Resolución"
+
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
+msgid "Resolution and quality of the print"
+msgstr "Resolución e calidade da impresión"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
+#: src/main/print-pcl.c:1376 src/main/print-raw.c:80
+msgid "Ink Type"
+msgstr "Tipo de tinta"
+
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
+#: src/main/print-raw.c:81
+msgid "Type of ink in the printer"
+msgstr "Tipo de tinta da impresora"
+
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:324
+#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
+#: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
+msgid "Ink Channels"
+msgstr "Canes de inxección"
+
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
+#: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
+msgid "Printing Mode"
+msgstr "Modo de impresión"
+
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
+#: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
+msgid "Printing Output Mode"
+msgstr "Modo de saída de impresión"
+
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Xogo de tintas"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tipo de tinta da impresora"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Sen bordo"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Imprimir sen bordos"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
+#: src/main/print-pcl.c:1394
+msgid "Double-Sided Printing"
+msgstr "Impresión a dúas caras"
+
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
+#: src/main/print-pcl.c:1395
+msgid "Duplex/Tumble Setting"
+msgstr "Opcións de dúplex/volteado"
+
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:163
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Calidade de impresión"
+
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
+msgid "Cyan Density"
+msgstr "Densidade de cian"
+
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
+msgid "Adjust the cyan density"
+msgstr "Axusta a densidade de cian"
+
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
+msgid "Magenta Density"
+msgstr "Densidade de maxenta"
+
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
+msgid "Adjust the magenta density"
+msgstr "Axusta a densidade de maxenta"
+
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
+msgid "Yellow Density"
+msgstr "Densidade de amarelo"
+
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
+msgid "Adjust the yellow density"
+msgstr "Axusta a densidade doa amarelo"
+
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
+msgid "Black Density"
+msgstr "Densidade de negro"
+
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
+msgid "Adjust the black density"
+msgstr "Axusta a densidade de negro"
+
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
+#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
+#: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
+msgid "Light Cyan Transition"
+msgstr "Transición a cian claro"
+
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
+#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
+#: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
+msgid "Light Magenta Transition"
+msgstr "Transición a maxenta claro"
+
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
+msgid "Light Yellow Transition"
+msgstr "Transición a amarelo claro"
+
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
+msgid "Off"
+msgstr "Desactivado"
+
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
+#: src/main/print-pcl.c:1684
+msgid "Long Edge (Standard)"
+msgstr "Marxe longa (estándar)"
+
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
+msgid "Short Edge (Flip)"
+msgstr "Marxe estreita (xirar)"
+
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
+msgid "CD - 5 inch"
+msgstr "CD - 5 polgadas"
+
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
+msgid "CD - 3 inch"
+msgstr "CD - 3 polgadas"
+
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
+msgid "CD - Custom"
+msgstr "CD - Personalizado"
+
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
+msgid "Normal"
+msgstr "Normal"
+
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
+msgid "Print To Hub"
+msgstr "Imprimir a oco"
+
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
+msgid "Black and White"
+msgstr "Branco e negro"
+
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Ambos"
+
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
+#: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
+#: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2706 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2747
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2823
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2888 src/xml/xmli18n-tmp.h:2902
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2928
+#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2969 src/xml/xmli18n-tmp.h:2982
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3008
+#: 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:3077 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3176 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3226
+#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3309
+#: src/xml/xmli18n-tmp.h:3321 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:3382
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3588 src/xml/xmli18n-tmp.h:3600
+#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3652
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3701 src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:3749 src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
+msgid "Black"
+msgstr "Negro"
+
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Fotografía"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Ningún"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Control manual"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Estándar"
+
+#: src/main/print-color.c:50
+msgid "High Accuracy"
+msgstr "Alta precisión"
+
+#: src/main/print-color.c:51
+msgid "Bright Colors"
+msgstr "Cores brillantes"
+
+#: src/main/print-color.c:52
+msgid "Correct Hue Only"
+msgstr "Corrixir só a tonalidade"
+
+#: src/main/print-color.c:53
+msgid "Uncorrected"
+msgstr "Sen corrección"
+
+#: src/main/print-color.c:54
+msgid "Desaturated"
+msgstr "Sen saturación"
+
+#: src/main/print-color.c:55
+msgid "Threshold"
+msgstr "Limiar"
+
+#: src/main/print-color.c:57 src/main/print-color.c:133
+msgid "Raw"
+msgstr "Cru"
+
+#: src/main/print-color.c:58
+msgid "Pre-Dithered"
+msgstr "Pretramado"
+
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
+msgid "Grayscale"
+msgstr "Escala de grises"
+
+#: src/main/print-color.c:123
+msgid "Whitescale"
+msgstr "Escala de brancos"
+
+#: 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:1300 src/cups/genppd.c:2368
+msgid "CMYK"
+msgstr "CMYK"
+
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
+msgid "KCMY"
+msgstr "KCMY"
+
+#: src/main/print-color.c:165 src/main/print-color.c:454
+msgid "Channel "
+msgstr "Canle "
+
+#: src/main/print-color.c:166
+msgid "Gamma for raw channel "
+msgstr "Gamma para a canle de cru "
+
+#: src/main/print-color.c:176
+msgid "Color Correction"
+msgstr "Corrección da cor"
+
+#: src/main/print-color.c:177
+msgid "Color correction to be applied"
+msgstr "Corrección da cor a aplicar"
+
+#: src/main/print-color.c:184
+msgid "Channel Bit Depth"
+msgstr "Profundidade da canle en bits"
+
+#: src/main/print-color.c:185
+msgid "Bit depth per channel"
+msgstr "Profundidade de bits por canle"
+
+#: src/main/print-color.c:192
+msgid "Input Image Type"
+msgstr "Tipo de imaxe de entrada"
+
+#: src/main/print-color.c:193
+msgid "Input image type"
+msgstr "Tipo de imaxe de entrada"
+
+#: src/main/print-color.c:200
+msgid "Output Image Type"
+msgstr "Tipo de imaxe de saída"
+
+#: src/main/print-color.c:201
+msgid "Output image type"
+msgstr "Tipo de imaxe de saída"
+
+#: src/main/print-color.c:208 src/main/print-color.c:209
+#: src/main/print-escp2.c:347
+msgid "Raw Channels"
+msgstr "Canles en cru"
+
+#: src/main/print-color.c:216
+msgid "SimpleGamma"
+msgstr "GammaSimple"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr "Non corrixir para o gamma da pantalla"
+
+#: src/main/print-color.c:224
+msgid "Brightness"
+msgstr "Brillo"
+
+#: src/main/print-color.c:225
+msgid "Brightness of the print"
+msgstr "Brillo da impresión"
+
+#: src/main/print-color.c:232
+msgid "Contrast"
+msgstr "Contraste"
+
+#: src/main/print-color.c:233
+msgid "Contrast of the print (0 is solid gray)"
+msgstr "Contraste da impresión (0 é gris escuro)"
+
+#: src/main/print-color.c:240
+msgid "Linear Contrast Adjustment"
+msgstr "Axuste do contraste liñal"
+
+#: src/main/print-color.c:241
+msgid "Use linear vs. fixed end point contrast adjustment"
+msgstr "Usar axuste liñal de contraste de punto final no canto deaxuste fijo"
+
+#: src/main/print-color.c:248
+msgid "Composite Gamma"
+msgstr "Gamma composto"
+
+#: 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 ""
+"Ajusta o gamma da impresión. Valores más grandes producirán xeralmente unha "
+"impresión máis clara, mentres que valores máis pequenos producirán "
+"xeralmente unha impresión máis escura. "
+
+#: src/main/print-color.c:258
+msgid "AppGamma"
+msgstr "AppGamma"
+
+#: src/main/print-color.c:259
+msgid "Gamma value assumed by application"
+msgstr "Valor gamma estabelecido polo aplicativo"
+
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2735 src/xml/xmli18n-tmp.h:2748
+#: src/xml/xmli18n-tmp.h:2760 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2824
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2889 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:2929
+#: src/xml/xmli18n-tmp.h:2943 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:2970 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3009
+#: 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:3078 src/xml/xmli18n-tmp.h:3093
+#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3165
+#: src/xml/xmli18n-tmp.h:3177 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: 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:3383 src/xml/xmli18n-tmp.h:3396
+#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3426
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3456
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3576
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3601
+#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:3641 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3687
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:3731 src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
+msgid "Cyan"
+msgstr "Cian"
+
+#: src/main/print-color.c:267
+msgid "Adjust the cyan gamma"
+msgstr "Axustar o gamma de cian"
+
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2723
+#: src/xml/xmli18n-tmp.h:2736 src/xml/xmli18n-tmp.h:2749
+#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2865 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2904
+#: src/xml/xmli18n-tmp.h:2917 src/xml/xmli18n-tmp.h:2930
+#: src/xml/xmli18n-tmp.h:2944 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3064
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3094
+#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3130 src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3166
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3255 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3283 src/xml/xmli18n-tmp.h:3296
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: 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:3384 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3425
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3487
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3520
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:3590 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3627
+#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3669 src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3730 src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:3757 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3927 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
+msgid "Magenta"
+msgstr "Maxenta"
+
+#: src/main/print-color.c:275
+msgid "Adjust the magenta gamma"
+msgstr "Axustar o gamma de maxenta"
+
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
+#: src/xml/xmli18n-tmp.h:2677 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2877
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2918 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3095
+#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3179 src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3361 src/xml/xmli18n-tmp.h:3373
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3398
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3486
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3615 src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3655
+#: src/xml/xmli18n-tmp.h:3665 src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:3704 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3732 src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3849 src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:3875 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
+msgid "Yellow"
+msgstr "Amarelo"
+
+#: src/main/print-color.c:283
+msgid "Adjust the yellow gamma"
+msgstr "Ajustar o gamma de amarelo"
+
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
+#: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
+msgid "Red"
+msgstr "Vermello"
+
+#: src/main/print-color.c:291
+msgid "Adjust the red gamma"
+msgstr "Axustar o gamma de vermello"
+
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
+msgid "Green"
+msgstr "Verde"
+
+#: src/main/print-color.c:299
+msgid "Adjust the green gamma"
+msgstr "Axustar o gamma de verde"
+
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
+#: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
+msgid "Blue"
+msgstr "Azul"
+
+#: src/main/print-color.c:307
+msgid "Adjust the blue gamma"
+msgstr "Axustar o gamma de azul"
+
+#: src/main/print-color.c:315
+msgid "Adjust the black gamma"
+msgstr "Axustar o gamma de negro"
+
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
+msgid "Cyan Balance"
+msgstr "Balance de cian"
+
+#: src/main/print-color.c:323
+msgid "Adjust the cyan gray balance"
+msgstr "Axustar o balance de cian"
+
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
+msgid "Magenta Balance"
+msgstr "Balance de maxenta"
+
+#: src/main/print-color.c:331
+msgid "Adjust the magenta gray balance"
+msgstr "Axustar o balance de maxenta"
+
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
+msgid "Yellow Balance"
+msgstr "Balance de amarelo"
+
+#: src/main/print-color.c:339
+msgid "Adjust the yellow gray balance"
+msgstr "Axustar o balance de amarelo"
+
+#: src/main/print-color.c:346
+msgid "Saturation"
+msgstr "Saturación"
+
+#: src/main/print-color.c:347
+msgid ""
+"Adjust the saturation (color balance) of the print\n"
+"Use zero saturation to produce grayscale output using color and black inks"
+msgstr ""
+"Axusta a saturación (balance de cor) da impresión\n"
+"Usar saturación cero para producir unha saída de tons de grises usando "
+"tintas de cor e negra."
+
+#: src/main/print-color.c:357
+msgid "Ink Limit"
+msgstr "Límite da tinta"
+
+#: src/main/print-color.c:358
+msgid "Limit the total ink printed to the page"
+msgstr "Limitar a tinta empregada na páxina"
+
+#: src/main/print-color.c:365 src/main/print-escp2.c:878
+msgid "GCR Transition"
+msgstr "Transición GCR"
+
+#: src/main/print-color.c:366 src/main/print-escp2.c:879
+msgid "Adjust the gray component transition rate"
+msgstr "Axustar a taxa de transición do compoñente gris"
+
+#: src/main/print-color.c:373 src/main/print-escp2.c:886
+msgid "GCR Lower Bound"
+msgstr "Límite inferior RCG"
+
+#: src/main/print-color.c:374 src/main/print-escp2.c:887
+msgid "Lower bound of gray component reduction"
+msgstr "Límite inferior da redución do compoñente gris"
+
+#: src/main/print-color.c:381 src/main/print-escp2.c:894
+msgid "GCR Upper Bound"
+msgstr "Límite superior RCG"
+
+#: src/main/print-color.c:382 src/main/print-escp2.c:895
+msgid "Upper bound of gray component reduction"
+msgstr "Límite superior da redución do compoñente gris"
+
+#: src/main/print-color.c:421
+msgid "LUT dump file"
+msgstr "Ficheiro de envorcado LUT"
+
+#: src/main/print-color.c:421
+msgid "Advanced Output Control"
+msgstr "Control avanzado de saída"
+
+#: src/main/print-color.c:422
+msgid "Dump file for LUT for external color adjustment"
+msgstr "Envorcar o ficheiro para LUT para o axuste de cor externo"
+
+#: src/main/print-color.c:456
+msgid "Curve for raw channel "
+msgstr "Curva para a canle de cru "
+
+#: src/main/print-color.c:466
+msgid "Cyan Curve"
+msgstr "Curva de cian"
+
+#: src/main/print-color.c:467
+msgid "Cyan curve"
+msgstr "Curva de cian"
+
+#: src/main/print-color.c:474
+msgid "Magenta Curve"
+msgstr "Curva de maxenta"
+
+#: src/main/print-color.c:475
+msgid "Magenta curve"
+msgstr "Curva de maxenta"
+
+#: src/main/print-color.c:482
+msgid "Yellow Curve"
+msgstr "Curva de amarelo"
+
+#: src/main/print-color.c:483
+msgid "Yellow curve"
+msgstr "Curva de amarelo"
+
+#: src/main/print-color.c:490
+msgid "Black Curve"
+msgstr "Curva de negro"
+
+#: src/main/print-color.c:491
+msgid "Black curve"
+msgstr "Curva de negro"
+
+#: src/main/print-color.c:498
+msgid "Red Curve"
+msgstr "Curva de vermello"
+
+#: src/main/print-color.c:499
+msgid "Red curve"
+msgstr "Curva de vermello"
+
+#: src/main/print-color.c:506
+msgid "Green Curve"
+msgstr "Curva de verde"
+
+#: src/main/print-color.c:507
+msgid "Green curve"
+msgstr "Curva de verde"
+
+#: src/main/print-color.c:514
+msgid "Blue Curve"
+msgstr "Curva de azul"
+
+#: src/main/print-color.c:515
+msgid "Blue curve"
+msgstr "Curva de azul"
+
+#: src/main/print-color.c:522
+msgid "White Curve"
+msgstr "Curva de branco"
+
+#: src/main/print-color.c:523
+msgid "White curve"
+msgstr "Curva de branco"
+
+#: src/main/print-color.c:530
+msgid "Hue Map"
+msgstr "Mapa de tonalidades"
+
+#: src/main/print-color.c:531
+msgid "Hue adjustment curve"
+msgstr "Curva de axuste de tonalidade"
+
+#: src/main/print-color.c:538
+msgid "Saturation Map"
+msgstr "Mapa de saturación"
+
+#: src/main/print-color.c:539
+msgid "Saturation adjustment curve"
+msgstr "Curva de axuste da saturación"
+
+#: src/main/print-color.c:546
+msgid "Luminosity Map"
+msgstr "Mapa de luminosidade"
+
+#: src/main/print-color.c:547
+msgid "Luminosity adjustment curve"
+msgstr "Curva de axuste da luminosidade"
+
+#: src/main/print-color.c:554
+msgid "Gray Component Reduction"
+msgstr "Redución do compoñente gris"
+
+#: src/main/print-color.c:555
+msgid "Gray component reduction curve"
+msgstr "Curva de redución do compoñente gris"
+
+#: src/main/print-color.c:1740
+msgid "Traditional Gutenprint color conversion"
+msgstr "Conversión da cor tradicional de Gutenprint"
+
+#: src/main/printers.c:597
+#, c-format
+msgid "Value must be set for %s\n"
+msgstr "O valor debese estabelecer a %s\n"
+
+#: src/main/printers.c:610 src/main/printers.c:615
+#, c-format
+msgid "`%s' is not a valid %s\n"
+msgstr "«%s» non é un %s corecto\n"
+
+#: src/main/printers.c:634
+#, c-format
+msgid "%s must be between %f and %f (is %f)\n"
+msgstr "%s debe ser entre %f e %f (es %f)\n"
+
+#: src/main/printers.c:656 src/main/printers.c:680
+#, c-format
+msgid "%s must be between %d and %d (is %d)\n"
+msgstr "%s debe ser entre %d e %d (es %d)\n"
+
+#: src/main/printers.c:711
+#, c-format
+msgid "%s bounds must be between %f and %f\n"
+msgstr "Os límites de %s deben ser entre %f e %f\n"
+
+#: src/main/printers.c:719
+#, c-format
+msgid "%s wrap mode must be %s\n"
+msgstr "%s o modo de axuste de liña debe ser %s\n"
+
+#: src/main/printers.c:723
+msgid "no wrap"
+msgstr "sen axuste de liña"
+
+#: src/main/printers.c:723
+msgid "wrap around"
+msgstr "envolver"
+
+#: src/main/printers.c:767
+#, c-format
+msgid "Unknown type parameter %s (%d)\n"
+msgstr "Parámetro de tipo descoñecido %s (%d)\n"
+
+#: src/main/printers.c:780 src/main/printers.c:791
+#, c-format
+msgid "%s out of range (value %d, min %d, max %d)\n"
+msgstr "%s fora de límites (valor %d, mín %d, máx %d)\n"
+
+#: src/main/printers.c:851
+msgid "Page size is not valid\n"
+msgstr "O tamaño da páxina non é correcto\n"
+
+#: src/main/printers.c:872
+#, c-format
+msgid "Top margin must not be less than %d\n"
+msgstr "A marxe superior non debe ser inferior a %d\n"
+
+#: src/main/printers.c:878
+#, c-format
+msgid "Left margin must not be less than %d\n"
+msgstr "A marxe esquerda non debe ser inferior a %d\n"
+
+#: src/main/printers.c:884
+msgid "Height must be greater than zero\n"
+msgstr "A altura debe ser maior que cero\n"
+
+#: src/main/printers.c:890
+msgid "Width must be greater than zero\n"
+msgstr "A largura debe ser maior que cero\n"
+
+#: src/main/printers.c:896
+#, c-format
+msgid ""
+"Image is too wide for the page: left margin is %d, width %d, right edge is "
+"%d\n"
+msgstr ""
+"A imaxe é larga de máis para a páxina: a marxe esquerda é %d, largura %d, a "
+"marxe dereita é %d\n"
+
+#: src/main/printers.c:903
+#, c-format
+msgid ""
+"Image is too long for the page: top margin is %d, height %d, bottom edge is "
+"%d\n"
+msgstr ""
+"A imaxe é alta de máis para a páxina: a marxe superior é %d, altura %d, a "
+"marxe inferior é %d\n"
+
+#: src/main/print-escp2.c:150
+msgid "Automatic Printing Mode"
+msgstr "Modo automático de impresión"
+
+#: src/main/print-escp2.c:151
+msgid "Automatic printing mode"
+msgstr "Modo automático de impresión"
+
+#: src/main/print-escp2.c:222
+msgid "CD Allow Other Media Sizes"
+msgstr "Permitir outros tamaños de soporte CD"
+
+#: src/main/print-escp2.c:223
+msgid "Allow non-CD media sizes when printing to CD"
+msgstr ""
+"Permitir outros tamaños de soporte distintos aos dun CD ao imprimir nun CD"
+
+#: src/main/print-escp2.c:229 src/main/print-pcl.c:1371
+msgid "Resolution of the print"
+msgstr "Resolución da impresión"
+
+#: src/main/print-escp2.c:245
+msgid "Enhanced Gloss"
+msgstr "Brillo mellorado"
+
+#: src/main/print-escp2.c:246
+msgid "Add gloss enhancement"
+msgstr "Engadir mellora do brillo"
+
+#: src/main/print-escp2.c:257
+msgid "Printing Direction"
+msgstr "Dirección de impresión"
+
+#: src/main/print-escp2.c:258
+msgid "Printing direction (unidirectional is higher quality, but slower)"
+msgstr ""
+"Dirección de impresión (unidireccional da maior calidade, mais é es máis "
+"lento)"
+
+#: src/main/print-escp2.c:269
+msgid "Interleave Method"
+msgstr "Método de entrelazado"
+
+#: src/main/print-escp2.c:270
+msgid "Interleave pattern to use"
+msgstr "Modelo de entrelazado a usar"
+
+#: src/main/print-escp2.c:275 src/main/print-escp2.c:276
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
+msgid "Output Order"
+msgstr "Orden de saída"
+
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
+msgid "Alignment Passes"
+msgstr "Pasos de aliñamento"
+
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
+msgid "Alignment Choices"
+msgstr "Opcións de aliñamento"
+
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
+msgid "Ink change command"
+msgstr "Orde de cambio de tinta"
+
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
+msgid "Alternate Alignment Passes"
+msgstr "Alternar pasos de aliñamento"
+
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
+msgid "Alternate Alignment Choices"
+msgstr "Alernar opcións de aliñamento"
+
+#: src/main/print-escp2.c:311
+msgid "Supports Packet Mode"
+msgstr "Admite o modo paquete"
+
+#: src/main/print-escp2.c:312
+msgid "Supports D4 Packet Mode"
+msgstr "Admite o modo de paquetes D4"
+
+#: src/main/print-escp2.c:317
+msgid "Has Interchangeable Ink Cartridges"
+msgstr "Ten cartuchos de tinta intercambiábeis"
+
+#: src/main/print-escp2.c:318
+msgid "Has multiple choices of ink cartridges"
+msgstr "Ten múltiples eleccións de cartuchos de tinta"
+
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
+msgid "Raw Channel Names"
+msgstr "Nomes de canles RAW (en cru)"
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
+msgid "Channel Names"
+msgstr "Nomes das canles"
+
+#: src/main/print-escp2.c:348
+msgid "Raw Channel Count"
+msgstr "Contador de saída en cru"
+
+#: src/main/print-escp2.c:353
+msgid "Cyan Map"
+msgstr "Mapa de cian"
+
+#: src/main/print-escp2.c:354
+msgid "Adjust the cyan map"
+msgstr "Axustar o mapa de cian"
+
+#: src/main/print-escp2.c:359
+msgid "Magenta Map"
+msgstr "Mapa de maxenta"
+
+#: src/main/print-escp2.c:360
+msgid "Adjust the magenta map"
+msgstr "Axustar o mapa de maxenta"
+
+#: src/main/print-escp2.c:365
+msgid "Yellow Map"
+msgstr "Mapa de amarelo"
+
+#: src/main/print-escp2.c:366
+msgid "Adjust the yellow map"
+msgstr "Axusta o mapa de amarelo"
+
+#: src/main/print-escp2.c:371
+msgid "Blue Map"
+msgstr "Mapa de azul"
+
+#: src/main/print-escp2.c:372
+msgid "Adjust the blue map"
+msgstr "Axustar o mapa de azul"
+
+#: src/main/print-escp2.c:377
+msgid "Orange Map"
+msgstr "Mapa laranxa"
+
+#: src/main/print-escp2.c:378
+msgid "Adjust the orange map"
+msgstr "Axustar o mapa de laranxa"
+
+#: src/main/print-escp2.c:383
+msgid "Red Map"
+msgstr "Mapa de vermello"
+
+#: src/main/print-escp2.c:384
+msgid "Adjust the red map"
+msgstr "Axustar o mapa de vermello"
+
+#: src/main/print-escp2.c:486
+msgid "Red Density"
+msgstr "Densidad de vermello"
+
+#: src/main/print-escp2.c:487
+msgid "Adjust the red density"
+msgstr "Axustar a densidade d vermello"
+
+#: src/main/print-escp2.c:494
+msgid "Blue Density"
+msgstr "Densidade de azul"
+
+#: src/main/print-escp2.c:495
+msgid "Adjust the blue density"
+msgstr "Axustar a densidade de azul"
+
+#: src/main/print-escp2.c:502
+msgid "Orange Density"
+msgstr "Densidade de laranxa"
+
+#: src/main/print-escp2.c:503
+msgid "Adjust the orange density"
+msgstr "Axustar a densidade de laranxa"
+
+#: src/main/print-escp2.c:510
+msgid "Gloss Level"
+msgstr "Nivel de brillo"
+
+#: src/main/print-escp2.c:511
+msgid "Adjust the gloss level"
+msgstr "Axustar o nivel de brillo"
+
+#: src/main/print-escp2.c:518
+msgid "Drop Size Small"
+msgstr "Gota de pequeno tamaño"
+
+#: src/main/print-escp2.c:519
+msgid "Drop Size 1 (small)"
+msgstr "Gota de tamaño 1(pequeno)"
+
+#: src/main/print-escp2.c:526
+msgid "Drop Size Medium"
+msgstr "Gota de tamaño medio"
+
+#: src/main/print-escp2.c:527
+msgid "Drop Size 2 (medium)"
+msgstr "Gota de tamaño 2 (medio)"
+
+#: src/main/print-escp2.c:534
+msgid "Drop Size Large"
+msgstr "Gota de tamaño grande"
+
+#: src/main/print-escp2.c:535
+msgid "Drop Size 3 (large)"
+msgstr "Gota de tamaño 3 (grande)"
+
+#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+msgid "Light Cyan Value"
+msgstr "Valor de cian claro"
+
+#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+msgid "Light Cyan Density Scale"
+msgstr "Escala de densidade de cian claro"
+
+#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+msgid "Light Magenta Value"
+msgstr "Valor de maxenta claro"
+
+#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+msgid "Light Magenta Density Scale"
+msgstr "Escala de densidade maxenta claro"
+
+#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+msgid "Dark Yellow Value"
+msgstr "Valor de amarelo escuro"
+
+#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
+msgid "Dark Yellow Transition"
+msgstr "Transición a amarelo escuro"
+
+#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
+msgid "Dark Yellow Density Scale"
+msgstr "Escala de densidade de amarelo escuro"
+
+#: src/main/print-escp2.c:614 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:638 src/main/print-escp2.c:639
+msgid "Gray Value"
+msgstr "Valor de gris"
+
+#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
+msgid "Gray Transition"
+msgstr "Transición a gris"
+
+#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
+msgid "Gray Density Scale"
+msgstr "Escala de densidade de gris"
+
+#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+msgid "Light Gray Value"
+msgstr "Valor para gris claro"
+
+#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:742 src/main/print-escp2.c:743
+msgid "Light Gray Transition"
+msgstr "Transición a gris claro"
+
+#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:750 src/main/print-escp2.c:751
+msgid "Light Gray Density Scale"
+msgstr "Escala de densidade de gris claro"
+
+#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+msgid "Dark Gray Value"
+msgstr "Valor de gris escuro"
+
+#: src/main/print-escp2.c:694 src/main/print-escp2.c:695
+msgid "Dark Gray Transition"
+msgstr "Transición a gris escuro"
+
+#: src/main/print-escp2.c:702 src/main/print-escp2.c:703
+msgid "Dark Gray Density Scale"
+msgstr "Escala de densidade de gris escuro"
+
+#: src/main/print-escp2.c:710
+msgid "Mid Gray Value"
+msgstr "Valor de gris medio"
+
+#: src/main/print-escp2.c:711
+msgid "Medium Gray Value"
+msgstr "Valor de gris medio"
+
+#: src/main/print-escp2.c:718
+msgid "Mid Gray Transition"
+msgstr "Transición de gris medio"
+
+#: src/main/print-escp2.c:719
+msgid "Medium Gray Transition"
+msgstr "Transición de gris medio"
+
+#: src/main/print-escp2.c:726
+msgid "Mid Gray Density Scale"
+msgstr "Escala de densidade de cian medio"
+
+#: src/main/print-escp2.c:727
+msgid "Medium Gray Density Scale"
+msgstr "Escala de densidade de gris medio"
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 Value"
+msgstr "Valor de Gris 5 Hextone"
+
+#: src/main/print-escp2.c:759
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr "Valor de Gris 5 Hextone (máis escuro)"
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 Transition"
+msgstr "Transición de Gris 5 Hextone"
+
+#: src/main/print-escp2.c:767
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Transición de Gris 5 Hextone (máis escuro)"
+
+#: src/main/print-escp2.c:774
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Escala de densidade  de Gris 5 Hextone"
+
+#: src/main/print-escp2.c:775
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Escala de densidade  de Gris 5 Hextone (máis escuro)"
+
+#: src/main/print-escp2.c:782 src/main/print-escp2.c:783
+msgid "Hextone Gray 4 Value"
+msgstr "Valor de Gris 4 Hextone"
+
+#: src/main/print-escp2.c:790 src/main/print-escp2.c:791
+msgid "Hextone Gray 4 Transition"
+msgstr "Transición de Gris 4 Hextone"
+
+#: src/main/print-escp2.c:798 src/main/print-escp2.c:799
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Escala de densidade de Gris 4 Hextone"
+
+#: src/main/print-escp2.c:806 src/main/print-escp2.c:807
+msgid "Hextone Gray 3 Value"
+msgstr "Valor de Gris 3 Hextone"
+
+#: src/main/print-escp2.c:814 src/main/print-escp2.c:815
+msgid "Hextone Gray 3 Transition"
+msgstr "Transición de Gris 3 Hextone"
+
+#: src/main/print-escp2.c:822 src/main/print-escp2.c:823
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Escala de densidade de Gris 3 Hextone"
+
+#: src/main/print-escp2.c:830 src/main/print-escp2.c:831
+msgid "Hextone Gray 2 Value"
+msgstr "Valor de Gris 2 Hextone"
+
+#: src/main/print-escp2.c:838 src/main/print-escp2.c:839
+msgid "Hextone Gray 2 Transition"
+msgstr "Transición de Gris 2 Hextone"
+
+#: src/main/print-escp2.c:846 src/main/print-escp2.c:847
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Escala de densidade de Gris 2 Hextone"
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 Value"
+msgstr "Valor de Gris 1 Hextone"
+
+#: src/main/print-escp2.c:855
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr "Valor de Gris 1 Hextone (máis claro)"
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 Transition"
+msgstr "Transición de Gris 1 Hextone"
+
+#: src/main/print-escp2.c:863
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Transición de Gris 1 Hextone (máis claro)"
+
+#: src/main/print-escp2.c:870
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Escala de densidade de Gris 1 Hextone"
+
+#: src/main/print-escp2.c:871
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Escala de densidade de Gris 1 Hextone (máis claro)"
+
+#: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
+msgid "Drying Time Per Page"
+msgstr "Tempo de secado por páxina"
+
+#: src/main/print-escp2.c:911
+msgid "Set drying time per page"
+msgstr "Estabelecer o tempo de secado por páxina"
+
+#: src/main/print-escp2.c:918
+msgid "Drying Time Per Scan"
+msgstr "Tempo de secado por exploración"
+
+#: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr "Estabelecer o tempo de secado por exploración"
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr "Tempo de secado mínimo por exploración"
+
+#: src/main/print-escp2.c:927
+msgid "Set minimum drying time per scan"
+msgstr "Estabelecer o tempo de secado mínimo por exploración"
+
+#: src/main/print-escp2.c:942
+msgid "Quality Enhancement"
+msgstr "Mellora da calidade"
+
+#: src/main/print-escp2.c:943
+msgid "Enhance print quality by additional passes"
+msgstr "Mellorar a calidade de impresión con pasadas adicionais"
+
+#: src/main/print-escp2.c:950
+msgid "Paper Thickness"
+msgstr "Groso do papel"
+
+#: src/main/print-escp2.c:951
+msgid "Set printer paper thickness"
+msgstr "Estabelecer o grosor do papel de impresión"
+
+#: src/main/print-escp2.c:958
+msgid "Vacuum Intensity"
+msgstr "Intensidade de baleiro"
+
+#: src/main/print-escp2.c:959
+msgid "Set vacuum intensity (printer-specific)"
+msgstr "Estabelecer a intensidade do baleiro (impresora específica)"
+
+#: src/main/print-escp2.c:966
+msgid "Feed Sequence"
+msgstr "Secuencia de alimentación"
+
+#: src/main/print-escp2.c:967
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+"Estabelecer a secuencia de alimentación de papel (impresora específica)"
+
+#: src/main/print-escp2.c:974
+msgid "Print Method"
+msgstr "Método de impresión"
+
+#: src/main/print-escp2.c:975
+msgid "Set print method (printer-specific)"
+msgstr "Estabelecer o método de impresión (impresora específica)"
+
+#: src/main/print-escp2.c:982
+msgid "Platen Gap"
+msgstr "Distancia do cabezallo"
+
+#: src/main/print-escp2.c:983
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+"Estabelecer a separación entre o cabezallo e o papel (específica da "
+"impresora)"
+
+#: src/main/print-escp2.c:990
+msgid "Feed Adjustment"
+msgstr "Axuste de alimentación"
+
+#: src/main/print-escp2.c:992
+#, no-c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr "Estabelecer o axuste de alimentación do papel (0.01% unidades)"
+
+#: src/main/print-escp2.c:2214
+msgid "Full Manual Control"
+msgstr "Control manual total"
+
+#: src/main/print-escp2.c:2216
+msgid "Automatic Setting Control"
+msgstr "Configuración do control automático"
+
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
+msgid "Automatic"
+msgstr "Automático"
+
+#: src/main/print-escp2.c:2439
+msgid "Bidirectional"
+msgstr "Bidireccional"
+
+#: src/main/print-escp2.c:2441
+msgid "Unidirectional"
+msgstr "Unidireccional"
+
+#: src/main/print-escp2.c:2472
+msgid "Alternate Fill"
+msgstr "Alternar o recheo"
+
+#: src/main/print-escp2.c:2474
+msgid "Ascending Fill"
+msgstr "Recheo ascendente"
+
+#: src/main/print-escp2.c:2476
+msgid "Descending Fill"
+msgstr "Recheo descendente"
+
+#: src/main/print-escp2.c:2478
+msgid "Ascending Double"
+msgstr "Dobre ascendente"
+
+#: src/main/print-escp2.c:2480
+msgid "Nearest Neighbor Avoidance"
+msgstr "Evitar aos veciños máis próximos"
+
+#: src/main/print-escp2.c:2516
+msgid "Short Edge(Flip)"
+msgstr "Lado curto (voltear)"
+
+#: src/main/print-escp2.c:3134
+#, c-format
+msgid "This printer does not support raw printer output at depth %d\n"
+msgstr "Esta impresora non admite a saída en cru á profundidade %d\n"
+
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
+#: src/main/print-raw.c:218
+msgid "Print options not verified; cannot print.\n"
+msgstr "As opcións de impresión non se poden verifica; non se pode imprimir.\n"
+
+#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
+msgid "300 DPI x 600 DPI"
+msgstr "300 PPP x 600 PPP"
+
+#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
+msgid "600 DPI"
+msgstr "600 PPP"
+
+#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
+msgid "600 DPI high quality"
+msgstr "600 PPP alta calidade"
+
+#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
+msgid "600 DPI Unidirectional"
+msgstr "600 PPP Unidireccional"
+
+#: src/main/print-lexmark.c:581 src/main/print-lexmark.c:657
+msgid "1200 DPI"
+msgstr "1200 PPP"
+
+#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
+msgid "1200 DPI high quality"
+msgstr "1200 PPP alta calidade"
+
+#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
+msgid "1200 DPI highest quality"
+msgstr "1200 PPP moi alta calidade"
+
+#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
+msgid "1200 DPI  Unidirectional"
+msgstr "1200 PPP  Unidireccional"
+
+#: src/main/print-lexmark.c:585
+msgid "2400 DPI x 1200 DPI"
+msgstr "2400 PPP x 1200 PPP"
+
+#: src/main/print-lexmark.c:586
+msgid "2400 DPI x 1200 DPI high quality"
+msgstr "2400 PPP x 1200 PPP alta calidade"
+
+#: src/main/print-lexmark.c:587
+msgid "2400 DPI x 1200 DPI highest quality"
+msgstr "2400 PPP x 1200 PPP moi alta calidade"
+
+#: src/main/print-lexmark.c:589
+msgid "test print"
+msgstr "proba de impresión"
+
+#: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
+msgid "Four Color Standard"
+msgstr "Estándar de catro cores"
+
+#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
+msgid "Three Color Composite"
+msgstr "Tres cores compostos"
+
+#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
+msgid "Six Color Photo"
+msgstr "Fotografia de seis cores"
+
+#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
+msgid "Five Color Photo Composite"
+msgstr "Composición fotográfica a cinco cores"
+
+#: 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:469
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:927 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1712
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2054 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2177 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2546
+msgid "Plain Paper"
+msgstr "Papel normal"
+
+#: 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:374 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:825 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:933 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1152 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1596
+#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1837
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2063 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2552
+msgid "Glossy Film"
+msgstr "Filme brillante"
+
+#: 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:379
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:897 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1601 src/xml/xmli18n-tmp.h:1682
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1771
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:2020 src/xml/xmli18n-tmp.h:2066
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2186
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2518 src/xml/xmli18n-tmp.h:2554
+msgid "Transparencies"
+msgstr "Transparencias"
+
+#: 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:384
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:757 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1497
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2189
+#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2317
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2556
+msgid "Envelopes"
+msgstr "Sobres"
+
+#: 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:394
+#: src/xml/xmli18n-tmp.h:504 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1509
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1726 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2075
+#: src/xml/xmli18n-tmp.h:2135 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2325
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2524 src/xml/xmli18n-tmp.h:2560
+msgid "Matte Paper"
+msgstr "Papel mate"
+
+#: 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:409
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1962
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2333
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2564
+msgid "Inkjet Paper"
+msgstr "Papel para chorro de tinta"
+
+#: 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:414
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1527
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2566
+msgid "Photo Quality Inkjet Paper"
+msgstr "Papel de calidade fotográfica para chorro de tinta"
+
+#: 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:419
+#: src/xml/xmli18n-tmp.h:529 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:647 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1168
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2341
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2568
+msgid "Photo Paper"
+msgstr "Papel fotográfico"
+
+#: 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:424
+#: src/xml/xmli18n-tmp.h:534 src/xml/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1337
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1758 src/xml/xmli18n-tmp.h:1795
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2150 src/xml/xmli18n-tmp.h:2210
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2534 src/xml/xmli18n-tmp.h:2570
+msgid "Premium Glossy Photo Paper"
+msgstr "Papel fotográfico satinado premium"
+
+#: 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:439
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:656 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1702
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1801
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2216
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2574
+msgid "Premium Luster Photo Paper"
+msgstr "Papel fotográfico lustrado premium"
+
+#: 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:449
+#: src/xml/xmli18n-tmp.h:559 src/xml/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:797 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1352
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1656 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1746 src/xml/xmli18n-tmp.h:1810
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1992
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2433 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2576
+msgid "Photo Quality Glossy Paper"
+msgstr "Papel satinado de calidade fotográfica"
+
+#: 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:454
+#: src/xml/xmli18n-tmp.h:564 src/xml/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:921 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1706 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1902
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2048
+#: src/xml/xmli18n-tmp.h:2108 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2578
+msgid "Ilford Heavy Paper"
+msgstr "Papel pesado Ilford"
+
+#: 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:464
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2114
+#: src/xml/xmli18n-tmp.h:2174 src/xml/xmli18n-tmp.h:2234
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2445 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2582
+msgid "Other"
+msgstr "Outro"
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "Alimentador automático de follas"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr "Manual con pausa"
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr "Manual sen pausa"
+
+#: src/main/print-olympus.c:280
+msgid "Coated"
+msgstr "Recuberto"
+
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
+msgid "Glossy"
+msgstr "Brillante"
+
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
+msgid "Texture"
+msgstr "Textura"
+
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
+msgid "Matte"
+msgstr "Mate"
+
+#. TRANSLATORS: Some dye sublimation printers are able to 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:2034 src/main/print-olympus.c:2035
+msgid "Laminate Pattern"
+msgstr "Modelo laminado"
+
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
+msgid "Output Level Adjustment"
+msgstr "Axuste do nivel de saída"
+
+#: src/main/print-olympus.c:2070
+msgid "Adjust the cyan balance"
+msgstr "Axustar o balance de cian"
+
+#: src/main/print-olympus.c:2078
+msgid "Adjust the magenta balance"
+msgstr "Axustar o balance de maxenta"
+
+#: src/main/print-olympus.c:2086
+msgid "Adjust the yellow balance"
+msgstr "Axustar o balance de amarelo"
+
+#: src/main/print-olympus.c:2093
+msgid "Black Balance"
+msgstr "Balance de negro"
+
+#: src/main/print-olympus.c:2094
+msgid "Adjust the black balance"
+msgstr "Axustar o balance de negro"
+
+#: src/main/print-pcl.c:184
+msgid "Plain"
+msgstr "Simple"
+
+#: src/main/print-pcl.c:185
+msgid "Bond"
+msgstr "Vínculo"
+
+#: src/main/print-pcl.c:186
+msgid "Premium"
+msgstr "Premium"
+
+#: src/main/print-pcl.c:187
+msgid "Glossy Photo"
+msgstr "Foto brillante"
+
+#: src/main/print-pcl.c:188
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: src/main/print-pcl.c:189
+msgid "Quick-dry Photo"
+msgstr "Foto de secado rápido"
+
+#: src/main/print-pcl.c:190
+msgid "Quick-dry Transparency"
+msgstr "Transparencia de secado rápido"
+
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
+msgid "Manual"
+msgstr "Manual"
+
+#: src/main/print-pcl.c:239
+msgid "Manual - Movable Guides"
+msgstr "Manual - Guías móbiles"
+
+#: src/main/print-pcl.c:241
+msgid "Tray 1 - Movable Guides"
+msgstr "Bandexa 1 - Guías móbiles"
+
+#: src/main/print-pcl.c:242
+msgid "Tray 1"
+msgstr "Bandexa 1"
+
+#: src/main/print-pcl.c:243
+msgid "Tray 2 - Movable Guides"
+msgstr "Bandexa 2 - Guías móbiles"
+
+#: src/main/print-pcl.c:244 src/main/print-pcl.c:252
+msgid "Tray 2"
+msgstr "Bandexa 2"
+
+#: src/main/print-pcl.c:245
+msgid "Tray 3 - Movable Guides"
+msgstr "Bandexa 3 - Guías móbiles"
+
+#: src/main/print-pcl.c:246
+msgid "Tray 3"
+msgstr "Bandexa 3"
+
+#: src/main/print-pcl.c:247
+msgid "Tray 4 - Movable Guides"
+msgstr "Bandexa 4 - Guías móbiles"
+
+#: src/main/print-pcl.c:248
+msgid "Tray 4"
+msgstr "Bandexa 4"
+
+#: src/main/print-pcl.c:249
+msgid "Portable Sheet Feeder"
+msgstr "Alimentador de follas portátil"
+
+#: src/main/print-pcl.c:250
+msgid "Desktop Sheet Feeder"
+msgstr "Alimentador de follas de escritorio"
+
+#: src/main/print-pcl.c:251
+msgid "Tray"
+msgstr "Bandexa"
+
+#: src/main/print-pcl.c:253
+msgid "Optional Source"
+msgstr "Orixe opcional"
+
+#: src/main/print-pcl.c:254
+msgid "Autoselect"
+msgstr "Autoseleccionar"
+
+#: src/main/print-pcl.c:268
+msgid "150x150 DPI"
+msgstr "150x150 PPP"
+
+#: src/main/print-pcl.c:269
+msgid "300x300 DPI"
+msgstr "300x300 PPP"
+
+#: src/main/print-pcl.c:270
+msgid "600x300 DPI"
+msgstr "600x300 PPP"
+
+#: src/main/print-pcl.c:271
+msgid "600x600 DPI monochrome"
+msgstr "600x600 PPP monocromo"
+
+#: src/main/print-pcl.c:272
+msgid "600x600 DPI"
+msgstr "600x600 PPP"
+
+#: src/main/print-pcl.c:273
+msgid "1200x600 DPI"
+msgstr "1200x600 PPP"
+
+#: src/main/print-pcl.c:274
+msgid "2400x600 DPI"
+msgstr "2400x600 PPP"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
+msgid "Draft"
+msgstr "Borrador"
+
+#: src/main/print-pcl.c:282 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
+msgid "High"
+msgstr "Alto"
+
+#: src/main/print-pcl.c:1671
+msgid "Color + Black Cartridges"
+msgstr "Cor + cartuchos de negro"
+
+#: src/main/print-pcl.c:1672
+msgid "Color + Photo Cartridges"
+msgstr "Cor + cartuchos de fotos"
+
+#: src/main/print-ps.c:68
+msgid "PPDFile"
+msgstr "FicheiroPPD"
+
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
+msgid "PPD File"
+msgstr "Ficheiro PPD"
+
+#: src/main/print-ps.c:80
+msgid "Model Name"
+msgstr "Nome do modelo"
+
+#: src/main/print-ps.c:81
+msgid "PPD File Model Name"
+msgstr "Nome do modelo de ficheiro PPD"
+
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
+msgstr "Ningún; forneza un ficheiro PPD"
+
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
+msgid "Letter"
+msgstr "Carta"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
+msgid "Custom"
+msgstr "Personalizado"
+
+#: src/main/print-raw.c:225
+msgid "Image dimensions must match paper dimensions"
+msgstr "As dimensións da imaxe deben encaix nas do papel"
+
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
+msgid "Fatal error!"
+msgstr "Aconteceu un erro fatal!"
+
+#: src/main/print-weave.c:1528
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr "Informe disto a gimp-print-devel@lists.sourceforge.net"
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
+msgid "Fast Economy"
+msgstr "Rápido económico"
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
+msgid "Economy"
+msgstr "Económico"
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
+msgid "Super Photo"
+msgstr "Super foto"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
+msgid "Ultra Photo"
+msgstr "Ultra foto"
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
+msgid "Best"
+msgstr "Mellor"
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Texto"
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Gráficos"
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Texto e gráficos mesturados"
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Fotografia"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Arte liñal"
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Páxina"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Traballo"
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Tipo de imaxe"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Tipo de imaxe a imprimir"
+
+#: src/main/generic-options.c:74
+msgid "Job Mode"
+msgstr "Modo de traballo"
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr "Modo de traballo vs. página"
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "Número de páxina"
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "Número de páxina"
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Tipo de curva"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr "Se esta curva é liñal, spline interpolada ou de forma libre"
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr "X mínimo"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Mínimo valor posíbel para X"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "X máximo"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Máximo valor posíbel para X"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Y mínimo"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Mínimo valor posíbel para Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Y máximo"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Máximo valor posíbel para Y"
+
+#: src/gutenprintui2/gammacurve.c:408
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "Valor do _gamma"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "Polgada"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr "Estabelecer a unidade base de medición a polgadas"
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "cm"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr "Estabelecer a unidade base de medición a centímetros"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "Puntos"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr "Estabelecer a unidade base de medición a puntos (1/72\")"
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "mm"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr "Estabelecer a unidade base de medición a milímetros"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr "Pica"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr "Estabelecer a unidade base de medición a picas (1/12\")"
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr "Saída de cor"
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr "Imprimir en sombras de grises utilizando a tinta negra"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr "Orde estándar"
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr "Usar a orde de impresión estándar"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Orde personalizada"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr "Usar unha orde personalizada para impresión"
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Ficheiro"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "Imprimir a un ficheiro"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr "Editar curva..."
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr "Estabelecer como predeterminado"
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr "Restaurar previo"
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/gutenprintui2/panel.c:642
+msgid "Select File..."
+msgstr "Escoller un ficheiro..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Restabelecer"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Imprimir v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "Sobre"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"Imprimir e\n"
+"gardar a configuración"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Gardar\n"
+"configuración"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "Imprimir"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: 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 ""
+"Posicione a imaxe na páxina.\n"
+"Seleccione e arrastre co botón primario para posicionar a imaxe.\n"
+"Seleccione e arrastre co botón secundario para mover a imaxe con\n"
+"maior precisión; cada unidade de movimento move a imaxe un punto\n"
+"(1/72\")\n"
+"Seleccione e arrastre co botón central para mover a\n"
+"imaxe en unidades do tamaño da imaxe.\n"
+"Mantendo premida a tecla Maiús mentres se preme e arrastra\n"
+"restrinxese o movimento da imaxe só aos eixes vertical e horizontal.\n"
+"Se preme outro botón mentres arrastra o ratón, a imaxe volverá a\n"
+"súa posición orixinal."
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Tamaño do papel"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Mostrar todos os tamaños de papel"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Dimensións:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Largura:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr "Largo do papel no que se desexa imprimir"
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Altura:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr "Altura do papel no que se desexa imprimir"
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "Tamaño automático de papel"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Número de copias"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr "Seleccione o número de copias a imprimir; un valor entre 1 e 100"
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Posición da imaxe"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "Automático"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Vertical"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "Apaisado"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Cara a abaixo"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr "Horizontal cara abaixo"
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+"Seleccione la orientación: vertical, apaisada, invertida, ou invertida "
+"reversa (apaisada invertida)"
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Orientación:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Esquerda:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr "Distancia desde a esquerda do papel ata a imaxe"
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Dereita:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr "Distancia desde a esquerda do papel ata o bordo dereito da imaxe"
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr "Distancia desde a dereita do papel ata a imaxe"
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Arriba:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr "Distancia desde o bordo superior do papel ata a imaxe"
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Abaixo:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr ""
+"Distancia desde o bordo superior do papel ata o bordo inferior da imaxe"
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr "Distancia desde o bordo inferior do papel ata a imaxe"
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Centro:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "Horizontal"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr "Centrar a imaxe en horizontal no papel"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr "Centrar a imaxe no papel"
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "Vertical"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr "Centrar a imaxe en vertical no papel"
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "Configuración da impresora"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Fabricante da impresora:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Seleccione o fabricante da súa impresora"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Modelo da impresora:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Seleccionar o seu modelo de impresora"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Ficheiro PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr "Introduxa o nome do ficheiro PPD correcto para a  súa impresora"
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Examinar"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr "Elixa o nome de ficheiro PPD correcto para a súa impresora"
+
+#: 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 ""
+"Seleccionar o nome da cola de saída (non o tipo, nin o modelo da impresora) "
+"pola que desexa imprimir"
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Cola da impresora:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr "Introduza a orde correcta para imprimir pola súa impresora. "
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr "Introduza o ficheiro polo que desexa imprimir. "
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr "Picheiro polo que imprimir"
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr "Imprimir nun ficheiro"
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Definir unha nova impresora"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "Nome da impresora:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr "Introduza o nome que desxa darlle a esta impresora lóxica"
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "Sobre Gutenprint "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Versión de Gutenprint "
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Configuracion da impresora"
+
+#: 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 ""
+"Seleccione o nome da impresora (non o tipo ou o modelo da mesma) coa que "
+"desexa imprimir"
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "Configurar a impresora..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+"Seleccione o modelo da impresora, o ficheiro PPD e a orde utilizada para "
+"imprimir nesa impresora"
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Nova impresora..."
+
+#: 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 ""
+"Defina unha nova impresora lóxica. Isto pode ser utilizado para nomear a "
+"unha colección de configuracións que vostede desexe lembrar para un futuro "
+"uso."
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr "Estabelecer as opcións de impresora como predeterminadas"
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr "Configurar todas as opcións de impresora á súas predeterminadas"
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Tamaño da imaxe"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Escala:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr "Estabelecer a escala (o tamaño) da imaxe"
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Escalar por:"
+
+#: 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 ""
+"Seleccione se o escalado é medido como unha porcentaxe do tamaño de papel "
+"dispoñíbel ou como un número de saída de puntos por polgada"
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "Porcentaxe"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr "Escalar a impresión ao tamaño da páxina"
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPP"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr "Escalar a impresión a un número de puntos por polgada"
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr "Estabelecer o largo da impresión"
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr "Estabelecer o alto da impresión"
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"Usar o tamaño\n"
+"orixinal da imaxe"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr "Estabelecer a medida de impresión á medida da imaxe"
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr "Axuste de impresión a cores"
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr "Estabelecer como predeterminados"
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Pechar"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr "Previsualización da imaxe"
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Ver canles de saída:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Saída"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Tipo de saída:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr "Seleccionar o tipo de saída desexado"
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Axustar a  saída..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+"Axustar o balance da cor, brillo, contraste, saturación e o algoritmo de "
+"tramado"
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Unidades de tamaño:"
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Unidades:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr "Seleccionar a unidade base de medida para imprimir"
+
+#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
+msgid "System V lp"
+msgstr "lp de System V"
+
+#: src/gutenprintui2/plist.c:98
+msgid "CUPS"
+msgstr "CUPS"
+
+#: src/gutenprintui2/plist.c:104
+msgid "Berkeley lpd (/etc/lpc)"
+msgstr "lpd de Berkeley (/etc/lpc)"
+
+#: src/gutenprintui2/plist.c:107
+msgid "Berkeley lpd (/usr/bsd/lpc)"
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
+
+#: src/gutenprintui2/plist.c:110
+msgid "Berkeley lpd (/usr/etc/lpc"
+msgstr "Berkeley lpd (/usr/etc/lpc"
+
+#: src/gutenprintui2/plist.c:113
+msgid "Berkeley lpd (/usr/libexec/lpc)"
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
+
+#: src/gutenprintui2/plist.c:116
+msgid "Berkeley lpd (/usr/sbin/lpc)"
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
+
+#: src/gutenprintui2/plist.c:1060
+msgid "Printer"
+msgstr "Impresora"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Impresora predeterminada)"
+
+#: src/cups/genppd.c:154
+msgid "Printer Features"
+msgstr "Opcións da impresora"
+
+#: src/cups/genppd.c:155
+msgid "Output Control"
+msgstr "Control de saída"
+
+#: src/cups/genppd.c:160
+msgid "Common"
+msgstr "Común"
+
+#: src/cups/genppd.c:161
+msgid "Extra 1"
+msgstr "Extra 1"
+
+#: src/cups/genppd.c:162
+msgid "Extra 2"
+msgstr "Extra 2"
+
+#: src/cups/genppd.c:163
+msgid "Extra 3"
+msgstr "Extra 3"
+
+#: src/cups/genppd.c:164
+msgid "Extra 4"
+msgstr "Extra 4"
+
+#: src/cups/genppd.c:165
+msgid "Extra 5"
+msgstr "Extra 5"
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:960
+msgid "English"
+msgstr "Galego"
+
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
+msgid "Media Size"
+msgstr "Tamaño do papel"
+
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
+msgid "Color Model"
+msgstr "Modelo da cor"
+
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
+msgid "Inverted Grayscale"
+msgstr "Escala de gris invertida"
+
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
+msgid "RGB Color"
+msgstr "Cor RGB"
+
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
+msgid "CMY Color"
+msgstr "Cor CMY"
+
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
+msgid "Color Precision"
+msgstr "Precisión da cor"
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
+msgid "Yes"
+msgstr "Si"
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
+msgid "No"
+msgstr "Non"
+
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
+msgid "Value"
+msgstr "Valor"
+
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
+msgid "Fine Adjustment"
+msgstr "Axuste fino"
+
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
+#, c-format
+msgid "%.1f mm"
+msgstr "%.1f mm"
+
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
+msgid "Reverse"
+msgstr "Reverso"
+
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
+msgid "2-Sided Printing"
+msgstr "Impresión a dobre cara"
+
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr "Reducir o tamaño de páxina se é necesario para ajustalo aos bordos"
+
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
+msgid "Shrink (print the whole page)"
+msgstr "Reducir (imprimir a páxina completa)"
+
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
+msgid "Crop (preserve dimensions)"
+msgstr "Cortar (manter as dimensións)"
+
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
+msgid "Expand (use maximum page area)"
+msgstr "Expandir (usar a área máxima da páxina)"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Escputil versión "
+
+#: 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 ""
+"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"\n"
+"Este programa á software libre, vostede pode redistribuilo e/ou modificalo\n"
+"baixo os termos da Licenza Pública Xeral de GNU tal e como é publicada\n"
+"pola Fundación do Software Libre; segundo a versión 2 da Licenza, ou (a\n"
+"súa elección) calquier versión posterior.\n"
+"\n"
+"Este programa distribúese co desexo de que sexa útil, mais SEN NINGUNHA\n"
+"GARANT�A; aínda sen a garantía implícita de COMERCIALIZACIÓN ou ADECUACIÓN\n"
+"A UN PROPÓSITO PARTICULAR. Vexa a GNU General Public License para máis "
+"detalles.\n"
+"\n"
+"Vostede debe ter recibido unha copia da GNU General Public License\n"
+"xunto con éste programa; se non foi así, escriba á Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
+
+#: src/escputil/escputil.c:119
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Commands:\n"
+"    -c|--clean-head    Clean the print head.\n"
+"    -n|--nozzle-check  Print a nozzle test pattern.\n"
+"                       Dirty or clogged nozzles will show as gaps in the\n"
+"                       pattern.  If you see any gaps, you should clean\n"
+"                       the print head.\n"
+"    -a|--align-head    Align the print head.  CAUTION: Misuse of this\n"
+"                       utility may result in poor print quality and/or\n"
+"                       damage to the printer.\n"
+"    -s|--status        Retrieve printer status.\n"
+"    -i|--ink-level     Obtain the ink level from the printer.  This "
+"requires\n"
+"                       read/write access to the raw printer device.\n"
+"    -e|--extended-ink-info     Obtain the extended ink information from the\n"
+"                       printer.  This requires read/write access to the raw\n"
+"                       printer device.\n"
+"    -d|--identify      Query the printer for make and model information.\n"
+"                       This requires read/write access to the raw printer\n"
+"                       device.\n"
+"    -l|--license       Display the license/warranty terms of this program.\n"
+"    -M|--list-models   List the available printer models.\n"
+"    -h|--help          Print this help message.\n"
+"  Options:\n"
+"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
+"                       Default is the default system printer.\n"
+"    -r|--raw-device    Specify the name of the device to write to directly\n"
+"                       rather than going through a printer queue.\n"
+"    -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 ""
+"Uso: escputil [-c | -n | -a | -i | -s | -d | -l | -M]\n"
+"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo] [ -"
+"S ]\n"
+"                [-C escollas] [-p patróns]\n"
+"Realiza mantemento en impresoras EPSON Stylus (R).\n"
+"Exemplos: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --nome-impresora MiñaCola\n"
+"\n"
+"  Ordes:\n"
+"    -c|--clean-head    Limpa o cabezallo de impresión\n"
+"    -n|--nozzle-check  Imprime un patrón de proba de inxectores.\n"
+"                        Os inxectores suxos ou tapados mostranse como "
+"baleiros\n"
+"                        no modelo. Se vostede ve algún baleiro, deberá "
+"limpar\n"
+"                        o cabezallo de impresión.\n"
+"    -a|--align-head    Aliñar o cabezallo de impresión. COIDADO: O mal uso\n"
+"                        desta utilidade pode dar como resultado unha "
+"calidade de\n"
+"    -s|--status        Recuperar o estado da impresora.\n"
+"    -i|--ink-level     Obter o nivel de tinta da impresora. Isto\n"
+"                        require acceso de lectura/escritura ao dispositivo\n"
+"                        cru de impresión.\n"
+"    -d|--identify      Consultar a impresora pola información de marca e\n"
+"                        modelo. Isto requiere acceso de lectura/escritura "
+"ao\n"
+"                        dispositivo cru de impresión.\n"
+"    -l|--license       Mostra os termos da licenza/garantía deste programa\n"
+"    -M|--list-models   Listar os modelos de impresora dispoñíbeis.\n"
+"    -h|--help          Mostra esta mensaxe de axuda.\n"
+"  Opcións:\n"
+"    -P|--printer-name  Especifica o nome da cola de impresión na\n"
+"                        que se traballa. Por omisión é a impresora do\n"
+"                        sistema.\n"
+"    -r|--raw-device    Especifica o nome do dispositivo no que escribir\n"
+"                        directamente no canto de envialo ao través da cola\n"
+"                        de impresión.\n"
+"    -m|--model         Especificar o modelo preciso de impresora para\n"
+"                        o aliñamento do cabezallo.\n"
+"    -u|--new           A impresora é unha impresora nova (Stylus Color 740 "
+"ou\n"
+"                        máis moderna).\n"
+"    -q|--quiet         Suprimir as cabeceiras.\n"
+"    -S|--short-name Mostra o nome curto da impresora con --identify.\n"
+"    -C|--choices Especifica o número do patrón elixido para o\n"
+"          aliñamento\n"
+"    -p|--patterns Especifica o número de xogos de patróns para o\n"
+"          aliñamento\n"
+
+#: 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 ""
+"Uso: escputil [OPCIÓNS] [ORDE]\n"
+"Uso: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P impresora | -r dispositivo] [-u] [-q] [-m modelo] [-S]\n"
+"                [-C escollas] [-p patróns]\n"
+"Realiza mantemento en impresoras EPSON Stylus (R).\n"
+"Examples: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MiñaCola\n"
+"\n"
+"  Ordes:\n"
+"    -c Limpa o cabezallo de impresión.\n"
+"    -n Imprime un modelo de proba de inxectores.\n"
+"          Os inxectores suxos ou tapados mostraranse como baleiros\n"
+"          no patrón. Se vostede ve algún baleiro, deberá limpar\n"
+"          o cabezallo de impresión.\n"
+"    -a Aliñar o cabezallo de impresión. COIDADO: O mal uso\n"
+"          desta utilidade pode dar como resultado unha pobre calidade\n"
+"          de impresión e/ou danar a impresora.\n"
+"    -s Recuperar o estado da impresora.\n"
+"    -i Obter o nivel de tinta da impresora. Isto\n"
+"          require acceso de lectura/escritura ao dispositivo\n"
+"          cru de impresión.\n"
+"\n"
+"    -e Obten a información estendida da tinta da impresora.\n"
+"          Só para la impresora R800 e asociadas. Isto require\n"
+"          acceso de lectura/escritura ao dispositivo cru de\n"
+"          impresión.\n"
+"    -d Consultar a impresora pola información de marca e\n"
+"          modelo. Isto require acceso de lectura/escritura ao\n"
+"          dispositivo cru de impresión.\n"
+"    -l Mostra os termos da licenza/garantía deste\n"
+"          programa\n"
+"    -M Listar os modelos de impresora dispoñíbeis.\n"
+"    -h Mostra esta mensaxe de axuda.\n"
+"  Opcións:\n"
+"    -P Especifica o nome da cola de impresión na que\n"
+"          se está a traballar. Por omisión é a impresora do\n"
+"          sistema.\n"
+"    -r Especifica o nome do dispositivo no que escribir\n"
+"          directamente no canto de envialo ao través da cola\n"
+"          de impresión.\n"
+"    -u A impresora é unha impresora nova (Stylus Color 740\n"
+"          ou máis moderna).\n"
+"    -q Suprimir cabeceiras.\n"
+"    -m Especificar o modelo preciso de impresora para\n"
+"          o aliñamento do cabezallo.\n"
+"    -S|--short-name Mostra o nome curto da impresora con --identify.\n"
+"    -C|--choices Especifica o número do patrón elixido para o\n"
+"          aliñamento\n"
+"    -p|--patterns Especifica o número de xogos de patróns para o\n"
+"          aliñamento\n"
+
+#: src/escputil/escputil.c:341 src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr "Vostede só pode especificar unha impresora ou dispositivo cru."
+
+#: src/escputil/escputil.c:357
+#, c-format
+msgid "You may only specify one printer model."
+msgstr "Vostede só pode especificar un modelo de impresora"
+
+#: src/escputil/escputil.c:381
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr "Debe elixir alo menos unha opción de aliñamento."
+
+#: src/escputil/escputil.c:389
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Os pases de aliñamento deben ser alo menos 1"
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "Opción descoñecida %c\n"
+
+#: src/escputil/escputil.c:403
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Uso: %s [OPCIÓNS] orde\n"
+
+#: src/escputil/escputil.c:405
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Escriba «%s --help» para obter máis información.\n"
+
+#: src/escputil/escputil.c:407
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Escriba «%s -h» para obter máis información.\n"
+
+#: src/escputil/escputil.c:473
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "Non é posíbel abrir o dispositivo %s: %s\n"
+
+#: src/escputil/escputil.c:496
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "Non é posíbel imprimir á impresora %s con %s\n"
+
+#: src/escputil/escputil.c:512 src/escputil/escputil.c:522
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "Non é posíbel enviar a orde á impresora\n"
+
+#: src/escputil/escputil.c:582
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Esgotouse o tempo de espera de lectura da impresora\n"
+
+#: src/escputil/escputil.c:587
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "Non é posíbel ler %s de: %s\n"
+
+#: src/escputil/escputil.c:769
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Especifique un dispositivo cru (raw)\n"
+
+#: src/escputil/escputil.c:776
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "Non é posíbel abrir %s  para lectura/escritura: %s\n"
+
+#: src/escputil/escputil.c:823
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "Impresora descoñecida %s\n"
+
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "Non é posíbel escribir á %s: %s\n"
+
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"Non é posíbel escribir á %s: %s\n"
+
+#: src/escputil/escputil.c:972
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"Non é posíbel detectar o tipo de impresora.\n"
+"Empregue -m para especificar o seu modelo de impresora.\n"
+
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:639 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:663 src/xml/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:687 src/xml/xmli18n-tmp.h:690
+#: 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:1763
+#: src/xml/xmli18n-tmp.h:1766 src/xml/xmli18n-tmp.h:1769
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:1778 src/xml/xmli18n-tmp.h:1781
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1793
+#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1811
+#: src/xml/xmli18n-tmp.h:1814 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:1820 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:2265 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2274
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
+msgid "Photo Black"
+msgstr "Negro fotográfico"
+
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
+#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2932
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3204
+#: src/xml/xmli18n-tmp.h:3218 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3257
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3535
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3684 src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
+msgid "Light Cyan"
+msgstr "Cian claro"
+
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2987
+#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3067 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3231
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3258
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3351
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3685 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
+msgid "Light Magenta"
+msgstr "Maxenta claro"
+
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
+#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
+msgid "Light Black"
+msgstr "Negro claro"
+
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:640 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:646 src/xml/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:691
+#: 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:1764
+#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1782
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1797 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1812
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2245
+#: src/xml/xmli18n-tmp.h:2248 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2260 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2269
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2275
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2284 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
+msgid "Matte Black"
+msgstr "Negro mate"
+
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
+msgid "Gloss Optimizer"
+msgstr "Brillante optimizado"
+
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
+#: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
+msgid "Light Light Black"
+msgstr "Negro moi claro"
+
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
+msgid "Orange"
+msgstr "Laranxa"
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Status: Error\n"
+msgstr "Estado: erro\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Estado: autoimpresión\n"
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Estado: ocupada\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Estatus: agardando\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Estado: inactiva\n"
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Estado: en pausa\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Estado: limpando\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Estado: axustes de fábrica\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Estado: apagándose\n"
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Estado: descoñecido (%d)\n"
+
+#: src/escputil/escputil.c:1125
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Error: erro fatal\n"
+
+#: src/escputil/escputil.c:1128
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Error: foi seleccionada outra interface\n"
+
+#: src/escputil/escputil.c:1131
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Error: a tapa está aberta\n"
+
+#: src/escputil/escputil.c:1134
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Error: atasco do papel\n"
+
+#: src/escputil/escputil.c:1137
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Error: sen tinta\n"
+
+#: src/escputil/escputil.c:1140
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Error:sen papel\n"
+
+#: src/escputil/escputil.c:1143
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Error: erro non específicado de impresora\n"
+
+#: src/escputil/escputil.c:1146
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr "Error: mantemento por derrame do cartucho\n"
+
+#: src/escputil/escputil.c:1149
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr "Error: agardando o retorno desde a posición de corte\n"
+
+#: src/escputil/escputil.c:1152
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Error: erro no dobre alimentador\n"
+
+#: src/escputil/escputil.c:1155
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+"Error: a panca do cartucho de tinta está liberada\n"
+"\n"
+
+#: src/escputil/escputil.c:1158
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Error: erro non recuperábel no cortador\n"
+
+#: src/escputil/escputil.c:1161
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Error: atasco recuperábel no cortador\n"
+
+#: src/escputil/escputil.c:1164
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr "Error: non hai ningún cartucho de mantemento\n"
+
+#: src/escputil/escputil.c:1167
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Error: tapa traseira aberta\n"
+
+#: src/escputil/escputil.c:1170
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Error: bandexa de CD aberta\n"
+
+#: src/escputil/escputil.c:1173
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Error: erro ao cargar as tarxetas\n"
+
+#: src/escputil/escputil.c:1176
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Error: a tapa da bandexa está aberta\n"
+
+#: src/escputil/escputil.c:1179
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Error: a tapa do cartucho de mantemento está aberta\n"
+
+#: src/escputil/escputil.c:1182
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr "Error: a tapa frontal está aberta\n"
+
+#: src/escputil/escputil.c:1185
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Error: solicitude de mantemento\n"
+
+#: src/escputil/escputil.c:1188
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Error: descoñecido (%d)\n"
+
+#: src/escputil/escputil.c:1200
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Aviso: tinta %s baixa\n"
+
+#: src/escputil/escputil.c:1203
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Aviso: canle de tinta %d baixo\n"
+
+#: src/escputil/escputil.c:1209
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr "Aviso: %s limpeza desactivada\n"
+
+#: src/escputil/escputil.c:1212
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr "Aviso: limpando a canle %d \n"
+
+#: src/escputil/escputil.c:1219
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr "Aviso: cartucho de mantemento case cheno\n"
+
+#: src/escputil/escputil.c:1222
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr "Aviso: solicitude de mantemento pendiente\n"
+
+#: src/escputil/escputil.c:1225
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Advertencia: descoñecido (%d)\n"
+
+#: src/escputil/escputil.c:1237
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Imprimindo a autocomprobación do inxector\n"
+
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr "Nome da impresora: %s\n"
+
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Niveis de tinta:\n"
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+msgid "Ink color"
+msgstr "Cor de tinta"
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Percent remaining"
+msgstr "Porcentaxe restante"
+
+#: src/escputil/escputil.c:1439
+#, c-format
+msgid "Job Name: "
+msgstr "Nome do traballo: "
+
+#: src/escputil/escputil.c:1469
+msgid "ink levels"
+msgstr "niveis de tinta"
+
+#: src/escputil/escputil.c:1472
+msgid "status"
+msgstr "estado"
+
+#: src/escputil/escputil.c:1477
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Obter %s require empregar un dispositivo cru (raw).\n"
+
+#: src/escputil/escputil.c:1563
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+"A obtención dos niveis de tinta require empregar un dispositivo cru (raw).\n"
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Ink cartridge"
+msgstr "Cartucho de tinta"
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Part number"
+msgstr "Número de peza"
+
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
+msgid "Date"
+msgstr "Data"
+
+#: src/escputil/escputil.c:1783
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+"A identificación da impresora require o emprego dun dispositivo cru (raw).\n"
+
+#: src/escputil/escputil.c:1801
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "Non foi posíbel identificar o modelo da impresora.\n"
+
+#: src/escputil/escputil.c:1823
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Limpando inxectores...\n"
+
+#: src/escputil/escputil.c:1840
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+"Executando a proba dos inxectores de tinta, asegurese de que haxa papel na "
+"impresora.\n"
+
+#: src/escputil/escputil.c:1844
+#, 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 ""
+"Faga o favor de ler estas instrucións moi cuidadosamente antes de proceder.\n"
+"\n"
+"Esta utilidade permitelle aliñar o cabezallo de impresión da súa impresora\n"
+"de chorro de tinta Epson Stylus. O mal uso desta utilidade pode provocar\n"
+"unha degradación da calidade de impresión e posíbelmente danos na súa\n"
+"impresora. Esta utilidade non foi probada por Seiko Epson no que atinxe ao\n"
+"correcto funcionamento e ofrecese sen ningunha garantía. O risco do uso\n"
+"desta utilidade é da exclusiva responsabilidade do usuario.\n"
+"\n"
+"Esta utilidade imprime %d patróns de proba. Cada patrón ten un aspecto moi\n"
+"semellante. Os patróns consisten nunha serie de pares de liñas verticais\n"
+"que se solapan. Debaixo de cada par de liñas hai un número entre %d e %d.\n"
+"\n"
+"Cando inspeccione os pares de liñas, deberá buscar o par de liñas que\n"
+"estea mellor aliñado, é decir, que forma mellor unha sóa liña vertical.\n"
+"Inspeccione os pares moi coidadosamente para atopar o mellor axuste.\n"
+"Recomendase o uso dunha lupa ou lente de aumento para unha inspección\n"
+"máis crítica.\n"
+"Tamén se suxire que use un papel de boa calidade para as probas, para\n"
+"que as liñas queden ben formadas e non se dispersen sobre o papel.\n"
+"Despois de escoller o número correspondente ao par mellor axustado,\n"
+"poña de novo o papel na impresora antes de escribilo.\n"
+"\n"
+"Cada patrón é semellante, pero os últimos patróns usan puntos máis finos\n"
+"para un aliñamento máis crítico. Vostede debe facer todas as pasadas para\n"
+"aliñar correctamente a impresora. Despois de executar todas as pasadas\n"
+"de aliñamento, os patróns de aliñamento imprimiranse unha vez máis. Debe\n"
+"observarse que o par medio entre todos (#%d de %d) é o mellor de todos\n"
+"os patróns.\n"
+"\n"
+"Despois de que os patróns sexan impresos unha vez máis, ofreceráselle\n"
+"a opción de gardar (s) o resultado na impresora, repetir o proceso (r),\n"
+"ou saír sen gardar (q). Saír sen guardar non restaurará a configuración\n"
+"previa, pero se a apaga e a volve a acender si o fará.\n"
+"Se sáe sen gardar, deberá repetir o proceso por completo se, máis tarde,\n"
+"quere gardar os resultados. É moi importante que non apague a\n"
+"impresora durante éste proceso.\n"
+"\n"
+
+#: src/escputil/escputil.c:1879
+#, 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 ""
+"Faga o favor de ler estas instrucións moi cuidadosamente antes de proceder.\n"
+"\n"
+"Esta utilidade permitelle aliñar o cabezallo de impresión da súa impresora\n"
+"de chorro de tinta Epson Stylus. O mal uso desta utilidade pode provocar\n"
+"unha degradación da calidade de impresión e posíbelmente danos na súa\n"
+"impresora. Esta utilidade non foi probada por Seiko Epson no que atinxe ao\n"
+"correcto funcionamento e ofrecese sen ningunha garantía. O risco do uso\n"
+"desta utilidade é da exclusiva responsabilidade do usuario.\n"
+"\n"
+"Esta utilidade imprime un patrón de proba consistente nunha serie de\n"
+"pares de liñas verticais que se solapan. Debaixo de cada par de liñas\n"
+"hai un número entre %d e %d.\n"
+"\n"
+"Cando inspeccione os pares de liñas, deberá buscar o par de liñas que\n"
+"estea mellor aliñado, é decir, que forma mellor unha sóa liña vertical.\n"
+"Inspeccione os pares moi coidadosamente para atopar o mellor axuste.\n"
+"Recomendase o uso dunha lupa ou lente de aumento para unha inspección\n"
+"máis crítica.\n"
+"Tamén se suxire que use un papel de boa calidade para as probas, para\n"
+"que as liñas queden ben formadas e non se dispersen sobre o papel.\n"
+"Despois de escoller o número correspondente ao par mellor axustado,\n"
+"poña de novo o papel na impresora antes de escribilo.\n"
+"\n"
+"Despois de executar el patrón de aliñamento, imprimiranse unha vez máis,\n"
+"Debe observarse que o par medio entre todos (#%d de %d) é o mellor.\n"
+"De seguido ofreceráselle  a opción de gardar (s) o resultado na impresora,\n"
+"repetir o proceso (r), ou saír sen gardar (q). Saír sen guardar non "
+"restaurará\n"
+"a configuración previa, pero se a apaga e a volve a acender si o fará.\n"
+"Se sáe sen gardar, deberá repetir o proceso por completo se, máis tarde, "
+"quere\n"
+"gardar os resultados. É moi importante que non apague a impresora durante "
+"éste\n"
+"proceso.\n"
+"\n"
+
+#: src/escputil/escputil.c:1923
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr "Non é posíbel enviar a orde á impresora, saíndo.\n"
+
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
+#, c-format
+msgid "Exiting\n"
+msgstr "Saíndo\n"
+
+#: src/escputil/escputil.c:1940
+#, 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 ""
+"Inspeccione a saída final moi detidamente para asegurar que\n"
+"a súa impresora estea ben aliñada. Vostede agora pode:\n"
+"  (s) Gardar os resultados na impresora,\n"
+"  (q) Saír sen gardar os resultados, ou\n"
+"  (r) Repetir o proceso completamente desde o principio.\n"
+"Despois solicitaráselle que confirme a súa elección.\n"
+"Qué opción elixe? (s), (q), (r).\n"
+
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1955
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr "Escriba «q» para confirmar outra vez que quere saír sen gardar:\n"
+
+#: src/escputil/escputil.c:1962
+#, 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 ""
+"De acordo, a súa impresora está aliñada, pero o aliñamento non foi gardado.\n"
+"Se quere gardar o aliñamento, deberá repetir éste proceso.\n"
+
+#: src/escputil/escputil.c:1969
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Escriba «r»  'r' para confirmar outra vez que quere repetir o\n"
+"proceso de aliñamento:\n"
+
+#: src/escputil/escputil.c:1977
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Repetindo o proceso de aliñamento.\n"
+
+#: src/escputil/escputil.c:1983
+#, 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 ""
+"Isto alterará permanentemente a configuración da súa impresora.\n"
+"AVISO: este procedimento non está aprobado por Seiko Epson, e\n"
+"pode danar a súa impresora. Desexa facelo?\n"
+"Confirme que desexa guardar a configuración da súa impresora\n"
+"escribindo «s» de novo.\n"
+
+#: src/escputil/escputil.c:1995
+#, c-format
+msgid "About to save settings..."
+msgstr "Sobre gardar a configuración..."
+
+#: src/escputil/escputil.c:2001
+#, c-format
+msgid "failed!\n"
+msgstr "fallou!\n"
+
+#: src/escputil/escputil.c:2002
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Nos se gardou como era debido a súa configuración. Debe repetir o\n"
+"proceso de aliñamento.\n"
+
+#: src/escputil/escputil.c:2006
+#, c-format
+msgid "succeeded!\n"
+msgstr "correcto!\n"
+
+#: src/escputil/escputil.c:2007
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr "Gardouse na impresora a súa configuración de aliñamento.\n"
+
+#: src/escputil/escputil.c:2012
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "Orde non recoñecida.\n"
+
+#: src/escputil/escputil.c:2015
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "A orde final non foi confirmada.\n"
+
+#: src/escputil/escputil.c:2020
+#, 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 ""
+"Éste procedimento asume que a súa impresora é unha %s.\n"
+"Se non é este o modelo da súa impresora, prema Ctrl-C agora e\n"
+"elixa o modelo correcto de impresora.\n"
+"\n"
+"Poña unha folla de papel na impresora para comezar o\n"
+"procedimento de aliñamento do cabezallo.\n"
+
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
+msgid "Press enter to continue > "
+msgstr "Prema Intro para continuar > "
+
+#: src/escputil/escputil.c:2096
+#, 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 ""
+"Inspeccione a impresión e elixa o mellor par de liñas en cada patrón.\n"
+"Escriba un número par, «?» para obter  axuda, ou «r» para repetir o "
+"procedimento.\n"
+
+#: src/escputil/escputil.c:2109
+#, c-format
+msgid "Pass #%d"
+msgstr "Pasar #%d"
+
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "Insira unha folla de papel sen imprimir.\n"
+
+#: src/escputil/escputil.c:2136
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Número fora de límites!\n"
+
+#: src/escputil/escputil.c:2141
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "Non se entende o que escribiu!\n"
+
+#: src/escputil/escputil.c:2147
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr "O mellor par de liñas  debe ser numerado entre 1 e %d.\n"
+
+#: src/escputil/escputil.c:2154
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Tentando definir o aliñamento..."
+
+#: src/escputil/escputil.c:2157
+#, c-format
+msgid "succeeded.\n"
+msgstr "correcto.\n"
+
+#: src/escputil/escputil.c:2158
+#, 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 ""
+"Verifique que o aliñamento é correcto. Despois de que se imprima o\n"
+"de novo o patrón de aliñamento, asegúrese de que o mellor patrón\n"
+"para cada liñea é o patrón %d. Se non o é, debe repetir o proceso para\n"
+"obter a mellor calidade de impresión.\n"
+
+#: src/escputil/escputil.c:2204
+#, c-format
+msgid "Error in input\n"
+msgstr "Aconteceu un error na entrada\n"
+
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Imprimir sen bordos"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr "Imprimindo..."
+
+#: 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:365
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:390 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:430 src/xml/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:450 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:510 src/xml/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:540 src/xml/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:560 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:570 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:584 src/xml/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:588 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:596 src/xml/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:600 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:608 src/xml/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:616 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:762
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:774 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:798 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:830 src/xml/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:942
+#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:954
+#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:964 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: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:1343 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1358
+#: src/xml/xmli18n-tmp.h:1363 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1388
+#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1418
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1438
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1448
+#: 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:1474 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1498 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1522 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1627
+#: 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:1679 src/xml/xmli18n-tmp.h:1681
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1689
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1693
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1701
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1707 src/xml/xmli18n-tmp.h:1709
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1715 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1727 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1741
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1745
+#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1749
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1753
+#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1868
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1938
+#: src/xml/xmli18n-tmp.h:1943 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1998
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2015
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2023
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2037 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2047
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2051
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2298
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2322
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2370
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2394
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2521
+#: src/xml/xmli18n-tmp.h:2523 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2537
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2547 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
+msgid "EPSON Standard Inks"
+msgstr "Tintas estándar EPSON"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:474
+msgid "Bright White Paper"
+msgstr "Papel branco brillante"
+
+#: 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:369
+#: src/xml/xmli18n-tmp.h:479 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:745 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1031
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1479
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1765
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2060
+#: src/xml/xmli18n-tmp.h:2120 src/xml/xmli18n-tmp.h:2180
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:6635
+msgid "Postcard"
+msgstr "Tarxeta postal"
+
+#: 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:389
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:632 src/xml/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1043
+#: src/xml/xmli18n-tmp.h:1103 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1503
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2558
+msgid "Back Light Film"
+msgstr "Filme para Retro-iluminación"
+
+#: 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:399
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:638 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1109 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1317
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1621 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1783
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1957
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2562
+msgid "Matte Paper Heavyweight"
+msgstr "Papel mate pesado"
+
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:514
+msgid "Premium Presentation Paper Matte"
+msgstr "Papel mate presentación premiun"
+
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:539
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papel fotográfico ultra brillante"
+
+#: 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:434
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1342
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1738 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2425 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2572
+msgid "Premium Semigloss Photo Paper"
+msgstr "Papel fotográfico premiun semibrillante"
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:554
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Papel fotográfico lustrado ultra premium"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr "CD ou 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:459
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:671 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:805 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1178
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2365
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2506
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2580
+msgid "ColorLife Paper"
+msgstr "Papel de cires vivos ColorLife"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papel fotográfico brillante premium de 170 gr/m2"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Papel fotográfico brillante premium de 250 gr/m2"
+
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Papel fotográfico semibrillante premium de 170 gr/m2"
+
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Papel fotográfico semibrillante premium de 250 gr/m2"
+
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Papel fotográfico lustrado premium 250 gr/m2"
+
+#: 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:361
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:406 src/xml/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:426 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:486 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:516 src/xml/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:546 src/xml/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:566 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:576 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:759 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:799 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:823 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:831 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:887 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:1344
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1354
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1364
+#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1394
+#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1424
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1481 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1553 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1577 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1628 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:1824 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1864 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1919
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1939
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1979
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1994 src/xml/xmli18n-tmp.h:1999
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2009
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2319
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2327
+#: src/xml/xmli18n-tmp.h:2331 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2343
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2355 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2367
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2379 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2403 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
+#: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
+msgid "Quadtone"
+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:362
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:377 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:397 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:437 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:467 src/xml/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:487 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:517 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:547 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:577 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:760 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1225
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1265
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1295
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1305
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1325
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1360 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1445
+#: 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:1476
+#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1536
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1548
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1584
+#: src/xml/xmli18n-tmp.h:1589 src/xml/xmli18n-tmp.h:1594
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1604
+#: src/xml/xmli18n-tmp.h:1609 src/xml/xmli18n-tmp.h:1614
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1629 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:1825 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1855 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1875 src/xml/xmli18n-tmp.h:1880
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1890
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1920
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1980
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1995 src/xml/xmli18n-tmp.h:2000
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2344
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2368
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2416
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2436 src/xml/xmli18n-tmp.h:2440
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2448
+msgid "MISQuadtone"
+msgstr "MISQuadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1187
+#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1714 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2548
+msgid "Plain Paper Fast Load"
+msgstr "Carga rápida de papel normal"
+
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:373 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:383 src/xml/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:403 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:473 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:523 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:553 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:578
+#: 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:1341
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1356 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1396 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1431
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1446 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:1472 src/xml/xmli18n-tmp.h:1477
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1513
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1543
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1555
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1567
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1579
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1826
+#: src/xml/xmli18n-tmp.h:1831 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1911 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1941 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1956
+#: src/xml/xmli18n-tmp.h:1961 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1971 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2006
+#: src/xml/xmli18n-tmp.h:2011
+msgid "MIS Hextone"
+msgstr "MIS Hextone"
+
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2494
+msgid "Archival Matte Paper"
+msgstr "Papel libre de ácido mate"
+
+#: src/xml/xmli18n-tmp.h:662 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1133 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2497
+msgid "Watercolor Paper - Radiant White"
+msgstr "Papel acuarela - Blanco radiante"
+
+#: 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:1017
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1023
+#: src/xml/xmli18n-tmp.h:1026 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1035
+#: src/xml/xmli18n-tmp.h:1038 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1044 src/xml/xmli18n-tmp.h:1047
+#: src/xml/xmli18n-tmp.h:1050 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1056 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1062 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1071
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1077
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1086 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1095
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1101
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1107
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1131
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1146 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2061
+#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2067
+#: src/xml/xmli18n-tmp.h:2070 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2109
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2124 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2133
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2142 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2157
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2163
+#: src/xml/xmli18n-tmp.h:2166 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2181
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2187
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2199
+#: 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:2450 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2477
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
+msgid "UltraChrome Photo Black"
+msgstr "Fotografía negro UltraChrome"
+
+#: 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:1138
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1144
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2089 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2119 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2146
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2164
+#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2460
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2472
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
+msgid "UltraChrome Matte Black"
+msgstr "Negro mate UltraChrome"
+
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1590
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1620
+#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
+msgid "Hextone"
+msgstr "Hextone"
+
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
+#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2696
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3180
+#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3671
+#: src/xml/xmli18n-tmp.h:3688 src/xml/xmli18n-tmp.h:3896
+msgid "360 x 90 DPI Fast Economy"
+msgstr "360 x 90 PPP rápido económico"
+
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2726 src/xml/xmli18n-tmp.h:2739
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2855 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2948
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3002
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3109
+#: src/xml/xmli18n-tmp.h:3122 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3301
+msgid "180 DPI Economy"
+msgstr "180 PPP económico"
+
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2740
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2990 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3110
+#: src/xml/xmli18n-tmp.h:3123 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3232
+#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3432 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3508
+#: src/xml/xmli18n-tmp.h:3523 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3656
+#: src/xml/xmli18n-tmp.h:3672 src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:3733 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:3803 src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3930 src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:3991 src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:4007 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:4047 src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:4071 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4095 src/xml/xmli18n-tmp.h:4101
+msgid "360 x 180 DPI Draft"
+msgstr "360 x 180 PPP borrador"
+
+#: src/xml/xmli18n-tmp.h:2591 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3183
+msgid "360 DPI High Quality"
+msgstr "360 PPP alta calidade"
+
+#: src/xml/xmli18n-tmp.h:2592 src/xml/xmli18n-tmp.h:2605
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2684
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2716
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2765
+#: src/xml/xmli18n-tmp.h:2779 src/xml/xmli18n-tmp.h:2793
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2896
+#: src/xml/xmli18n-tmp.h:2909 src/xml/xmli18n-tmp.h:2922
+#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2978
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3004
+#: src/xml/xmli18n-tmp.h:3014 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3070 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3233
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3289
+#: src/xml/xmli18n-tmp.h:3303 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3388
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3418
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3448
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3509
+#: src/xml/xmli18n-tmp.h:3524 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3618 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3673 src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:3734 src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:3788 src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3852 src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:3976 src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:4032 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
+msgid "360 DPI"
+msgstr "360 PPP"
+
+#: src/xml/xmli18n-tmp.h:2593 src/xml/xmli18n-tmp.h:2606
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2643 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2701 src/xml/xmli18n-tmp.h:2717
+#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2743
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2766
+#: src/xml/xmli18n-tmp.h:2780 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2843
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2897
+#: src/xml/xmli18n-tmp.h:2910 src/xml/xmli18n-tmp.h:2923
+#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2951
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3056
+#: src/xml/xmli18n-tmp.h:3071 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3113
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3290
+#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3328 src/xml/xmli18n-tmp.h:3340
+#: src/xml/xmli18n-tmp.h:3352 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3404 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3449
+#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3478
+#: src/xml/xmli18n-tmp.h:3496 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3525 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3558 src/xml/xmli18n-tmp.h:3582
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3634
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:3736 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3773 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:3882 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3917 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:3977 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
+msgid "720 x 360 DPI"
+msgstr "720 x 360 PPP"
+
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2607
+#: src/xml/xmli18n-tmp.h:2620 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2718
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2755 src/xml/xmli18n-tmp.h:2767
+#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2898
+#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2924
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2952
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2993 src/xml/xmli18n-tmp.h:3006
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3087
+#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3114
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3171 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3291
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3316
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3366
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3390
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3435 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3544
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3635
+#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3659
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:3709 src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:3738 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:3790 src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:3822 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:3883 src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:3918 src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:3978 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3994 src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:4010 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
+msgid "720 DPI"
+msgstr "720 PPP"
+
+#: src/xml/xmli18n-tmp.h:2600 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2934
+#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3025
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3068
+#: src/xml/xmli18n-tmp.h:3083 src/xml/xmli18n-tmp.h:3096
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3156
+#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3416
+#: src/xml/xmli18n-tmp.h:3446 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3555 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3616 src/xml/xmli18n-tmp.h:3631
+#: src/xml/xmli18n-tmp.h:3705 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3817 src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:3851 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3965
+msgid "360 x 120 DPI Economy"
+msgstr "360 x 120 PPP económico"
+
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2895 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:3013 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3069
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3146 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3326
+#: src/xml/xmli18n-tmp.h:3363 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3402 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3460
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3593 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3617 src/xml/xmli18n-tmp.h:3632
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3866
+msgid "360 x 240 DPI Draft"
+msgstr "360 x 240 PPP borrador"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2645
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2756 src/xml/xmli18n-tmp.h:2768
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:3101
+#: src/xml/xmli18n-tmp.h:3150 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:3739 src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3936 src/xml/xmli18n-tmp.h:3954
+msgid "720 DPI High Quality"
+msgstr "720 PPP alta calidade"
+
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2646
+#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2900
+#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2926
+#: src/xml/xmli18n-tmp.h:2940 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2994 src/xml/xmli18n-tmp.h:3007
+#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3030
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3073 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3127
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3162
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3236 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3264 src/xml/xmli18n-tmp.h:3277
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3307
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3480 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3560
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3609
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3648 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3676 src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:3710 src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:3740 src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:3764 src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:3783 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3807 src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:3841 src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:3901 src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3969 src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:4003 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
+msgid "1440 x 720 DPI"
+msgstr "1440 x 720 PPP"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2746 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2835
+#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2887 src/xml/xmli18n-tmp.h:2901
+#: src/xml/xmli18n-tmp.h:2914 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2955
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3059
+#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3637
+msgid "1440 x 720 DPI Highest Quality"
+msgstr "1440 x 720 PPP moi alta calidade"
+
+#: src/xml/xmli18n-tmp.h:2720 src/xml/xmli18n-tmp.h:2733
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:3151
+msgid "720 DPI Highest Quality"
+msgstr "720 PPP moi alta calidade"
+
+#: 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:3075 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3318 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3661
+msgid "2880 x 720 DPI"
+msgstr "2880 x 720 PPP"
+
+#: 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:3076 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3639
+msgid "2880 x 720 DPI Highest Quality"
+msgstr "2880 x 720 PPP moi alta calidade"
+
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3279 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3380 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3422 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3452 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3514 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3650
+#: src/xml/xmli18n-tmp.h:3662 src/xml/xmli18n-tmp.h:3677
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:3752 src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:3776 src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3825 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:3980 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3996 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
+msgid "1440 x 1440 DPI"
+msgstr "1440 x 1440 PPP"
+
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3237 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3293 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3586
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3610
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3651
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3678
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3727 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3753 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3777 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3793 src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:3997 src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
+msgid "2880 x 1440 DPI"
+msgstr "2880 x 1440 PPP"
+
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Dark Yellow"
+msgstr "Amarelo escuro"
+
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3440 src/xml/xmli18n-tmp.h:3484
+#: src/xml/xmli18n-tmp.h:3502 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:3786 src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:3811 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3845 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
+msgid "2880 x 2880 DPI"
+msgstr "2880 x 2880 PPP"
+
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3454
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3574 src/xml/xmli18n-tmp.h:3587
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3611
+#: src/xml/xmli18n-tmp.h:3624 src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:4108
+msgid "5760 x 1440 DPI"
+msgstr "5760 x 1440 PPP"
+
+#: src/xml/xmli18n-tmp.h:3441 src/xml/xmli18n-tmp.h:3485
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3532
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:3860 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3906 src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:3974 src/xml/xmli18n-tmp.h:4110
+msgid "5760 x 2880 DPI"
+msgstr "5760 x 2880 PPP"
+
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3751
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 PPP trasladadoo"
+
+#: src/xml/xmli18n-tmp.h:3692 src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3838 src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:3952
+msgid "720 x 360 DPI Enhanced"
+msgstr "720 x 360 PPP mellorado"
+
+#: src/xml/xmli18n-tmp.h:3728 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:3943
+msgid "Black 1"
+msgstr "Negro 1"
+
+#: src/xml/xmli18n-tmp.h:3729 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:3944
+msgid "Black 2"
+msgstr "Negro 2"
+
+#: src/xml/xmli18n-tmp.h:3735 src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:3950
+msgid "360 DPI Enhanced"
+msgstr "360 PPP mellorado"
+
+#: src/xml/xmli18n-tmp.h:3765
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440 x 720 PPP alta calidade"
+
+#: src/xml/xmli18n-tmp.h:3908
+msgid "Vivid Light Magenta"
+msgstr "Maxenta claro vívido"
+
+#: src/xml/xmli18n-tmp.h:3913
+msgid "Vivid Magenta"
+msgstr "Maxenta vívido"
+
+#: src/xml/xmli18n-tmp.h:4125
+msgid "Main Tray"
+msgstr "Bandexa principal"
+
+#: src/xml/xmli18n-tmp.h:4126
+msgid "Photo Tray"
+msgstr "Bandexa de fotos"
+
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
+msgid "Print to CD"
+msgstr "Imprimir a CD"
+
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
+msgid "Rear Tray"
+msgstr "Bandexa traseira"
+
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
+msgid "Front Tray"
+msgstr "Bandexa frontal"
+
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
+msgid "Manual Feed"
+msgstr "Alimentación manual"
+
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
+msgid "Roll Feed (cut each page)"
+msgstr "Alimentación por rolo (cortando cada páxina)"
+
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
+msgid "Roll Feed (do not cut)"
+msgstr "Alimentación por rolo (sen cortar cada páxina)"
+
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
+msgid "Roll Feed"
+msgstr "Alimentador por rolo"
+
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
+msgid "Manual Sheet Guide"
+msgstr "Guía manual de follas"
+
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
+msgid "Manual Feed (Front)"
+msgstr "Alimentación manual (frontal)"
+
+#: src/xml/xmli18n-tmp.h:4152
+msgid "Roll Feed (borderless with single cut)"
+msgstr "Alimentador de rodillo (sen bordo, con corte simple)"
+
+#: src/xml/xmli18n-tmp.h:4153
+msgid "Roll Feed (borderless with double cut)"
+msgstr "Alimentador de rodillo (sen bordo, con corte duplo)"
+
+#: src/xml/xmli18n-tmp.h:4175
+msgid "Photo Board"
+msgstr "Taboleiro de fotografías"
+
+#: src/xml/xmli18n-tmp.h:4176
+msgid "Cut Sheet Bin 1"
+msgstr "Caixón de folla de corte 1"
+
+#: src/xml/xmli18n-tmp.h:4177
+msgid "Cut Sheet Bin 2"
+msgstr "Caixón de folla de corte 2"
+
+#: src/xml/xmli18n-tmp.h:4178
+msgid "Cut Sheet Autoselect"
+msgstr "Autoselección de folla de corte"
+
+#: src/xml/xmli18n-tmp.h:4179
+msgid "Manual Selection"
+msgstr "Selección manual"
+
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
+msgid "One Color Raw"
+msgstr "Unha cor en cru"
+
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
+msgid "Three Color Raw"
+msgstr "Tres cores en cru"
+
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
+msgid "Four Color Raw"
+msgstr "Catro cores en cru"
+
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
+msgid "Five Color Raw"
+msgstr "Cinco cores en cru"
+
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
+msgid "Six Color Raw"
+msgstr "Seis cores en cru"
+
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
+msgid "Gray 3"
+msgstr "Gris 3"
+
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
+msgid "Gray 2"
+msgstr "Gris 2"
+
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
+msgid "Gray 1"
+msgstr "Gris 1"
+
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
+msgid "MIS Quadtone"
+msgstr "MIS Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
+msgid "MIS Six Tone"
+msgstr "MIS seis tons"
+
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
+msgid "Gray 5"
+msgstr "Gris 5"
+
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
+msgid "Gray 4"
+msgstr "Gris 4"
+
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Un brillo mellorado que realza unha cor en cru"
+
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
+msgid "Three Color Raw Gloss"
+msgstr "Tres cores en cru con brillo"
+
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+msgid "Four Color Raw Gloss"
+msgstr "Cuatro cores en cru con brillo"
+
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Seis cores en cru con brillo mellorado"
+
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Sete cores en cru con brillo mellorado"
+
+#: src/xml/xmli18n-tmp.h:4603
+msgid "MatteBlack"
+msgstr "Negro mate"
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Default Black"
+msgstr "Negro predeterminado"
+
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
+msgid "Seven Color Photo"
+msgstr "Fotografía de sete cores"
+
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Six Color Enhanced Composite"
+msgstr "Seis cores compostos mellorados"
+
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
+msgid "Seven Color Raw"
+msgstr "Sete colores en cru"
+
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
+msgid "Two Level Grayscale"
+msgstr "Escala de grises de dous niveis"
+
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
+msgid "Two Color Raw"
+msgstr "Dúas cores en cru"
+
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
+msgid "Eight Color Photo"
+msgstr "Fotografía de oito cores"
+
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
+msgid "Eight Color Raw"
+msgstr "Oito colores en cru"
+
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
+msgid "Four Color Photo"
+msgstr "Fotografía de catro cores"
+
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
+msgid "Interleave"
+msgstr "Entrelazado"
+
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
+msgid "Full Overlap"
+msgstr "Solapado completo"
+
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
+msgid "Four Pass"
+msgstr "Catro pasos"
+
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
+msgid "Full Overlap 2"
+msgstr "Solapado completo 2"
+
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
+msgid "Interleave 2"
+msgstr "Entrelazado 2"
+
+#: src/xml/xmli18n-tmp.h:6577
+msgid "Eight Pass"
+msgstr "Oito pasos"
+
+#: src/xml/xmli18n-tmp.h:6579
+msgid "On"
+msgstr "Activado"
+
+#: src/xml/xmli18n-tmp.h:6632
+msgid "Legal"
+msgstr "Oficio"
+
+#: src/xml/xmli18n-tmp.h:6633
+msgid "Tabloid"
+msgstr "Tabloide"
+
+#: src/xml/xmli18n-tmp.h:6634
+msgid "Executive"
+msgstr "Executivo"
+
+#: src/xml/xmli18n-tmp.h:6639
+msgid "3x5"
+msgstr "3x5"
+
+#: src/xml/xmli18n-tmp.h:6640
+msgid "3 1/2 x5"
+msgstr "3 1/2 x5"
+
+#: src/xml/xmli18n-tmp.h:6641
+msgid "L"
+msgstr "L"
+
+#: src/xml/xmli18n-tmp.h:6642
+msgid "4x6"
+msgstr "4x6"
+
+#: src/xml/xmli18n-tmp.h:6643
+msgid "KG"
+msgstr "KG"
+
+#: src/xml/xmli18n-tmp.h:6644
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr "Papel Epson 4x6 de fotografía"
+
+#: src/xml/xmli18n-tmp.h:6645
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Papel de fotografía Epson L (Bordos desprendibles)"
+
+#: src/xml/xmli18n-tmp.h:6646
+msgid "4x8"
+msgstr "4x8"
+
+#: src/xml/xmli18n-tmp.h:6647
+msgid "5x7"
+msgstr "5x7"
+
+#: src/xml/xmli18n-tmp.h:6648
+msgid "2L"
+msgstr "2L"
+
+#: src/xml/xmli18n-tmp.h:6649
+msgid "5x8"
+msgstr "5x8"
+
+#: src/xml/xmli18n-tmp.h:6650
+msgid "6x8"
+msgstr "6x8"
+
+#: src/xml/xmli18n-tmp.h:6651
+msgid "8x10"
+msgstr "8x10"
+
+#: src/xml/xmli18n-tmp.h:6652
+msgid "Rokukire"
+msgstr "Rokukire"
+
+#: src/xml/xmli18n-tmp.h:6654
+msgid "12x18"
+msgstr "12x18"
+
+#: src/xml/xmli18n-tmp.h:6655
+msgid "Super B 13x19"
+msgstr "Super B 13x19"
+
+#: src/xml/xmli18n-tmp.h:6656
+msgid "Engineering C 17x22"
+msgstr "Enxeñería C 17x22"
+
+#: src/xml/xmli18n-tmp.h:6657
+msgid "8x12"
+msgstr "8x12"
+
+#: src/xml/xmli18n-tmp.h:6658
+msgid "YonKire"
+msgstr "YonKire"
+
+#: src/xml/xmli18n-tmp.h:6659
+msgid "11x14"
+msgstr "11x14"
+
+#: src/xml/xmli18n-tmp.h:6660
+msgid "HanKire"
+msgstr "HanKire"
+
+#: src/xml/xmli18n-tmp.h:6661
+msgid "16x20"
+msgstr "16x20"
+
+#: src/xml/xmli18n-tmp.h:6662
+msgid "16x24"
+msgstr "16x24"
+
+#: src/xml/xmli18n-tmp.h:6663
+msgid "20x24"
+msgstr "20x24"
+
+#: src/xml/xmli18n-tmp.h:6664
+msgid "20x30"
+msgstr "20x30"
+
+#: src/xml/xmli18n-tmp.h:6665
+msgid "22x30"
+msgstr "22x30"
+
+#: src/xml/xmli18n-tmp.h:6666
+msgid "24x30"
+msgstr "24x30"
+
+#: src/xml/xmli18n-tmp.h:6667
+msgid "Super A1 24x36"
+msgstr "Super A1 24x36"
+
+#: src/xml/xmli18n-tmp.h:6668
+msgid "30x40"
+msgstr "30x40"
+
+#: src/xml/xmli18n-tmp.h:6669
+msgid "4A"
+msgstr "4A"
+
+#: src/xml/xmli18n-tmp.h:6670
+msgid "2A"
+msgstr "2A"
+
+#: src/xml/xmli18n-tmp.h:6671
+msgid "Super A0"
+msgstr "Super A0"
+
+#: src/xml/xmli18n-tmp.h:6672
+msgid "A0"
+msgstr "A0"
+
+#: src/xml/xmli18n-tmp.h:6673
+msgid "A1"
+msgstr "A1"
+
+#: src/xml/xmli18n-tmp.h:6674
+msgid "A2"
+msgstr "A2"
+
+#: src/xml/xmli18n-tmp.h:6675
+msgid "A3"
+msgstr "A3"
+
+#: src/xml/xmli18n-tmp.h:6677
+msgid "A5"
+msgstr "A5"
+
+#: src/xml/xmli18n-tmp.h:6678
+msgid "A6"
+msgstr "A6"
+
+#: src/xml/xmli18n-tmp.h:6679
+msgid "A7"
+msgstr "A7"
+
+#: src/xml/xmli18n-tmp.h:6680
+msgid "A8"
+msgstr "A8"
+
+#: src/xml/xmli18n-tmp.h:6681
+msgid "A9"
+msgstr "A9"
+
+#: src/xml/xmli18n-tmp.h:6682
+msgid "A10"
+msgstr "A10"
+
+#: src/xml/xmli18n-tmp.h:6683
+msgid "RA0"
+msgstr "RA0"
+
+#: src/xml/xmli18n-tmp.h:6684
+msgid "RA1"
+msgstr "RA1"
+
+#: src/xml/xmli18n-tmp.h:6685
+msgid "RA2"
+msgstr "RA2"
+
+#: src/xml/xmli18n-tmp.h:6686
+msgid "RA3"
+msgstr "RA3"
+
+#: src/xml/xmli18n-tmp.h:6687
+msgid "RA4"
+msgstr "RA4"
+
+#: src/xml/xmli18n-tmp.h:6688
+msgid "SRA0"
+msgstr "SRA0"
+
+#: src/xml/xmli18n-tmp.h:6689
+msgid "SRA1"
+msgstr "SRA1"
+
+#: src/xml/xmli18n-tmp.h:6690
+msgid "SRA2"
+msgstr "SRA2"
+
+#: src/xml/xmli18n-tmp.h:6691
+msgid "SRA3"
+msgstr "SRA3"
+
+#: src/xml/xmli18n-tmp.h:6692
+msgid "SRA4"
+msgstr "SRA4"
+
+#: src/xml/xmli18n-tmp.h:6693
+msgid "4B ISO"
+msgstr "4B ISO"
+
+#: src/xml/xmli18n-tmp.h:6694
+msgid "2B ISO"
+msgstr "2B ISO"
+
+#: src/xml/xmli18n-tmp.h:6695
+msgid "B0 ISO"
+msgstr "B0 ISO"
+
+#: src/xml/xmli18n-tmp.h:6696
+msgid "B1 ISO"
+msgstr "B1 ISO"
+
+#: src/xml/xmli18n-tmp.h:6697
+msgid "B2 ISO"
+msgstr "B2 ISO"
+
+#: src/xml/xmli18n-tmp.h:6698
+msgid "B3 ISO"
+msgstr "B3 ISO"
+
+#: src/xml/xmli18n-tmp.h:6699
+msgid "B4 ISO"
+msgstr "B4 ISO"
+
+#: src/xml/xmli18n-tmp.h:6700
+msgid "B5 ISO"
+msgstr "B5 ISO"
+
+#: src/xml/xmli18n-tmp.h:6701
+msgid "B6 ISO"
+msgstr "B6 ISO"
+
+#: src/xml/xmli18n-tmp.h:6702
+msgid "B7 ISO"
+msgstr "B7 ISO"
+
+#: src/xml/xmli18n-tmp.h:6703
+msgid "B8 ISO"
+msgstr "B8 ISO"
+
+#: src/xml/xmli18n-tmp.h:6704
+msgid "B9 ISO"
+msgstr "B9 ISO"
+
+#: src/xml/xmli18n-tmp.h:6705
+msgid "B10 ISO"
+msgstr "B10 ISO"
+
+#: src/xml/xmli18n-tmp.h:6706
+msgid "Super B0 JIS"
+msgstr "Super B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:6707
+msgid "B0 JIS"
+msgstr "B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:6708
+msgid "B1 JIS"
+msgstr "B1 JIS"
+
+#: src/xml/xmli18n-tmp.h:6709
+msgid "B2 JIS"
+msgstr "B2 JIS"
+
+#: src/xml/xmli18n-tmp.h:6710
+msgid "B3 JIS"
+msgstr "B3 JIS"
+
+#: src/xml/xmli18n-tmp.h:6711
+msgid "B4 JIS"
+msgstr "B4 JIS"
+
+#: src/xml/xmli18n-tmp.h:6712
+msgid "B5 JIS"
+msgstr "B5 JIS"
+
+#: src/xml/xmli18n-tmp.h:6713
+msgid "B6 JIS"
+msgstr "B6 JIS"
+
+#: src/xml/xmli18n-tmp.h:6714
+msgid "B7 JIS"
+msgstr "B7 JIS"
+
+#: src/xml/xmli18n-tmp.h:6715
+msgid "B8 JIS"
+msgstr "B8 JIS"
+
+#: src/xml/xmli18n-tmp.h:6716
+msgid "B9 JIS"
+msgstr "B9 JIS"
+
+#: src/xml/xmli18n-tmp.h:6717
+msgid "B10 JIS"
+msgstr "B10 JIS"
+
+#: src/xml/xmli18n-tmp.h:6718
+msgid "C0"
+msgstr "C0"
+
+#: src/xml/xmli18n-tmp.h:6719
+msgid "C0 landscape"
+msgstr "C0 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6720
+msgid "C1"
+msgstr "C1"
+
+#: src/xml/xmli18n-tmp.h:6721
+msgid "C1 landscape"
+msgstr "C1 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6722
+msgid "C2"
+msgstr "C2"
+
+#: src/xml/xmli18n-tmp.h:6723
+msgid "C2 landscape"
+msgstr "C2 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6724
+msgid "C3"
+msgstr "C3"
+
+#: src/xml/xmli18n-tmp.h:6725
+msgid "C3 landscape"
+msgstr "C3 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6726
+msgid "C4"
+msgstr "C4"
+
+#: src/xml/xmli18n-tmp.h:6727
+msgid "C4 landscape"
+msgstr "C4 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6728
+msgid "C5"
+msgstr "C5"
+
+#: src/xml/xmli18n-tmp.h:6729
+msgid "C5 landscape"
+msgstr "C5 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6730
+msgid "B6-C4"
+msgstr "B6-C4"
+
+#: src/xml/xmli18n-tmp.h:6731
+msgid "B6-C4 landscape"
+msgstr "B6-C4 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6732
+msgid "C6"
+msgstr "C6"
+
+#: src/xml/xmli18n-tmp.h:6733
+msgid "C6 landscape"
+msgstr "C6 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6734
+msgid "DL"
+msgstr "DL"
+
+#: src/xml/xmli18n-tmp.h:6735
+msgid "DL landscape"
+msgstr "DL apaisado"
+
+#: src/xml/xmli18n-tmp.h:6736
+msgid "C7-6"
+msgstr "C7-6"
+
+#: src/xml/xmli18n-tmp.h:6737
+msgid "C7-6 landscape"
+msgstr "C7-6 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6738
+msgid "C7"
+msgstr "C7"
+
+#: src/xml/xmli18n-tmp.h:6739
+msgid "C7 landscape"
+msgstr "C7 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6740
+msgid "C8"
+msgstr "C8"
+
+#: src/xml/xmli18n-tmp.h:6741
+msgid "C8 landscape"
+msgstr "C8 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6742
+msgid "C9"
+msgstr "C9"
+
+#: src/xml/xmli18n-tmp.h:6743
+msgid "C9 landscape"
+msgstr "C9 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6744
+msgid "C10"
+msgstr "C10"
+
+#: src/xml/xmli18n-tmp.h:6745
+msgid "C10 landscape"
+msgstr "C10 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6746
+msgid "EA5"
+msgstr "EA5"
+
+#: src/xml/xmli18n-tmp.h:6747
+msgid "EA5 landscape"
+msgstr "EA5 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6748
+msgid "ArchA"
+msgstr "ArchA"
+
+#: src/xml/xmli18n-tmp.h:6749
+msgid "ArchA transposed"
+msgstr "ArchA transportado"
+
+#: src/xml/xmli18n-tmp.h:6750
+msgid "ArchB"
+msgstr "ArchB"
+
+#: src/xml/xmli18n-tmp.h:6751
+msgid "ArchB transposed"
+msgstr "ArchB transportado"
+
+#: src/xml/xmli18n-tmp.h:6752
+msgid "ArchC"
+msgstr "ArchC"
+
+#: src/xml/xmli18n-tmp.h:6753
+msgid "ArchC transposed"
+msgstr "ArchC transportado"
+
+#: src/xml/xmli18n-tmp.h:6754
+msgid "ArchD"
+msgstr "ArchD"
+
+#: src/xml/xmli18n-tmp.h:6755
+msgid "ArchD transposed"
+msgstr "ArchD transportado"
+
+#: src/xml/xmli18n-tmp.h:6756
+msgid "ArchE"
+msgstr "ArchE"
+
+#: src/xml/xmli18n-tmp.h:6757
+msgid "ArchE transposed"
+msgstr "ArchE transportado"
+
+#: src/xml/xmli18n-tmp.h:6758
+msgid "American foolscap"
+msgstr "Prego americano"
+
+#: src/xml/xmli18n-tmp.h:6759
+msgid "European foolscap"
+msgstr "Prego europeo"
+
+#: src/xml/xmli18n-tmp.h:6760
+msgid "Crown Quarto"
+msgstr "Cuarto de Crown"
+
+#: src/xml/xmli18n-tmp.h:6761
+msgid "Large Crown Quarto"
+msgstr "Cuarto de Crown longo"
+
+#: src/xml/xmli18n-tmp.h:6762
+msgid "Demy Quarto"
+msgstr "Cuarto de Demy"
+
+#: src/xml/xmli18n-tmp.h:6763
+msgid "Royal Quarto"
+msgstr "Cuarto de Royal"
+
+#: src/xml/xmli18n-tmp.h:6764
+msgid "Crown Octavo"
+msgstr "Oitavo de Crown"
+
+#: src/xml/xmli18n-tmp.h:6765
+msgid "Large Crown Octavo"
+msgstr "Oitavo de Crown longo"
+
+#: src/xml/xmli18n-tmp.h:6766
+msgid "Demy Octavo"
+msgstr "Oitavo de Demy"
+
+#: src/xml/xmli18n-tmp.h:6767
+msgid "Royal Octavo"
+msgstr "Oitavo de Royal"
+
+#: src/xml/xmli18n-tmp.h:6768
+msgid "Small paperback"
+msgstr "Libro de peto pequeno"
+
+#: src/xml/xmli18n-tmp.h:6769
+msgid "Penguin small paperback"
+msgstr "Libro de peto «Penguin» pequeno"
+
+#: src/xml/xmli18n-tmp.h:6770
+msgid "Penguin large paperback"
+msgstr "Libro de peto «Penguin» grande"
+
+#: src/xml/xmli18n-tmp.h:6771
+msgid "10cm x 15cm"
+msgstr "10cm x 15cm"
+
+#: src/xml/xmli18n-tmp.h:6772
+msgid "Hagaki Card"
+msgstr "Tarxeta «Hagaki»"
+
+#: src/xml/xmli18n-tmp.h:6773
+msgid "Oufuku Card"
+msgstr "Tarxeta «Oufuku"
+
+#: src/xml/xmli18n-tmp.h:6774
+msgid "Japanese long envelope #3"
+msgstr "Sobre xaponés longo num. 3"
+
+#: src/xml/xmli18n-tmp.h:6775
+msgid "Japanese long envelope #3 landscape"
+msgstr "Sobre xaponés longo num. 3 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6776
+msgid "Japanese long envelope #4"
+msgstr "Sobre xaponés longo num. 4"
+
+#: src/xml/xmli18n-tmp.h:6777
+msgid "Japanese long envelope #4 landscape"
+msgstr "Sobre xaponés longo num. 4 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Sobre xaponés longo num. 4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Sobre xaponés longo num. 4 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Sobre xaponés longo num. 3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Sobre xaponés longo num. 3 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6782
+msgid "Japanese Kaku envelope #4"
+msgstr "Sobre xaponés «Kaku» num. 4"
+
+#: src/xml/xmli18n-tmp.h:6783
+msgid "Japanese Kaku envelope #4 landscape"
+msgstr "Sobre xaponés «Kaku» num. 4 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6784
+msgid "Commercial 10"
+msgstr "Comercial 10"
+
+#: src/xml/xmli18n-tmp.h:6785
+msgid "Commercial 10 landscape"
+msgstr "Comercial 10 apaisado"
+
+#: src/xml/xmli18n-tmp.h:6786
+msgid "A2 Invitation"
+msgstr "Convite A2"
+
+#: src/xml/xmli18n-tmp.h:6787
+msgid "Monarch Envelope"
+msgstr "Sobre Monarch"
+
+#: src/xml/xmli18n-tmp.h:6788
+msgid "Monarch Envelope landscape"
+msgstr "Sobre Monarch apaisado"
+
+#: src/xml/xmli18n-tmp.h:6789
+msgid "4x5 3/8"
+msgstr "4x5 3/8"
+
+#: src/xml/xmli18n-tmp.h:6790
+msgid "4x7"
+msgstr "4x7"
+
+#: src/xml/xmli18n-tmp.h:6791
+msgid "Wide 101.6x180.6"
+msgstr "Ancha 101.6x180.6"
+
+#: src/xml/xmli18n-tmp.h:6792
+msgid "CP_L"
+msgstr "CP_L"
+
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
+msgid "Card"
+msgstr "Tarxeta"
+
+#: src/xml/xmli18n-tmp.h:6795
+msgid "Wide Postcard"
+msgstr "Tarxeta postal longa"
+
+#: src/xml/xmli18n-tmp.h:6796
+msgid "Chilean Office"
+msgstr "Oficio chileno"
+
+#: src/xml/xmli18n-tmp.h:6797
+msgid "Chilean Double Letter"
+msgstr "Dobre carta chilena"
+
+#: src/xml/xmli18n-tmp.h:6798
+msgid "Chilean Double Office"
+msgstr "Dobre oficio chileno"
+
+#: src/xml/xmli18n-tmp.h:6799
+msgid "A3+"
+msgstr "A3+"
+
+#: src/xml/xmli18n-tmp.h:6801
+msgid "89 mm Roll Paper"
+msgstr "Papel de rolo de 89 mm"
+
+#: src/xml/xmli18n-tmp.h:6802
+msgid "4 Inch Roll Paper"
+msgstr "Papel de rolo de 4 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6803
+msgid "5 Inch Roll Paper"
+msgstr "Papel de rolo de 5 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6804
+msgid "210 mm Roll Paper"
+msgstr "Papel de rolo de 210 mm"
+
+#: src/xml/xmli18n-tmp.h:6805
+msgid "13 Inch Roll Paper"
+msgstr "Papel de rolo de 13 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6806
+msgid "17 Inch Roll Paper"
+msgstr "Papel de rolo de 17 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6807
+msgid "22 Inch Roll Paper"
+msgstr "Papel de rolo de 22 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6808
+msgid "24 Inch Roll Paper"
+msgstr "Papel de rolo de 24 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6809
+msgid "36 Inch Roll Paper"
+msgstr "Papel de rolo de 36 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6810
+msgid "44 Inch Roll Paper"
+msgstr "Papel de rolo de 44 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6811
+msgid "60 Inch Roll Paper"
+msgstr "Papel de rolo de 60 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6812
+msgid "64 Inch Roll Paper"
+msgstr "Papel de rolo de 64 polgadas"
+
+#: src/xml/xmli18n-tmp.h:6813
+msgid "PostScript Level 1"
+msgstr "PostScript nivel 1"
+
+#: src/xml/xmli18n-tmp.h:6814
+msgid "PostScript Level 2"
+msgstr "PostScript nivel 2"
+
+#: src/xml/xmli18n-tmp.h:6815
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
+
+#: src/xml/xmli18n-tmp.h:6816
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
+
+#: src/xml/xmli18n-tmp.h:6817
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
+
+#: src/xml/xmli18n-tmp.h:6818
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
+
+#: src/xml/xmli18n-tmp.h:6819
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
+
+#: src/xml/xmli18n-tmp.h:6820
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
+
+#: src/xml/xmli18n-tmp.h:6821
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
+
+#: src/xml/xmli18n-tmp.h:6822
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
+
+#: src/xml/xmli18n-tmp.h:6823
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
+
+#: src/xml/xmli18n-tmp.h:6824
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
+
+#: src/xml/xmli18n-tmp.h:6825
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
+
+#: src/xml/xmli18n-tmp.h:6826
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
+
+#: src/xml/xmli18n-tmp.h:6827
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
+
+#: src/xml/xmli18n-tmp.h:6828
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
+
+#: src/xml/xmli18n-tmp.h:6829
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
+
+#: src/xml/xmli18n-tmp.h:6830
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
+
+#: src/xml/xmli18n-tmp.h:6831
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
+
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-5100"
+
+#: src/xml/xmli18n-tmp.h:6834
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6835
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
+
+#: src/xml/xmli18n-tmp.h:6836
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
+
+#: src/xml/xmli18n-tmp.h:6837
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
+
+#: src/xml/xmli18n-tmp.h:6838
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
+
+#: src/xml/xmli18n-tmp.h:6839
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
+
+#: src/xml/xmli18n-tmp.h:6840
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
+
+#: src/xml/xmli18n-tmp.h:6841
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
+
+#: src/xml/xmli18n-tmp.h:6842
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-8500"
+
+#: src/xml/xmli18n-tmp.h:6843
+msgid "Canon S100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6844
+msgid "Canon S200"
+msgstr "Canon S200"
+
+#: src/xml/xmli18n-tmp.h:6845
+msgid "Canon S300"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6848
+msgid "Canon S450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6849
+msgid "Canon S500"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
+msgid "Canon S600"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:6853
+msgid "Canon S630"
+msgstr "Canon S630"
+
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
+msgid "Canon S800"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6861
+#, fuzzy
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
+
+#: src/xml/xmli18n-tmp.h:6862
+#, fuzzy
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
+
+#: src/xml/xmli18n-tmp.h:6863
+#, fuzzy
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2200"
+
+#: src/xml/xmli18n-tmp.h:6864
+#, fuzzy
+msgid "Canon PIXMA mini320"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
+
+#: src/xml/xmli18n-tmp.h:6866
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6867
+#, fuzzy
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6868
+#, fuzzy
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXMA iP1000"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6876
+msgid "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
+msgid "Canon PIXMA iP4100"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
+msgid "Canon PIXMA iP4200"
+msgstr "Canon PIXMA iP4200"
+
+#: src/xml/xmli18n-tmp.h:6881
+msgid "Canon PIXMA iP4300"
+msgstr "Canon PIXMA iP4300"
+
+#: src/xml/xmli18n-tmp.h:6882
+msgid "Canon PIXMA iP4500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6883
+msgid "Canon PIXMA iP4600"
+msgstr "Canon PIXMA iP4600"
+
+#: src/xml/xmli18n-tmp.h:6884
+msgid "Canon PIXMA iP4700"
+msgstr "Canon PIXMA iP4700"
+
+#: src/xml/xmli18n-tmp.h:6885
+msgid "Canon PIXMA iP4800"
+msgstr "Canon PIXMA iP4800"
+
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
+msgid "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iP5000"
+
+#: src/xml/xmli18n-tmp.h:6888
+msgid "Canon PIXMA iP5200"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
+msgid "Canon PIXMA iP5300"
+msgstr "Canon PIXMA iP5300"
+
+#: src/xml/xmli18n-tmp.h:6891
+msgid "Canon PIXMA iP6000D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6892
+msgid "Canon PIXMA iP6100D"
+msgstr "Canon PIXMA iP6100D"
+
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6100D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2200"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6100D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6100D"
+
+#: src/xml/xmli18n-tmp.h:6897
+msgid "Canon PIXMA iP6600D"
+msgstr "Canon PIXMA iP6600D"
+
+#: src/xml/xmli18n-tmp.h:6898
+msgid "Canon PIXMA iP6700"
+msgstr "Canon PIXMA iP6700"
+
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
+msgid "Canon PIXMA iP8500"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iX4000"
+
+#: src/xml/xmli18n-tmp.h:6906
+msgid "Canon PIXMA iX5000"
+msgstr "Canon PIXMA iX5000"
+
+#: src/xml/xmli18n-tmp.h:6907
+msgid "Canon PIXMA iX6500"
+msgstr "Canon PIXMA iX6500"
+
+#: src/xml/xmli18n-tmp.h:6908
+msgid "Canon PIXMA iX7000"
+msgstr "Canon PIXMA iX7000"
+
+#: src/xml/xmli18n-tmp.h:6909
+msgid "Canon PIXMA Pro9000"
+msgstr "Canon PIXMA Pro9000"
+
+#: src/xml/xmli18n-tmp.h:6910
+msgid "Canon PIXMA Pro9000mk2"
+msgstr "Canon PIXMA Pro9000mk2"
+
+#: src/xml/xmli18n-tmp.h:6911
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6912
+msgid "Canon PIXMA Pro9500mk2"
+msgstr "Canon PIXMA Pro9500mk2"
+
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
+msgid "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6915
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6916
+msgid "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6917
+msgid "Canon PIXMA MP180"
+msgstr "Canon PIXMA MP180"
+
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
+msgid "Canon PIXMA MP220"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
+msgid "Canon PIXMA MP250"
+msgstr "Canon PIXMA MP250"
+
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
+msgid "Canon PIXMA MP270"
+msgstr "Canon PIXMA MP270"
+
+#: src/xml/xmli18n-tmp.h:6925
+msgid "Canon PIXMA MP280"
+msgstr "Canon PIXMA MP280"
+
+#: src/xml/xmli18n-tmp.h:6926
+msgid "Canon PIXMA MP360"
+msgstr "Canon PIXMA MP360"
+
+#: src/xml/xmli18n-tmp.h:6927
+msgid "Canon PIXMA MP370"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
+msgid "Canon PIXMA MP390"
+msgstr "Canon PIXMA MP390"
+
+#: src/xml/xmli18n-tmp.h:6930
+msgid "Canon PIXMA MP450"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6931
+msgid "Canon PIXMA MP460"
+msgstr "Canon PIXMA MP460"
+
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
+msgid "Canon PIXMA MP480"
+msgstr "Canon PIXMA MP480"
+
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6935
+msgid "Canon PIXMA MP493"
+msgstr "Canon PIXMA MP493"
+
+#: src/xml/xmli18n-tmp.h:6936
+msgid "Canon PIXMA MP495"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6937
+msgid "Canon PIXMA MP500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6938
+msgid "Canon PIXMA MP510"
+msgstr "Canon PIXMA MP510"
+
+#: src/xml/xmli18n-tmp.h:6939
+msgid "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
+msgid "Canon PIXMA MP540"
+msgstr "Canon PIXMA MP540"
+
+#: src/xml/xmli18n-tmp.h:6942
+msgid "Canon PIXMA MP550"
+msgstr "Canon PIXMA MP550"
+
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
+msgid "Canon PIXMA MP600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
+msgid "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6947
+msgid "Canon PIXMA MP620"
+msgstr "Canon PIXMA MP620"
+
+#: src/xml/xmli18n-tmp.h:6948
+msgid "Canon PIXMA MP630"
+msgstr "Canon PIXMA MP630"
+
+#: src/xml/xmli18n-tmp.h:6949
+msgid "Canon PIXMA MP640"
+msgstr "Canon PIXMA MP640"
+
+#: src/xml/xmli18n-tmp.h:6950
+msgid "Canon PIXMA MP700"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6951
+msgid "Canon PIXMA MP710"
+msgstr "Canon PIXMA MP710"
+
+#: src/xml/xmli18n-tmp.h:6952
+msgid "Canon PIXMA MP730"
+msgstr "Canon PIXMA MP730"
+
+#: src/xml/xmli18n-tmp.h:6953
+msgid "Canon PIXMA MP740"
+msgstr "Canon PIXMA MP740"
+
+#: src/xml/xmli18n-tmp.h:6954
+msgid "Canon PIXMA MP750"
+msgstr "Canon PIXMA MP750"
+
+#: src/xml/xmli18n-tmp.h:6955
+msgid "Canon PIXMA MP760"
+msgstr "Canon PIXMA MP760"
+
+#: src/xml/xmli18n-tmp.h:6956
+msgid "Canon PIXMA MP770"
+msgstr "Canon PIXMA MP770"
+
+#: src/xml/xmli18n-tmp.h:6957
+msgid "Canon PIXMA MP780"
+msgstr "Canon PIXMA MP780"
+
+#: src/xml/xmli18n-tmp.h:6958
+msgid "Canon PIXMA MP790"
+msgstr "Canon PIXMA MP790"
+
+#: src/xml/xmli18n-tmp.h:6959
+msgid "Canon PIXMA MP800"
+msgstr "Canon PIXMA MP800"
+
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP800"
+
+#: src/xml/xmli18n-tmp.h:6961
+msgid "Canon PIXMA MP810"
+msgstr "Canon PIXMA MP810"
+
+#: src/xml/xmli18n-tmp.h:6962
+msgid "Canon PIXMA MP830"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
+msgid "Canon PIXMA MP950"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6965
+msgid "Canon PIXMA MP960"
+msgstr "Canon PIXMA MP960"
+
+#: src/xml/xmli18n-tmp.h:6966
+msgid "Canon PIXMA MP970"
+msgstr "Canon PIXMA MP970"
+
+#: src/xml/xmli18n-tmp.h:6967
+msgid "Canon PIXMA MP980"
+msgstr "Canon PIXMA MP980"
+
+#: src/xml/xmli18n-tmp.h:6968
+msgid "Canon PIXMA MP990"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
+msgid "Canon PIXUS iP3100"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6971
+msgid "Canon PIXUS iP4100"
+msgstr "Canon PIXUS iP4100"
+
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
+msgid "Canon PIXMA MG5100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6976
+msgid "Canon PIXMA MG5200"
+msgstr "Canon PIXMA MG5200"
+
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
+msgid "Canon PIXMA MG6100"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
+msgid "Canon PIXMA MG8100"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
+msgid "Canon PIXMA MX300"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6983
+msgid "Canon PIXMA MX310"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
+msgid "Canon PIXMA MX330"
+msgstr "Canon PIXMA MX330"
+
+#: src/xml/xmli18n-tmp.h:6986
+msgid "Canon PIXMA MX340"
+msgstr "Canon PIXMA MX340"
+
+#: src/xml/xmli18n-tmp.h:6987
+msgid "Canon PIXMA MX350"
+msgstr "Canon PIXMA MX350"
+
+#: src/xml/xmli18n-tmp.h:6988
+msgid "Canon PIXMA MX360"
+msgstr "Canon PIXMA MX360"
+
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
+msgid "Canon PIXMA MX410"
+msgstr "Canon PIXMA MX410"
+
+#: src/xml/xmli18n-tmp.h:6991
+msgid "Canon PIXMA MX420"
+msgstr "Canon PIXMA MX420"
+
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX410"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
+msgid "Canon PIXMA MX700"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
+msgid "Canon PIXMA MX850"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:6997
+msgid "Canon PIXMA MX860"
+msgstr "Canon PIXMA MX860"
+
+#: src/xml/xmli18n-tmp.h:6998
+msgid "Canon PIXMA MX870"
+msgstr "Canon PIXMA MX870"
+
+#: src/xml/xmli18n-tmp.h:6999
+msgid "Canon PIXMA MX880"
+msgstr "Canon PIXMA MX880"
+
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
+msgid "Canon PIXMA MX7600"
+msgstr "Canon PIXMA MX7600"
+
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
+msgid "Canon i80"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
+msgid "Canon i560"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
+msgid "Canon i850"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
+msgid "Canon i860"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
+msgstr "Canon i865"
+
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
+msgid "Epson Artisan 50"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7053
+msgid "Epson Artisan 700"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7054
+msgid "Epson Artisan 710"
+msgstr "Epson Artisan 710"
+
+#: src/xml/xmli18n-tmp.h:7055
+msgid "Epson Artisan 800"
+msgstr "Epson Artisan 800"
+
+#: src/xml/xmli18n-tmp.h:7056
+msgid "Epson Artisan 810"
+msgstr "Epson Artisan 810"
+
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:7059
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:7060
+msgid "Epson B-310"
+msgstr "Epson B-310"
+
+#: src/xml/xmli18n-tmp.h:7061
+msgid "Epson B-310N"
+msgstr "Epson B-310N"
+
+#: src/xml/xmli18n-tmp.h:7062
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:7063
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:7064
+msgid "Epson B-510DN"
+msgstr "Epson B-510DN"
+
+#: src/xml/xmli18n-tmp.h:7065
+msgid "Epson Stylus C20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:7066
+msgid "Epson Stylus C20SX"
+msgstr "Epson Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:7067
+msgid "Epson Stylus C20UX"
+msgstr "Epson Stylus C20UX"
+
+#: src/xml/xmli18n-tmp.h:7068
+msgid "Epson Stylus C40"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:7069
+msgid "Epson Stylus C40SX"
+msgstr "Epson Stylus C40SX"
+
+#: src/xml/xmli18n-tmp.h:7070
+msgid "Epson Stylus C40UX"
+msgstr "Epson Stylus C40UX"
+
+#: src/xml/xmli18n-tmp.h:7071
+msgid "Epson Stylus C41"
+msgstr "Epson Stylus C41"
+
+#: src/xml/xmli18n-tmp.h:7072
+msgid "Epson Stylus C41SX"
+msgstr "Epson Stylus C41SX"
+
+#: src/xml/xmli18n-tmp.h:7073
+msgid "Epson Stylus C41UX"
+msgstr "Epson Stylus C41UX"
+
+#: src/xml/xmli18n-tmp.h:7074
+msgid "Epson Stylus C42"
+msgstr "Epson Stylus C42"
+
+#: src/xml/xmli18n-tmp.h:7075
+msgid "Epson Stylus C42SX"
+msgstr "Epson Stylus C42SX"
+
+#: src/xml/xmli18n-tmp.h:7076
+msgid "Epson Stylus C42UX"
+msgstr "Epson Stylus C42UX"
+
+#: src/xml/xmli18n-tmp.h:7077
+msgid "Epson Stylus C43"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:7078
+msgid "Epson Stylus C43SX"
+msgstr "Epson Stylus C43SX"
+
+#: src/xml/xmli18n-tmp.h:7079
+msgid "Epson Stylus C43UX"
+msgstr "Epson Stylus C43UX"
+
+#: src/xml/xmli18n-tmp.h:7080
+msgid "Epson Stylus C44"
+msgstr "Epson Stylus C44"
+
+#: src/xml/xmli18n-tmp.h:7081
+msgid "Epson Stylus C44SX"
+msgstr "Epson Stylus C44SX"
+
+#: src/xml/xmli18n-tmp.h:7082
+msgid "Epson Stylus C44UX"
+msgstr "Epson Stylus C44UX"
+
+#: src/xml/xmli18n-tmp.h:7083
+msgid "Epson Stylus C45"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:7084
+msgid "Epson Stylus C46"
+msgstr "Epson Stylus C46"
+
+#: src/xml/xmli18n-tmp.h:7085
+msgid "Epson Stylus C48"
+msgstr "Epson Stylus C48"
+
+#: src/xml/xmli18n-tmp.h:7086
+msgid "Epson Stylus C50"
+msgstr "Epson Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7087
+msgid "Epson Stylus C60"
+msgstr "Epson Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7088
+msgid "Epson Stylus C61"
+msgstr "Epson Stylus C61"
+
+#: src/xml/xmli18n-tmp.h:7089
+msgid "Epson Stylus C62"
+msgstr "Epson Stylus C62"
+
+#: src/xml/xmli18n-tmp.h:7090
+msgid "Epson Stylus C63"
+msgstr "Epson Stylus C63"
+
+#: src/xml/xmli18n-tmp.h:7091
+msgid "Epson Stylus C64"
+msgstr "Epson Stylus C64"
+
+#: src/xml/xmli18n-tmp.h:7092
+msgid "Epson Stylus C65"
+msgstr "Epson Stylus C65"
+
+#: src/xml/xmli18n-tmp.h:7093
+msgid "Epson Stylus C66"
+msgstr "Epson Stylus C66"
+
+#: src/xml/xmli18n-tmp.h:7094
+msgid "Epson Stylus C68"
+msgstr "Epson Stylus C68"
+
+#: src/xml/xmli18n-tmp.h:7095
+msgid "Epson Stylus C70"
+msgstr "Epson Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7096
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C79"
+
+#: src/xml/xmli18n-tmp.h:7097
+msgid "Epson Stylus C80"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:7098
+msgid "Epson Stylus C82"
+msgstr "Epson Stylus C82"
+
+#: src/xml/xmli18n-tmp.h:7099
+msgid "Epson Stylus C83"
+msgstr "Epson Stylus C83"
+
+#: src/xml/xmli18n-tmp.h:7100
+msgid "Epson Stylus C84"
+msgstr "Epson Stylus C84"
+
+#: src/xml/xmli18n-tmp.h:7101
+msgid "Epson Stylus C85"
+msgstr "Epson Stylus C85"
+
+#: src/xml/xmli18n-tmp.h:7102
+msgid "Epson Stylus C86"
+msgstr "Epson Stylus C86"
+
+#: src/xml/xmli18n-tmp.h:7103
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C87"
+
+#: src/xml/xmli18n-tmp.h:7104
+msgid "Epson Stylus C88"
+msgstr "Epson Stylus C88"
+
+#: src/xml/xmli18n-tmp.h:7105
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C110"
+
+#: src/xml/xmli18n-tmp.h:7106
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C120"
+
+#: src/xml/xmli18n-tmp.h:7107
+msgid "Epson Stylus Color"
+msgstr "Epson Stylus Color"
+
+#: src/xml/xmli18n-tmp.h:7108
+msgid "Epson Stylus Color I"
+msgstr "Epson Stylus Color I"
+
+#: src/xml/xmli18n-tmp.h:7109
+msgid "Epson Stylus Color II"
+msgstr "Epson Stylus Color II"
+
+#: src/xml/xmli18n-tmp.h:7110
+msgid "Epson Stylus Color IIs"
+msgstr "Epson Stylus Color IIs"
+
+#: src/xml/xmli18n-tmp.h:7111
+msgid "Epson Stylus Color PRO"
+msgstr "Epson Stylus Color PRO"
+
+#: src/xml/xmli18n-tmp.h:7112
+msgid "Epson Stylus Pro XL"
+msgstr "Epson Stylus Pro XL"
+
+#: src/xml/xmli18n-tmp.h:7113
+msgid "Epson Stylus Color 400"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7114
+msgid "Epson Stylus Color 440"
+msgstr "Epson Stylus Color 440"
+
+#: src/xml/xmli18n-tmp.h:7115
+msgid "Epson Stylus Color 460"
+msgstr "Epson Stylus Color 460"
+
+#: src/xml/xmli18n-tmp.h:7116
+msgid "Epson Stylus Color 480"
+msgstr "Epson Stylus Color 480"
+
+#: src/xml/xmli18n-tmp.h:7117
+msgid "Epson Stylus Color 500"
+msgstr "Epson Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7118
+msgid "Epson Stylus Color 580"
+msgstr "Epson Stylus Color 580"
+
+#: src/xml/xmli18n-tmp.h:7119
+msgid "Epson Stylus Color 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7120
+msgid "Epson Stylus Color 640"
+msgstr "Epson Stylus Color 640"
+
+#: src/xml/xmli18n-tmp.h:7121
+msgid "Epson Stylus Color 660"
+msgstr "Epson Stylus Color 660"
+
+#: src/xml/xmli18n-tmp.h:7122
+msgid "Epson Stylus Color 670"
+msgstr "Epson Stylus Color 670"
+
+#: src/xml/xmli18n-tmp.h:7123
+msgid "Epson Stylus Color 680"
+msgstr "Epson Stylus Color 680"
+
+#: src/xml/xmli18n-tmp.h:7124
+msgid "Epson Stylus Color 740"
+msgstr "Epson Stylus Color 740"
+
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Epson Stylus Color 760"
+msgstr "Epson Stylus Color 760"
+
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Epson Stylus Color 777"
+msgstr "Epson Stylus Color 777"
+
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Epson Stylus Color 800"
+msgstr "Epson Stylus Color 800"
+
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Epson Stylus Color 850"
+msgstr "Epson Stylus Color 850"
+
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Epson Stylus Color 860"
+msgstr "Epson Stylus Color 860"
+
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Epson Stylus Color 880"
+msgstr "Epson Stylus Color 880"
+
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Epson Stylus Color 8 3"
+msgstr "Epson Stylus Color 8 3"
+
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Epson Stylus Color 900"
+msgstr "Epson Stylus Color 900"
+
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Epson Stylus Color 980"
+msgstr "Epson Stylus Color 980"
+
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Epson Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
+
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Epson Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
+
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Epson Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
+
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Epson Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
+
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus Office B33"
+
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus Office B40W"
+
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Epson Stylus Office B1100"
+msgstr "Epson Stylus Office B1100"
+
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus Office T30"
+
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus Office T33"
+
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus Office T40W"
+
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Epson Stylus Office T1100"
+msgstr "Epson Stylus Office T1100"
+
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Epson Stylus Office T1110"
+msgstr "Epson Stylus Office T1110"
+
+#: src/xml/xmli18n-tmp.h:7147
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus Office BX300F"
+
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus Office SX600FW"
+
+#: src/xml/xmli18n-tmp.h:7153
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
+
+#: src/xml/xmli18n-tmp.h:7154
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
+msgid "Epson Stylus Photo"
+msgstr "Epson Stylus Photo"
+
+#: src/xml/xmli18n-tmp.h:7157
+msgid "Epson Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7158
+msgid "Epson Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
+
+#: src/xml/xmli18n-tmp.h:7159
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
+
+#: src/xml/xmli18n-tmp.h:7160
+msgid "Epson Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
+
+#: src/xml/xmli18n-tmp.h:7161
+msgid "Epson Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
+
+#: src/xml/xmli18n-tmp.h:7162
+msgid "Epson Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
+
+#: src/xml/xmli18n-tmp.h:7163
+msgid "Epson Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
+
+#: src/xml/xmli18n-tmp.h:7164
+msgid "Epson Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
+
+#: src/xml/xmli18n-tmp.h:7165
+msgid "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
+
+#: src/xml/xmli18n-tmp.h:7166
+msgid "Epson Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
+
+#: src/xml/xmli18n-tmp.h:7167
+msgid "Epson Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
+
+#: src/xml/xmli18n-tmp.h:7168
+msgid "Epson Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
+
+#: src/xml/xmli18n-tmp.h:7169
+msgid "Epson Stylus Photo 830U"
+msgstr "Epson Stylus Photo 830U"
+
+#: src/xml/xmli18n-tmp.h:7170
+msgid "Epson Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
+
+#: src/xml/xmli18n-tmp.h:7171
+msgid "Epson Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
+
+#: src/xml/xmli18n-tmp.h:7172
+msgid "Epson Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
+
+#: src/xml/xmli18n-tmp.h:7173
+msgid "Epson Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
+
+#: src/xml/xmli18n-tmp.h:7174
+msgid "Epson Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
+
+#: src/xml/xmli18n-tmp.h:7175
+msgid "Epson Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
+
+#: src/xml/xmli18n-tmp.h:7176
+msgid "Epson Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
+
+#: src/xml/xmli18n-tmp.h:7177
+msgid "Epson Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
+
+#: src/xml/xmli18n-tmp.h:7178
+msgid "Epson Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
+
+#: src/xml/xmli18n-tmp.h:7179
+msgid "Epson Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
+
+#: src/xml/xmli18n-tmp.h:7180
+msgid "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7181
+msgid "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/xml/xmli18n-tmp.h:7182
+msgid "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:7183
+msgid "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:7184
+msgid "Epson Stylus Photo 1290s"
+msgstr "Epson Stylus Photo 1290s"
+
+#: src/xml/xmli18n-tmp.h:7185
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1400"
+
+#: src/xml/xmli18n-tmp.h:7186
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 1410"
+
+#: src/xml/xmli18n-tmp.h:7187
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
+
+#: src/xml/xmli18n-tmp.h:7188
+msgid "Epson Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
+
+#: src/xml/xmli18n-tmp.h:7189
+msgid "Epson Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
+
+#: src/xml/xmli18n-tmp.h:7190
+msgid "Epson Stylus Photo P50"
+msgstr "Epson Stylus Photo P50"
+
+#: src/xml/xmli18n-tmp.h:7191
+msgid "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7192
+msgid "Epson Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
+
+#: src/xml/xmli18n-tmp.h:7193
+msgid "Epson Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
+
+#: src/xml/xmli18n-tmp.h:7194
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R230"
+
+#: src/xml/xmli18n-tmp.h:7195
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R240"
+
+#: src/xml/xmli18n-tmp.h:7196
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo R245"
+
+#: src/xml/xmli18n-tmp.h:7197
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R260"
+
+#: src/xml/xmli18n-tmp.h:7198
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo R265"
+
+#: src/xml/xmli18n-tmp.h:7199
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo R270"
+
+#: src/xml/xmli18n-tmp.h:7200
+msgid "Epson Stylus Photo R280"
+msgstr "Epson Stylus Photo R280"
+
+#: src/xml/xmli18n-tmp.h:7201
+msgid "Epson Stylus Photo R285"
+msgstr "Epson Stylus Photo R285"
+
+#: src/xml/xmli18n-tmp.h:7202
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo R290"
+
+#: src/xml/xmli18n-tmp.h:7203
+msgid "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
+
+#: src/xml/xmli18n-tmp.h:7204
+msgid "Epson Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
+
+#: src/xml/xmli18n-tmp.h:7205
+msgid "Epson Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
+
+#: src/xml/xmli18n-tmp.h:7206
+msgid "Epson Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
+
+#: src/xml/xmli18n-tmp.h:7207
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R350"
+
+#: src/xml/xmli18n-tmp.h:7208
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R360"
+
+#: src/xml/xmli18n-tmp.h:7209
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R380"
+
+#: src/xml/xmli18n-tmp.h:7210
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R390"
+
+#: src/xml/xmli18n-tmp.h:7211
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:7212
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:7213
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:7216
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:7217
+msgid "Epson Stylus Photo R3000"
+msgstr "Epson Stylus Photo R3000"
+
+#: src/xml/xmli18n-tmp.h:7218
+msgid "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/xml/xmli18n-tmp.h:7219
+msgid "Epson Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
+
+#: src/xml/xmli18n-tmp.h:7220
+msgid "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/xml/xmli18n-tmp.h:7221
+msgid "Epson Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
+
+#: src/xml/xmli18n-tmp.h:7222
+msgid "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/xml/xmli18n-tmp.h:7223
+msgid "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:7224
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:7225
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX580"
+
+#: src/xml/xmli18n-tmp.h:7226
+msgid "Epson Stylus Photo RX585"
+msgstr "Epson Stylus Photo RX585"
+
+#: src/xml/xmli18n-tmp.h:7227
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX590"
+
+#: src/xml/xmli18n-tmp.h:7228
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX595"
+
+#: src/xml/xmli18n-tmp.h:7229
+msgid "Epson Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7230
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX610"
+
+#: src/xml/xmli18n-tmp.h:7231
+msgid "Epson Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
+
+#: src/xml/xmli18n-tmp.h:7232
+msgid "Epson Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
+
+#: src/xml/xmli18n-tmp.h:7233
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX640"
+
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
+msgid "Epson Stylus Photo RX680"
+msgstr "Epson Stylus Photo RX680"
+
+#: src/xml/xmli18n-tmp.h:7236
+msgid "Epson Stylus Photo RX685"
+msgstr "Epson Stylus Photo RX685"
+
+#: src/xml/xmli18n-tmp.h:7237
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX690"
+
+#: src/xml/xmli18n-tmp.h:7238
+msgid "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
+
+#: src/xml/xmli18n-tmp.h:7239
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo TX700W"
+
+#: src/xml/xmli18n-tmp.h:7240
+msgid "Epson Stylus Photo TX710W"
+msgstr "Epson Stylus Photo TX710W"
+
+#: src/xml/xmli18n-tmp.h:7241
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
+
+#: src/xml/xmli18n-tmp.h:7242
+msgid "Epson Stylus Photo TX810FW"
+msgstr "Epson Stylus Photo TX810FW"
+
+#: src/xml/xmli18n-tmp.h:7243
+msgid "Epson Stylus Pro 3800"
+msgstr "Epson Stylus Pro 3800"
+
+#: src/xml/xmli18n-tmp.h:7244
+msgid "Epson Stylus Pro 3880"
+msgstr "Epson Stylus Pro 3880"
+
+#: src/xml/xmli18n-tmp.h:7245
+msgid "Epson Stylus Pro 3885"
+msgstr "Epson Stylus Pro 3885"
+
+#: src/xml/xmli18n-tmp.h:7246
+msgid "Epson Stylus Pro 4000"
+msgstr "Epson Stylus Pro 4000"
+
+#: src/xml/xmli18n-tmp.h:7247
+msgid "Epson Stylus Pro 4800/4880 Back Compatible"
+msgstr "Epson Stylus Pro 4800/4880 Compatíbel cara atrás"
+
+#: src/xml/xmli18n-tmp.h:7248
+msgid "Epson Stylus Pro 4800"
+msgstr "Epson Stylus Pro 4800"
+
+#: src/xml/xmli18n-tmp.h:7249
+msgid "Epson Stylus Pro 4880"
+msgstr "Epson Stylus Pro 4880"
+
+#: src/xml/xmli18n-tmp.h:7250
+msgid "Epson Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
+
+#: src/xml/xmli18n-tmp.h:7251
+msgid "Epson Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
+
+#: src/xml/xmli18n-tmp.h:7252
+msgid "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7253
+msgid "Epson Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
+
+#: src/xml/xmli18n-tmp.h:7254
+msgid "Epson Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
+
+#: src/xml/xmli18n-tmp.h:7255
+msgid "Epson Stylus Pro 7700"
+msgstr "Epson Stylus Pro 7700"
+
+#: src/xml/xmli18n-tmp.h:7256
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:7257
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:7258
+msgid "Epson Stylus Pro 7890"
+msgstr "Epson Stylus Pro 7890"
+
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
+msgid "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7261
+msgid "Epson Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
+
+#: src/xml/xmli18n-tmp.h:7262
+msgid "Epson Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
+
+#: src/xml/xmli18n-tmp.h:7263
+msgid "Epson Stylus Pro 9700"
+msgstr "Epson Stylus Pro 9700"
+
+#: src/xml/xmli18n-tmp.h:7264
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:7265
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:7266
+msgid "Epson Stylus Pro 9890"
+msgstr "Epson Stylus Pro 9890"
+
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
+msgid "Epson Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:7269
+msgid "Epson Stylus Pro 11800/11880 Back Compatible"
+msgstr "Epson Stylus Pro 11800/11880 compatíbel cara atrás"
+
+#: src/xml/xmli18n-tmp.h:7270
+msgid "Epson Stylus Pro 11800"
+msgstr "Epson Stylus Pro 11800"
+
+#: src/xml/xmli18n-tmp.h:7271
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:7272
+msgid "Epson Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
+
+#: src/xml/xmli18n-tmp.h:7273
+msgid "Epson Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
+
+#: src/xml/xmli18n-tmp.h:7274
+msgid "Epson Stylus CX1500"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7275
+msgid "Epson Stylus CX3100"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7276
+msgid "Epson Stylus CX3200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:7277
+msgid "Epson Stylus CX3500"
+msgstr "Epson Stylus CX3500"
+
+#: src/xml/xmli18n-tmp.h:7278
+msgid "Epson Stylus CX3600"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7279
+msgid "Epson Stylus CX3650"
+msgstr "Epson Stylus CX3650"
+
+#: src/xml/xmli18n-tmp.h:7280
+msgid "Epson Stylus CX3700"
+msgstr "Epson Stylus CX3700"
+
+#: src/xml/xmli18n-tmp.h:7281
+msgid "Epson Stylus CX3800"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:7282
+msgid "Epson Stylus CX3805"
+msgstr "Epson Stylus CX3805"
+
+#: src/xml/xmli18n-tmp.h:7283
+msgid "Epson Stylus CX3810"
+msgstr "Epson Stylus CX3810"
+
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
+msgid "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7286
+msgid "Epson Stylus CX4200"
+msgstr "Epson Stylus CX4200"
+
+#: src/xml/xmli18n-tmp.h:7287
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4400"
+
+#: src/xml/xmli18n-tmp.h:7288
+msgid "Epson Stylus CX4500"
+msgstr "Epson Stylus CX4500"
+
+#: src/xml/xmli18n-tmp.h:7289
+msgid "Epson Stylus CX4600"
+msgstr "Epson Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:7290
+msgid "Epson Stylus CX4700"
+msgstr "Epson Stylus CX4700"
+
+#: src/xml/xmli18n-tmp.h:7291
+msgid "Epson Stylus CX4800"
+msgstr "Epson Stylus CX4800"
+
+#: src/xml/xmli18n-tmp.h:7292
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4900"
+
+#: src/xml/xmli18n-tmp.h:7293
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX5000"
+
+#: src/xml/xmli18n-tmp.h:7294
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX5000F"
+
+#: src/xml/xmli18n-tmp.h:7295
+msgid "Epson Stylus CX5100"
+msgstr "Epson Stylus CX5100"
+
+#: src/xml/xmli18n-tmp.h:7296
+msgid "Epson Stylus CX5200"
+msgstr "Epson Stylus CX5200"
+
+#: src/xml/xmli18n-tmp.h:7297
+msgid "Epson Stylus CX5300"
+msgstr "Epson Stylus CX5300"
+
+#: src/xml/xmli18n-tmp.h:7298
+msgid "Epson Stylus CX5400"
+msgstr "Epson Stylus CX5400"
+
+#: src/xml/xmli18n-tmp.h:7299
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX5500"
+
+#: src/xml/xmli18n-tmp.h:7300
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX5600"
+
+#: src/xml/xmli18n-tmp.h:7301
+msgid "Epson Stylus CX5700"
+msgstr "Epson Stylus CX5700"
+
+#: src/xml/xmli18n-tmp.h:7302
+msgid "Epson Stylus CX5800"
+msgstr "Epson Stylus CX5800"
+
+#: src/xml/xmli18n-tmp.h:7303
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX6000"
+
+#: src/xml/xmli18n-tmp.h:7304
+msgid "Epson Stylus CX6300"
+msgstr "Epson Stylus CX6300"
+
+#: src/xml/xmli18n-tmp.h:7305
+msgid "Epson Stylus CX6400"
+msgstr "Epson Stylus CX6400"
+
+#: src/xml/xmli18n-tmp.h:7306
+msgid "Epson Stylus CX6500"
+msgstr "Epson Stylus CX6500"
+
+#: src/xml/xmli18n-tmp.h:7307
+msgid "Epson Stylus CX6600"
+msgstr "Epson Stylus CX6600"
+
+#: src/xml/xmli18n-tmp.h:7308
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX7000F"
+
+#: src/xml/xmli18n-tmp.h:7309
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX7400"
+
+#: src/xml/xmli18n-tmp.h:7310
+msgid "Epson Stylus CX7700"
+msgstr "Epson Stylus CX7700"
+
+#: src/xml/xmli18n-tmp.h:7311
+msgid "Epson Stylus CX7800"
+msgstr "Epson Stylus CX7800"
+
+#: src/xml/xmli18n-tmp.h:7312
+msgid "Epson Stylus CX8300"
+msgstr "Epson Stylus CX8300"
+
+#: src/xml/xmli18n-tmp.h:7313
+msgid "Epson Stylus CX8400"
+msgstr "Epson Stylus CX8400"
+
+#: src/xml/xmli18n-tmp.h:7314
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX9300F"
+
+#: src/xml/xmli18n-tmp.h:7315
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:7316
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400F"
+
+#: src/xml/xmli18n-tmp.h:7317
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus CX9475F"
+
+#: src/xml/xmli18n-tmp.h:7318
+msgid "Epson Stylus D68"
+msgstr "Epson Stylus D68"
+
+#: src/xml/xmli18n-tmp.h:7319
+msgid "Epson Stylus D88"
+msgstr "Epson Stylus D88"
+
+#: src/xml/xmli18n-tmp.h:7320
+msgid "Epson Stylus D92"
+msgstr "Epson Stylus D92"
+
+#: src/xml/xmli18n-tmp.h:7321
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus D120"
+
+#: src/xml/xmli18n-tmp.h:7322
+msgid "Epson Stylus DX3800"
+msgstr "Epson Stylus DX3800"
+
+#: src/xml/xmli18n-tmp.h:7323
+msgid "Epson Stylus DX3850"
+msgstr "Epson Stylus DX3850"
+
+#: src/xml/xmli18n-tmp.h:7324
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:7325
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:7326
+msgid "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:7327
+msgid "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4250"
+
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Epson Stylus DX4400"
+msgstr "Epson Stylus DX4400"
+
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Epson Stylus DX4450"
+msgstr "Epson Stylus DX4450"
+
+#: src/xml/xmli18n-tmp.h:7330
+msgid "Epson Stylus DX4800"
+msgstr "Epson Stylus DX4800"
+
+#: src/xml/xmli18n-tmp.h:7331
+msgid "Epson Stylus DX4850"
+msgstr "Epson Stylus DX4850"
+
+#: src/xml/xmli18n-tmp.h:7332
+msgid "Epson Stylus DX7000F"
+msgstr "Epson Stylus DX7000F"
+
+#: src/xml/xmli18n-tmp.h:7333
+msgid "Epson Stylus DX7400"
+msgstr "Epson Stylus DX7400"
+
+#: src/xml/xmli18n-tmp.h:7334
+msgid "Epson Stylus DX7450"
+msgstr "Epson Stylus DX7450"
+
+#: src/xml/xmli18n-tmp.h:7335
+msgid "Epson Stylus DX8400"
+msgstr "Epson Stylus DX8400"
+
+#: src/xml/xmli18n-tmp.h:7336
+msgid "Epson Stylus DX8450"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:7337
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus DX9400F"
+
+#: src/xml/xmli18n-tmp.h:7338
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus NX100"
+
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Epson Stylus NX105"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Epson Stylus NX115"
+msgstr "Epson Stylus NX115"
+
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus NX200"
+
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Epson Stylus NX215"
+msgstr "Epson Stylus NX215"
+
+#: src/xml/xmli18n-tmp.h:7343
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7344
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7345
+msgid "Epson Stylus NX415"
+msgstr "Epson Stylus NX415"
+
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
+msgid "Epson Stylus NX515"
+msgstr "Epson Stylus NX515"
+
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
+msgid "Epson Stylus Photo PX650"
+msgstr "Epson Stylus Photo PX650"
+
+#: src/xml/xmli18n-tmp.h:7351
+msgid "Epson Stylus Photo PX700W"
+msgstr "Epson Stylus Photo PX700W"
+
+#: src/xml/xmli18n-tmp.h:7352
+msgid "Epson Stylus Photo PX710W"
+msgstr "Epson Stylus Photo PX710W"
+
+#: src/xml/xmli18n-tmp.h:7353
+msgid "Epson Stylus Photo PX800FW"
+msgstr "Epson Stylus Photo PX800FW"
+
+#: src/xml/xmli18n-tmp.h:7354
+msgid "Epson Stylus Photo PX810FW"
+msgstr "Epson Stylus Photo PX810FW"
+
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus S20"
+
+#: src/xml/xmli18n-tmp.h:7356
+msgid "Epson Stylus S21"
+msgstr "Epson Stylus S21"
+
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Epson Stylus S50"
+msgstr "Epson Stylus S50"
+
+#: src/xml/xmli18n-tmp.h:7358
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus SX100"
+
+#: src/xml/xmli18n-tmp.h:7359
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7360
+msgid "Epson Stylus SX110"
+msgstr "Epson Stylus SX110"
+
+#: src/xml/xmli18n-tmp.h:7361
+msgid "Epson Stylus SX115"
+msgstr "Epson Stylus SX115"
+
+#: src/xml/xmli18n-tmp.h:7362
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus SX200"
+
+#: src/xml/xmli18n-tmp.h:7363
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus SX205"
+
+#: src/xml/xmli18n-tmp.h:7364
+msgid "Epson Stylus SX210"
+msgstr "Epson Stylus SX210"
+
+#: src/xml/xmli18n-tmp.h:7365
+msgid "Epson Stylus SX215"
+msgstr "Epson Stylus SX215"
+
+#: src/xml/xmli18n-tmp.h:7366
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7367
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus SX405"
+
+#: src/xml/xmli18n-tmp.h:7368
+msgid "Epson Stylus SX410"
+msgstr "Epson Stylus SX410"
+
+#: src/xml/xmli18n-tmp.h:7369
+msgid "Epson Stylus SX415"
+msgstr "Epson Stylus SX415"
+
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
+msgid "Epson Stylus SX510W"
+msgstr "Epson Stylus SX510W"
+
+#: src/xml/xmli18n-tmp.h:7372
+msgid "Epson Stylus SX515"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
+msgid "Epson Stylus SX600FW"
+msgstr "Epson Stylus SX600FW"
+
+#: src/xml/xmli18n-tmp.h:7376
+msgid "Epson Stylus SX610FW"
+msgstr "Epson Stylus SX610FW"
+
+#: src/xml/xmli18n-tmp.h:7377
+msgid "Epson Stylus SX615"
+msgstr "Epson Stylus SX615"
+
+#: src/xml/xmli18n-tmp.h:7378
+msgid "Epson Stylus SX650"
+msgstr "Epson Stylus SX650"
+
+#: src/xml/xmli18n-tmp.h:7379
+msgid "Epson Stylus T13"
+msgstr "Epson Stylus T13"
+
+#: src/xml/xmli18n-tmp.h:7380
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus T20"
+
+#: src/xml/xmli18n-tmp.h:7381
+msgid "Epson Stylus T21"
+msgstr "Epson Stylus T21"
+
+#: src/xml/xmli18n-tmp.h:7382
+msgid "Epson Stylus T22"
+msgstr "Epson Stylus T22"
+
+#: src/xml/xmli18n-tmp.h:7383
+msgid "Epson Stylus T22E"
+msgstr "Epson Stylus T22E"
+
+#: src/xml/xmli18n-tmp.h:7384
+msgid "Epson Stylus T26"
+msgstr "Epson Stylus T26"
+
+#: src/xml/xmli18n-tmp.h:7385
+msgid "Epson Stylus T30"
+msgstr "Epson Stylus T30"
+
+#: src/xml/xmli18n-tmp.h:7386
+msgid "Epson Stylus T40W"
+msgstr "Epson Stylus T40W"
+
+#: src/xml/xmli18n-tmp.h:7387
+msgid "Epson Stylus T50"
+msgstr "Epson Stylus T50"
+
+#: src/xml/xmli18n-tmp.h:7388
+msgid "Epson Stylus T59"
+msgstr "Epson Stylus T59"
+
+#: src/xml/xmli18n-tmp.h:7389
+msgid "Epson Stylus T60"
+msgstr "Epson Stylus T60"
+
+#: src/xml/xmli18n-tmp.h:7390
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus TX100"
+
+#: src/xml/xmli18n-tmp.h:7391
+msgid "Epson Stylus TX101"
+msgstr "Epson Stylus TX101"
+
+#: src/xml/xmli18n-tmp.h:7392
+msgid "Epson Stylus TX102"
+msgstr "Epson Stylus TX102"
+
+#: src/xml/xmli18n-tmp.h:7393
+msgid "Epson Stylus TX103"
+msgstr "Epson Stylus TX103"
+
+#: src/xml/xmli18n-tmp.h:7394
+msgid "Epson Stylus TX104"
+msgstr "Epson Stylus TX104"
+
+#: src/xml/xmli18n-tmp.h:7395
+msgid "Epson Stylus TX105"
+msgstr "Epson Stylus TX105"
+
+#: src/xml/xmli18n-tmp.h:7396
+msgid "Epson Stylus TX106"
+msgstr "Epson Stylus TX106"
+
+#: src/xml/xmli18n-tmp.h:7397
+msgid "Epson Stylus TX109"
+msgstr "Epson Stylus TX109"
+
+#: src/xml/xmli18n-tmp.h:7398
+msgid "Epson Stylus TX110"
+msgstr "Epson Stylus TX110"
+
+#: src/xml/xmli18n-tmp.h:7399
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus TX200"
+
+#: src/xml/xmli18n-tmp.h:7400
+msgid "Epson Stylus TX210"
+msgstr "Epson Stylus TX210"
+
+#: src/xml/xmli18n-tmp.h:7401
+msgid "Epson Stylus TX300F"
+msgstr "Epson Stylus TX300F"
+
+#: src/xml/xmli18n-tmp.h:7402
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7403
+msgid "Epson Stylus TX410"
+msgstr "Epson Stylus TX410"
+
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
+msgid "Epson Stylus TX510FN"
+msgstr "Epson Stylus TX510FN"
+
+#: src/xml/xmli18n-tmp.h:7406
+msgid "Epson Stylus TX550W"
+msgstr "Epson Stylus TX550W"
+
+#: src/xml/xmli18n-tmp.h:7407
+msgid "Epson Stylus TX610FW"
+msgstr "Epson Stylus TX610FW"
+
+#: src/xml/xmli18n-tmp.h:7408
+msgid "Epson Stylus TX615"
+msgstr "Epson Stylus TX615"
+
+#: src/xml/xmli18n-tmp.h:7409
+msgid "Epson Stylus TX650"
+msgstr "Epson Stylus TX650"
+
+#: src/xml/xmli18n-tmp.h:7410
+msgid "Epson Stylus TX659"
+msgstr "Epson Stylus TX659"
+
+#: src/xml/xmli18n-tmp.h:7411
+msgid "Epson PictureMate"
+msgstr "Epson PictureMate"
+
+#: src/xml/xmli18n-tmp.h:7412
+msgid "Epson PictureMate Dash"
+msgstr "Epson PictureMate Dash"
+
+#: src/xml/xmli18n-tmp.h:7413
+msgid "Epson PictureMate Deluxe"
+msgstr "pson PictureMate Deluxe"
+
+#: src/xml/xmli18n-tmp.h:7414
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate Flash"
+
+#: src/xml/xmli18n-tmp.h:7415
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate Pal"
+
+#: src/xml/xmli18n-tmp.h:7416
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate Snap"
+
+#: src/xml/xmli18n-tmp.h:7417
+msgid "Epson PictureMate 100"
+msgstr "Epson PictureMate 100"
+
+#: src/xml/xmli18n-tmp.h:7418
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate 200"
+
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:7420
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 215"
+
+#: src/xml/xmli18n-tmp.h:7421
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate 240"
+
+#: src/xml/xmli18n-tmp.h:7422
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate 250"
+
+#: src/xml/xmli18n-tmp.h:7423
+msgid "Epson PictureMate 260"
+msgstr "Epson PictureMate 260"
+
+#: src/xml/xmli18n-tmp.h:7424
+msgid "Epson PictureMate 270"
+msgstr "Epson PictureMate 270"
+
+#: src/xml/xmli18n-tmp.h:7425
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate 280"
+
+#: src/xml/xmli18n-tmp.h:7426
+msgid "Epson PictureMate 290"
+msgstr "Epson PictureMate 290"
+
+#: src/xml/xmli18n-tmp.h:7427
+msgid "Epson PictureMate 500"
+msgstr "Epson PictureMate 500"
+
+#: src/xml/xmli18n-tmp.h:7428
+msgid "Epson PictureMate 2005"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:7429
+msgid "Epson WorkForce 30"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7430
+msgid "Epson WorkForce 40"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7431
+msgid "Epson WorkForce 310"
+msgstr "Epson WorkForce 310"
+
+#: src/xml/xmli18n-tmp.h:7432
+msgid "Epson WorkForce 315"
+msgstr "Epson WorkForce 315"
+
+#: src/xml/xmli18n-tmp.h:7433
+msgid "Epson WorkForce 500"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
+msgid "Epson WorkForce 600"
+msgstr "Epson WorkForce 600"
+
+#: src/xml/xmli18n-tmp.h:7436
+msgid "Epson WorkForce 610"
+msgstr "Epson WorkForce 610"
+
+#: src/xml/xmli18n-tmp.h:7437
+msgid "Epson WorkForce 615"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
+msgid "Epson WorkForce 1100"
+msgstr "Epson WorkForce 1100"
+
+#: src/xml/xmli18n-tmp.h:7442
+msgid "Epson CL 700"
+msgstr "Epson CL 700"
+
+#: src/xml/xmli18n-tmp.h:7443
+msgid "Epson CL 750"
+msgstr "Epson CL 750"
+
+#: src/xml/xmli18n-tmp.h:7444
+msgid "Epson CL 760"
+msgstr "Epson CL 760"
+
+#: src/xml/xmli18n-tmp.h:7445
+msgid "Epson E 100"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7446
+msgid "Epson E 150"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:7447
+msgid "Epson E 200"
+msgstr "Epson E 200"
+
+#: src/xml/xmli18n-tmp.h:7448
+msgid "Epson E 300"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:7449
+msgid "Epson E 500"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:7450
+msgid "Epson E 520"
+msgstr "Epson E 520"
+
+#: src/xml/xmli18n-tmp.h:7451
+msgid "Epson E 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:7452
+msgid "Epson E 720"
+msgstr "Epson E 720"
+
+#: src/xml/xmli18n-tmp.h:7453
+msgid "Epson EM 900C"
+msgstr "Epson EM 900C"
+
+#: src/xml/xmli18n-tmp.h:7454
+msgid "Epson EM 930C"
+msgstr "Epson EM 930C"
+
+#: src/xml/xmli18n-tmp.h:7455
+msgid "Epson EP 302"
+msgstr "Epson EP 302"
+
+#: src/xml/xmli18n-tmp.h:7456
+msgid "Epson EP 702A"
+msgstr "Epson EP 702A"
+
+#: src/xml/xmli18n-tmp.h:7457
+msgid "Epson EP 801A"
+msgstr "Epson EP 801A"
+
+#: src/xml/xmli18n-tmp.h:7458
+msgid "Epson EP 901A"
+msgstr "Epson EP 901A"
+
+#: src/xml/xmli18n-tmp.h:7459
+msgid "Epson EP 901F"
+msgstr "Epson EP 901F"
+
+#: src/xml/xmli18n-tmp.h:7460
+msgid "Epson MC 2000"
+msgstr "Epson MC 2000"
+
+#: src/xml/xmli18n-tmp.h:7461
+msgid "Epson MC 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:7462
+msgid "Epson MC 7000"
+msgstr "Epson MC 7000"
+
+#: src/xml/xmli18n-tmp.h:7463
+msgid "Epson MC 9000"
+msgstr "Epson MC 9000"
+
+#: src/xml/xmli18n-tmp.h:7464
+msgid "Epson MC 10000"
+msgstr "Epson MC 10000"
+
+#: src/xml/xmli18n-tmp.h:7465
+msgid "Epson ME 300"
+msgstr "Epson ME 300"
+
+#: src/xml/xmli18n-tmp.h:7466
+msgid "Epson ME 320"
+msgstr "Epson ME 320"
+
+#: src/xml/xmli18n-tmp.h:7467
+msgid "Epson ME Office 70"
+msgstr "Epson ME Office 70"
+
+#: src/xml/xmli18n-tmp.h:7468
+msgid "Epson ME Office 80W"
+msgstr "Epson ME Office 80W"
+
+#: src/xml/xmli18n-tmp.h:7469
+msgid "Epson ME Office 360"
+msgstr "Epson ME Office 360"
+
+#: src/xml/xmli18n-tmp.h:7470
+msgid "Epson ME Office 600F"
+msgstr "Epson ME Office 600F"
+
+#: src/xml/xmli18n-tmp.h:7471
+msgid "Epson ME Office 620F"
+msgstr "Epson ME Office 620F"
+
+#: src/xml/xmli18n-tmp.h:7472
+msgid "Epson ME Office 700FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
+msgid "Epson ME Office 1100"
+msgstr "Epson ME Office 1100"
+
+#: src/xml/xmli18n-tmp.h:7475
+msgid "Epson MJ 930C"
+msgstr "Epson MJ 930C"
+
+#: src/xml/xmli18n-tmp.h:7476
+msgid "Epson MJ 5100C"
+msgstr "Epson MJ 5100C"
+
+#: src/xml/xmli18n-tmp.h:7477
+msgid "Epson MJ 6000C"
+msgstr "Epson MJ 6000C"
+
+#: src/xml/xmli18n-tmp.h:7478
+msgid "Epson MJ 8000C"
+msgstr "Epson MJ 8000C"
+
+#: src/xml/xmli18n-tmp.h:7479
+msgid "Epson PM 670C"
+msgstr "Epson PM 670C"
+
+#: src/xml/xmli18n-tmp.h:7480
+msgid "Epson PM 700C"
+msgstr "Epson PM 700C"
+
+#: src/xml/xmli18n-tmp.h:7481
+msgid "Epson PM 730C"
+msgstr "Epson PM 730C"
+
+#: src/xml/xmli18n-tmp.h:7482
+msgid "Epson PM 740C"
+msgstr "Epson PM 740C"
+
+#: src/xml/xmli18n-tmp.h:7483
+msgid "Epson PM 750C"
+msgstr "Epson PM 750C"
+
+#: src/xml/xmli18n-tmp.h:7484
+msgid "Epson PM 760C"
+msgstr "Epson PM 760C"
+
+#: src/xml/xmli18n-tmp.h:7485
+msgid "Epson PM 770C"
+msgstr "Epson PM 770C"
+
+#: src/xml/xmli18n-tmp.h:7486
+msgid "Epson PM 780C"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:7487
+msgid "Epson PM 790PT"
+msgstr "Epson PM 790PT"
+
+#: src/xml/xmli18n-tmp.h:7488
+msgid "Epson PM 800C"
+msgstr "Epson PM 800C"
+
+#: src/xml/xmli18n-tmp.h:7489
+msgid "Epson PM 850PT"
+msgstr "Epson PM 850PT"
+
+#: src/xml/xmli18n-tmp.h:7490
+msgid "Epson PM 870C"
+msgstr "Epson PM 870C"
+
+#: src/xml/xmli18n-tmp.h:7491
+msgid "Epson PM 880C"
+msgstr "Epson PM 880C"
+
+#: src/xml/xmli18n-tmp.h:7492
+msgid "Epson PM 930C"
+msgstr "Epson PM 930C"
+
+#: src/xml/xmli18n-tmp.h:7493
+msgid "Epson PM 940C"
+msgstr "Epson PM 940C"
+
+#: src/xml/xmli18n-tmp.h:7494
+msgid "Epson PM 950C"
+msgstr "Epson PM 950C"
+
+#: src/xml/xmli18n-tmp.h:7495
+msgid "Epson PM 970C"
+msgstr "Epson PM 970C"
+
+#: src/xml/xmli18n-tmp.h:7496
+msgid "Epson PM 980C"
+msgstr "Epson PM 980C"
+
+#: src/xml/xmli18n-tmp.h:7497
+msgid "Epson PM 2000C"
+msgstr "Epson PM 2000C"
+
+#: src/xml/xmli18n-tmp.h:7498
+msgid "Epson PM 2200C"
+msgstr "Epson PM 2200C"
+
+#: src/xml/xmli18n-tmp.h:7499
+msgid "Epson PM 3000C"
+msgstr "Epson PM 3000C"
+
+#: src/xml/xmli18n-tmp.h:7500
+msgid "Epson PM 3300C"
+msgstr "Epson PM 3300C"
+
+#: src/xml/xmli18n-tmp.h:7501
+msgid "Epson PM 3500C"
+msgstr "Epson PM 3500C"
+
+#: src/xml/xmli18n-tmp.h:7502
+msgid "Epson PM 3700C"
+msgstr "Epson PM 3700C"
+
+#: src/xml/xmli18n-tmp.h:7503
+msgid "Epson PM 4000PX"
+msgstr "Epson PM 4000PX"
+
+#: src/xml/xmli18n-tmp.h:7504
+msgid "Epson PM 5000C"
+msgstr "Epson PM 5000C"
+
+#: src/xml/xmli18n-tmp.h:7505
+msgid "Epson PM 7000C"
+msgstr "Epson PM 7000C"
+
+#: src/xml/xmli18n-tmp.h:7506
+msgid "Epson PM 9000C"
+msgstr "Epson PM 9000C"
+
+#: src/xml/xmli18n-tmp.h:7507
+msgid "Epson PM 10000"
+msgstr "Epson PM 10000"
+
+#: src/xml/xmli18n-tmp.h:7508
+msgid "Epson PM A650"
+msgstr "Epson PM A650"
+
+#: src/xml/xmli18n-tmp.h:7509
+msgid "Epson PM A750"
+msgstr "Epson PM A750"
+
+#: src/xml/xmli18n-tmp.h:7510
+msgid "Epson PM A820"
+msgstr "Epson PM A820"
+
+#: src/xml/xmli18n-tmp.h:7511
+msgid "Epson PM A890"
+msgstr "Epson PM A890"
+
+#: src/xml/xmli18n-tmp.h:7512
+msgid "Epson PM A900"
+msgstr "Epson PM A900"
+
+#: src/xml/xmli18n-tmp.h:7513
+msgid "Epson PM A940"
+msgstr "Epson PM A940"
+
+#: src/xml/xmli18n-tmp.h:7514
+msgid "Epson PM A950"
+msgstr "Epson PM A950"
+
+#: src/xml/xmli18n-tmp.h:7515
+msgid "Epson PM D600"
+msgstr "Epson PM D600"
+
+#: src/xml/xmli18n-tmp.h:7516
+msgid "Epson PM D750"
+msgstr "Epson PM D750"
+
+#: src/xml/xmli18n-tmp.h:7517
+msgid "Epson PM D770"
+msgstr "Epson PM D770"
+
+#: src/xml/xmli18n-tmp.h:7518
+msgid "Epson PM D800"
+msgstr "Epson PM D800"
+
+#: src/xml/xmli18n-tmp.h:7519
+msgid "Epson PM D870"
+msgstr "Epson PM D870"
+
+#: src/xml/xmli18n-tmp.h:7520
+msgid "Epson PM D1000"
+msgstr "Epson PM D1000"
+
+#: src/xml/xmli18n-tmp.h:7521
+msgid "Epson PM G700"
+msgstr "Epson PM G700"
+
+#: src/xml/xmli18n-tmp.h:7522
+msgid "Epson PM G720"
+msgstr "Epson PM G720"
+
+#: src/xml/xmli18n-tmp.h:7523
+msgid "Epson PM G730"
+msgstr "Epson PM G730"
+
+#: src/xml/xmli18n-tmp.h:7524
+msgid "Epson PM G800"
+msgstr "Epson PM G800"
+
+#: src/xml/xmli18n-tmp.h:7525
+msgid "Epson PM G820"
+msgstr "Epson PM G820"
+
+#: src/xml/xmli18n-tmp.h:7526
+msgid "Epson PM G850"
+msgstr "Epson PM G850"
+
+#: src/xml/xmli18n-tmp.h:7527
+msgid "Epson PM T960"
+msgstr "Epson PM T960"
+
+#: src/xml/xmli18n-tmp.h:7528
+msgid "Epson PM G4500"
+msgstr "Epson PM G4500"
+
+#: src/xml/xmli18n-tmp.h:7529
+msgid "Epson PX A650"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:7530
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:7531
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
+msgid "Epson PX 101"
+msgstr "Epson PX 101"
+
+#: src/xml/xmli18n-tmp.h:7534
+msgid "Epson PX 201"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
+msgid "Epson PX 401A"
+msgstr "Epson PX 401A"
+
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
+msgid "Epson PX 601F"
+msgstr "Epson PX 601F"
+
+#: src/xml/xmli18n-tmp.h:7539
+msgid "Epson PX 1001"
+msgstr "Epson PX 1001"
+
+#: src/xml/xmli18n-tmp.h:7540
+msgid "Epson PX G900"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:7541
+msgid "Epson PX G920"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:7542
+msgid "Epson PX G5000"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:7543
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:7544
+msgid "Epson PX V500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:7545
+msgid "Epson PX V600"
+msgstr "Epson PX V600"
+
+#: src/xml/xmli18n-tmp.h:7546
+msgid "Epson PX V630"
+msgstr "Epson PX V630"
+
+#: src/xml/xmli18n-tmp.h:7547
+msgid "Epson PX V780"
+msgstr "Epson PX V780"
+
+#: src/xml/xmli18n-tmp.h:7548
+msgid "Epson PX 5500"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7549
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:7550
+msgid "Epson PX 7000"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7551
+msgid "Epson PX 9000"
+msgstr "Epson PX 9000"
+
+#: src/xml/xmli18n-tmp.h:7552
+msgid "Apollo P-2100"
+msgstr "Apollo P-2100"
+
+#: src/xml/xmli18n-tmp.h:7553
+msgid "Apollo P-2150"
+msgstr "Apollo P-2150"
+
+#: src/xml/xmli18n-tmp.h:7554
+msgid "Apollo P-2200"
+msgstr "Apollo P-2200"
+
+#: src/xml/xmli18n-tmp.h:7555
+msgid "Apollo P-2250"
+msgstr "Apollo P-2250"
+
+#: src/xml/xmli18n-tmp.h:7556
+msgid "Apollo P-2500"
+msgstr "Apollo P-2500"
+
+#: src/xml/xmli18n-tmp.h:7557
+msgid "Apollo P-2550"
+msgstr "Apollo P-2550"
+
+#: src/xml/xmli18n-tmp.h:7558
+msgid "Apollo P-2600"
+msgstr "Apollo P-2600"
+
+#: src/xml/xmli18n-tmp.h:7559
+msgid "Apollo P-2650"
+msgstr "Apollo P-2650"
+
+#: src/xml/xmli18n-tmp.h:7560
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/xml/xmli18n-tmp.h:7561
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/xml/xmli18n-tmp.h:7562
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/xml/xmli18n-tmp.h:7563
+msgid "Apple LaserWriter Select 360"
+msgstr "Apple LaserWriter Select 360"
+
+#: src/xml/xmli18n-tmp.h:7564
+msgid "Brother DCP-1200"
+msgstr "Brother DCP-1200"
+
+#: src/xml/xmli18n-tmp.h:7565
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
+
+#: src/xml/xmli18n-tmp.h:7566
+msgid "Brother HL-1040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:7567
+msgid "Brother HL-1050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:7568
+msgid "Brother HL-1060"
+msgstr "Brother HL-1060"
+
+#: src/xml/xmli18n-tmp.h:7569
+msgid "Brother HL-1070"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:7570
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:7571
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:7572
+msgid "Brother HL-1240"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:7573
+msgid "Brother HL-1250"
+msgstr "Brother HL-1250"
+
+#: src/xml/xmli18n-tmp.h:7574
+msgid "Brother HL-1260"
+msgstr "Brother HL-1260"
+
+#: src/xml/xmli18n-tmp.h:7575
+msgid "Brother HL-1270N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:7576
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:7577
+msgid "Brother HL-1440"
+msgstr "Brother HL-1440"
+
+#: src/xml/xmli18n-tmp.h:7578
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:7579
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:7580
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:7581
+msgid "Brother HL-1660e"
+msgstr "Brother HL-1660e"
+
+#: src/xml/xmli18n-tmp.h:7582
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:7583
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:7584
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:7585
+msgid "Brother HL-2030"
+msgstr "Brother HL-2030"
+
+#: src/xml/xmli18n-tmp.h:7586
+msgid "Brother HL-2035"
+msgstr "Brother HL-2035"
+
+#: src/xml/xmli18n-tmp.h:7587
+msgid "Brother HL-2060"
+msgstr "Brother HL-2060"
+
+#: src/xml/xmli18n-tmp.h:7588
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:7589
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:7590
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:7591
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:7592
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:7593
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:7594
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:7595
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:7596
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:7597
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:7598
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:7599
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:7600
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:7601
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:7602
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:7603
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:7604
+msgid "Brother MFC-6550MC"
+msgstr "Brother MFC-6550MC"
+
+#: src/xml/xmli18n-tmp.h:7605
+msgid "Brother MFC-8300"
+msgstr "Brother MFC-8300"
+
+#: src/xml/xmli18n-tmp.h:7606
+msgid "Brother MFC-9500"
+msgstr "Brother MFC-9500"
+
+#: src/xml/xmli18n-tmp.h:7607
+msgid "Brother MFC-9600"
+msgstr "Brother MFC-9600"
+
+#: src/xml/xmli18n-tmp.h:7608
+msgid "Canon GP 335"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:7609
+msgid "Canon LBP-4sx"
+msgstr "Canon LBP-4sx"
+
+#: src/xml/xmli18n-tmp.h:7610
+msgid "Canon LBP-430"
+msgstr "Canon LBP-430"
+
+#: src/xml/xmli18n-tmp.h:7611
+msgid "Canon LBP-1000"
+msgstr "Canon LBP-1000"
+
+#: src/xml/xmli18n-tmp.h:7612
+msgid "Canon LBP-1260"
+msgstr "Canon LBP-1260"
+
+#: src/xml/xmli18n-tmp.h:7613
+msgid "Canon LBP-1760"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:7614
+msgid "Canon LBP-3360"
+msgstr "Canon LBP-3360"
+
+#: src/xml/xmli18n-tmp.h:7615
+msgid "Canon imageRunner 330s"
+msgstr "Canon imageRunner 330s"
+
+#: src/xml/xmli18n-tmp.h:7616
+msgid "Citizen ProJet II"
+msgstr "Citizen ProJet II"
+
+#: src/xml/xmli18n-tmp.h:7617
+msgid "DEC 1800"
+msgstr "DEC 1800"
+
+#: src/xml/xmli18n-tmp.h:7618
+msgid "DEC LN17"
+msgstr "DEC LN17"
+
+#: src/xml/xmli18n-tmp.h:7619
+msgid "Epson ActionLaser 1100"
+msgstr "Epson ActionLaser 1100"
+
+#: src/xml/xmli18n-tmp.h:7620
+msgid "Epson ActionLaser II"
+msgstr "Epson ActionLaser II"
+
+#: src/xml/xmli18n-tmp.h:7621
+msgid "Epson AL-C2000"
+msgstr "Epson AL-C2000"
+
+#: src/xml/xmli18n-tmp.h:7622
+msgid "Epson AL-C2000 PS3"
+msgstr "Epson AL-C2000 PS3"
+
+#: src/xml/xmli18n-tmp.h:7623
+msgid "Epson AL-C8500"
+msgstr "Epson AL-C8500"
+
+#: src/xml/xmli18n-tmp.h:7624
+msgid "Epson AL-C8500PS"
+msgstr "Epson AL-C8500PS"
+
+#: src/xml/xmli18n-tmp.h:7625
+msgid "Epson AL-C8600"
+msgstr "Epson AL-C8600"
+
+#: src/xml/xmli18n-tmp.h:7626
+msgid "Epson AL-C8600 PS3"
+msgstr "Epson AL-C8600 PS3"
+
+#: src/xml/xmli18n-tmp.h:7627
+msgid "Epson EPL-5200"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:7628
+msgid "Epson EPL-5200+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:7629
+msgid "Epson EPL-5700"
+msgstr "Epson EPL-5700"
+
+#: src/xml/xmli18n-tmp.h:7630
+msgid "Epson EPL-5700PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:7631
+msgid "Epson EPL-5800"
+msgstr "Epson EPL-5800"
+
+#: src/xml/xmli18n-tmp.h:7632
+msgid "Epson EPL-5800PS"
+msgstr "Epson EPL-5800PS"
+
+#: src/xml/xmli18n-tmp.h:7633
+msgid "Epson EPL-5900"
+msgstr "Epson EPL-5900"
+
+#: src/xml/xmli18n-tmp.h:7634
+msgid "Epson EPL-5900 PS3"
+msgstr "Epson EPL-5900 PS3"
+
+#: src/xml/xmli18n-tmp.h:7635
+msgid "Epson EPL-6100"
+msgstr "Epson EPL-6100"
+
+#: src/xml/xmli18n-tmp.h:7636
+msgid "Epson EPL-6100 PS3"
+msgstr "Epson EPL-6100 PS3"
+
+#: src/xml/xmli18n-tmp.h:7637
+msgid "Epson EPL-7100"
+msgstr "Epson EPL-7100"
+
+#: src/xml/xmli18n-tmp.h:7638
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:7639
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:7640
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:7641
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:7642
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:7643
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:7644
+msgid "Epson EPL-N2500 PS3"
+msgstr "Epson EPL-N2500 PS3"
+
+#: src/xml/xmli18n-tmp.h:7645
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:7646
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:7647
+msgid "Fujitsu PrintPartner 10V"
+msgstr "Fujitsu PrintPartner 10V"
+
+#: src/xml/xmli18n-tmp.h:7648
+msgid "Fujitsu PrintPartner 16DV"
+msgstr "Fujitsu PrintPartner 16DV"
+
+#: src/xml/xmli18n-tmp.h:7649
+msgid "Fujitsu PrintPartner 20W"
+msgstr "Fujitsu PrintPartner 20W"
+
+#: src/xml/xmli18n-tmp.h:7650
+msgid "Fujitsu PrintPartner 8000"
+msgstr "Fujitsu PrintPartner 8000"
+
+#: src/xml/xmli18n-tmp.h:7651
+msgid "Generic PCL 4 Printer"
+msgstr "Impresora xenérica PCL 4"
+
+#: src/xml/xmli18n-tmp.h:7652
+msgid "Generic PCL 4 LF Printer"
+msgstr "Impresora xenérica PCL 4 LF"
+
+#: src/xml/xmli18n-tmp.h:7653
+msgid "Generic PCL 5 Printer"
+msgstr "Impresora xenérica PCL 5"
+
+#: src/xml/xmli18n-tmp.h:7654
+msgid "Generic PCL 5 LF Printer"
+msgstr "Impresora xenérica PCL 5 LF"
+
+#: src/xml/xmli18n-tmp.h:7655
+msgid "Generic PCL 5c Printer"
+msgstr "Impresora xenérica PCL 5c"
+
+#: src/xml/xmli18n-tmp.h:7656
+msgid "Generic PCL 5c LF Printer"
+msgstr "Impresora xenérica PCL 5c LF"
+
+#: src/xml/xmli18n-tmp.h:7657
+msgid "Generic PCL 5e Printer"
+msgstr "Impresora xenérica PCL 5e"
+
+#: src/xml/xmli18n-tmp.h:7658
+msgid "Generic PCL 5e LF Printer"
+msgstr "Impresora xenérica PCL 5e LF"
+
+#: src/xml/xmli18n-tmp.h:7659
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr "Impresora xenérica PCL 6/PCL XL"
+
+#: src/xml/xmli18n-tmp.h:7660
+msgid "Generic PCL 6/PCL XL LF Printer"
+msgstr "Impresora xenérica PCL 6/PCL XL LF"
+
+#: src/xml/xmli18n-tmp.h:7661
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:7662
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:7663
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:7664
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:7665
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:7666
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
+
+#: src/xml/xmli18n-tmp.h:7667
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:7668
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
+
+#: src/xml/xmli18n-tmp.h:7669
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:7670
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:7671
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:7672
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:7673
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:7674
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:7675
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:7676
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:7677
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:7678
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:7679
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:7680
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:7681
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
+
+#: src/xml/xmli18n-tmp.h:7682
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
+
+#: src/xml/xmli18n-tmp.h:7683
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:7684
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:7685
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:7686
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:7687
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:7688
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
+
+#: src/xml/xmli18n-tmp.h:7689
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
+
+#: src/xml/xmli18n-tmp.h:7690
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
+
+#: src/xml/xmli18n-tmp.h:7691
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
+
+#: src/xml/xmli18n-tmp.h:7692
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
+
+#: src/xml/xmli18n-tmp.h:7693
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
+
+#: src/xml/xmli18n-tmp.h:7694
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
+
+#: src/xml/xmli18n-tmp.h:7695
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
+
+#: src/xml/xmli18n-tmp.h:7696
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
+
+#: src/xml/xmli18n-tmp.h:7697
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
+
+#: src/xml/xmli18n-tmp.h:7698
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
+
+#: src/xml/xmli18n-tmp.h:7699
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
+
+#: src/xml/xmli18n-tmp.h:7700
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
+
+#: src/xml/xmli18n-tmp.h:7701
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
+
+#: src/xml/xmli18n-tmp.h:7702
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
+
+#: src/xml/xmli18n-tmp.h:7703
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:7704
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:7705
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
+
+#: src/xml/xmli18n-tmp.h:7706
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:7707
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:7708
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:7709
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:7710
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:7711
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:7712
+msgid "HP Business Inkjet 2200"
+msgstr "HP Business Inkjet 2200"
+
+#: src/xml/xmli18n-tmp.h:7713
+msgid "HP Business Inkjet 2230"
+msgstr "HP Business Inkjet 2230"
+
+#: src/xml/xmli18n-tmp.h:7714
+msgid "HP Business Inkjet 2250"
+msgstr "HP Business Inkjet 2250"
+
+#: src/xml/xmli18n-tmp.h:7715
+msgid "HP Business Inkjet 2250TN"
+msgstr "HP Business Inkjet 2250TN"
+
+#: src/xml/xmli18n-tmp.h:7716
+msgid "HP Business Inkjet 2280"
+msgstr "HP Business Inkjet 2280"
+
+#: src/xml/xmli18n-tmp.h:7717
+msgid "HP Color Inkjet Printer CP1160"
+msgstr "HP Color Inkjet Printer CP1160"
+
+#: src/xml/xmli18n-tmp.h:7718
+msgid "HP Color Inkjet Printer CP1700"
+msgstr "HP Color Inkjet Printer CP1700"
+
+#: src/xml/xmli18n-tmp.h:7719
+msgid "HP Color LaserJet 2500"
+msgstr "HP Color LaserJet 2500"
+
+#: src/xml/xmli18n-tmp.h:7720
+msgid "HP Color LaserJet 4500"
+msgstr "HP Color LaserJet 4500"
+
+#: src/xml/xmli18n-tmp.h:7721
+msgid "HP Color LaserJet 4550"
+msgstr "HP Color LaserJet 4500"
+
+#: src/xml/xmli18n-tmp.h:7722
+msgid "HP Color LaserJet 4600"
+msgstr "HP Color LaserJet 4600"
+
+#: src/xml/xmli18n-tmp.h:7723
+msgid "HP Color LaserJet 5"
+msgstr "HP Color LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:7724
+msgid "HP Color LaserJet 5000"
+msgstr "HP Color LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:7725
+msgid "HP Color LaserJet 5500"
+msgstr "HP Color LaserJet 5500"
+
+#: src/xml/xmli18n-tmp.h:7726
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP Color LaserJet 8550GN"
+
+#: src/xml/xmli18n-tmp.h:7727
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/xml/xmli18n-tmp.h:7728
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/xml/xmli18n-tmp.h:7729
+msgid "HP DesignJet 430"
+msgstr "HP DesignJet 430"
+
+#: src/xml/xmli18n-tmp.h:7730
+msgid "HP DesignJet 450C"
+msgstr "HP DesignJet 450C"
+
+#: src/xml/xmli18n-tmp.h:7731
+msgid "HP DesignJet 455CA"
+msgstr "HP DesignJet 455CA"
+
+#: src/xml/xmli18n-tmp.h:7732
+msgid "HP DesignJet 488CA"
+msgstr "HP DesignJet 488CA"
+
+#: src/xml/xmli18n-tmp.h:7733
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/xml/xmli18n-tmp.h:7734
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C Plus"
+
+#: src/xml/xmli18n-tmp.h:7735
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/xml/xmli18n-tmp.h:7736
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500CP"
+
+#: src/xml/xmli18n-tmp.h:7737
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500CP"
+
+#: src/xml/xmli18n-tmp.h:7738
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet ColorPro CAD"
+
+#: src/xml/xmli18n-tmp.h:7739
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/xml/xmli18n-tmp.h:7740
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 420C"
+
+#: src/xml/xmli18n-tmp.h:7741
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 450"
+
+#: src/xml/xmli18n-tmp.h:7742
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/xml/xmli18n-tmp.h:7743
+msgid "HP DeskJet 500C"
+msgstr "HP DeskJet 500C"
+
+#: src/xml/xmli18n-tmp.h:7744
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 505J Plus"
+
+#: src/xml/xmli18n-tmp.h:7745
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 510"
+
+#: src/xml/xmli18n-tmp.h:7746
+msgid "HP DeskJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/xml/xmli18n-tmp.h:7747
+msgid "HP DeskJet 540C"
+msgstr "HP DeskJet 540C"
+
+#: src/xml/xmli18n-tmp.h:7748
+msgid "HP DeskJet 550C"
+msgstr "HP DeskJet 550C"
+
+#: src/xml/xmli18n-tmp.h:7749
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 5550"
+
+#: src/xml/xmli18n-tmp.h:7750
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 5551"
+
+#: src/xml/xmli18n-tmp.h:7751
+msgid "HP DeskJet 560C"
+msgstr "HP DeskJet 560C"
+
+#: src/xml/xmli18n-tmp.h:7752
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 600"
+
+#: src/xml/xmli18n-tmp.h:7753
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 600C"
+
+#: src/xml/xmli18n-tmp.h:7754
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 610C"
+
+#: src/xml/xmli18n-tmp.h:7755
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 610CL"
+
+#: src/xml/xmli18n-tmp.h:7756
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 6122"
+
+#: src/xml/xmli18n-tmp.h:7757
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 6127"
+
+#: src/xml/xmli18n-tmp.h:7758
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 612C"
+
+#: src/xml/xmli18n-tmp.h:7759
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 640C"
+
+#: src/xml/xmli18n-tmp.h:7760
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 648C"
+
+#: src/xml/xmli18n-tmp.h:7761
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 660C"
+
+#: src/xml/xmli18n-tmp.h:7762
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 670C"
+
+#: src/xml/xmli18n-tmp.h:7763
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 670TV"
+
+#: src/xml/xmli18n-tmp.h:7764
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 672C"
+
+#: src/xml/xmli18n-tmp.h:7765
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 680C"
+
+#: src/xml/xmli18n-tmp.h:7766
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 682C"
+
+#: src/xml/xmli18n-tmp.h:7767
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 690C"
+
+#: src/xml/xmli18n-tmp.h:7768
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 692C"
+
+#: src/xml/xmli18n-tmp.h:7769
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 693C"
+
+#: src/xml/xmli18n-tmp.h:7770
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 694C"
+
+#: src/xml/xmli18n-tmp.h:7771
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 695C"
+
+#: src/xml/xmli18n-tmp.h:7772
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 697C"
+
+#: src/xml/xmli18n-tmp.h:7773
+msgid "HP DeskJet 810C"
+msgstr "HP DeskJet 810C"
+
+#: src/xml/xmli18n-tmp.h:7774
+msgid "HP DeskJet 812C"
+msgstr "HP DeskJet 812C"
+
+#: src/xml/xmli18n-tmp.h:7775
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 815C"
+
+#: src/xml/xmli18n-tmp.h:7776
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 816C"
+
+#: src/xml/xmli18n-tmp.h:7777
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 825C"
+
+#: src/xml/xmli18n-tmp.h:7778
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 830C"
+
+#: src/xml/xmli18n-tmp.h:7779
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 832C"
+
+#: src/xml/xmli18n-tmp.h:7780
+msgid "HP DeskJet 840C"
+msgstr "HP DeskJet 840C"
+
+#: src/xml/xmli18n-tmp.h:7781
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 841C"
+
+#: src/xml/xmli18n-tmp.h:7782
+msgid "HP DeskJet 842C"
+msgstr "HP DeskJet 842C"
+
+#: src/xml/xmli18n-tmp.h:7783
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 843C"
+
+#: src/xml/xmli18n-tmp.h:7784
+msgid "HP DeskJet 845C"
+msgstr "HP DeskJet 845C"
+
+#: src/xml/xmli18n-tmp.h:7785
+msgid "HP DeskJet 850C"
+msgstr "HP DeskJet 850C"
+
+#: src/xml/xmli18n-tmp.h:7786
+msgid "HP DeskJet 855C"
+msgstr "HP DeskJet 855C"
+
+#: src/xml/xmli18n-tmp.h:7787
+msgid "HP DeskJet 870C"
+msgstr "HP DeskJet 870C"
+
+#: src/xml/xmli18n-tmp.h:7788
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 880C"
+
+#: src/xml/xmli18n-tmp.h:7789
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 882C"
+
+#: src/xml/xmli18n-tmp.h:7790
+msgid "HP DeskJet 890C"
+msgstr "HP DeskJet 890C"
+
+#: src/xml/xmli18n-tmp.h:7791
+msgid "HP DeskJet 895C"
+msgstr "HP DeskJet 895C"
+
+#: src/xml/xmli18n-tmp.h:7792
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 916C"
+
+#: src/xml/xmli18n-tmp.h:7793
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 920C"
+
+#: src/xml/xmli18n-tmp.h:7794
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 9300"
+
+#: src/xml/xmli18n-tmp.h:7795
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 930C"
+
+#: src/xml/xmli18n-tmp.h:7796
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 932C"
+
+#: src/xml/xmli18n-tmp.h:7797
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 933C"
+
+#: src/xml/xmli18n-tmp.h:7798
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 934C"
+
+#: src/xml/xmli18n-tmp.h:7799
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 935C"
+
+#: src/xml/xmli18n-tmp.h:7800
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 940C"
+
+#: src/xml/xmli18n-tmp.h:7801
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 948C"
+
+#: src/xml/xmli18n-tmp.h:7802
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 950C"
+
+#: src/xml/xmli18n-tmp.h:7803
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 952C"
+
+#: src/xml/xmli18n-tmp.h:7804
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 955C"
+
+#: src/xml/xmli18n-tmp.h:7805
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 957C"
+
+#: src/xml/xmli18n-tmp.h:7806
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 959C"
+
+#: src/xml/xmli18n-tmp.h:7807
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 960C"
+
+#: src/xml/xmli18n-tmp.h:7808
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 970C"
+
+#: src/xml/xmli18n-tmp.h:7809
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 975C"
+
+#: src/xml/xmli18n-tmp.h:7810
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 980C"
+
+#: src/xml/xmli18n-tmp.h:7811
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 990C"
+
+#: src/xml/xmli18n-tmp.h:7812
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 995C"
+
+#: src/xml/xmli18n-tmp.h:7813
+msgid "HP DeskJet 1100C"
+msgstr "HP DeskJet 1100C"
+
+#: src/xml/xmli18n-tmp.h:7814
+msgid "HP DeskJet 1120C"
+msgstr "HP DeskJet 1120C"
+
+#: src/xml/xmli18n-tmp.h:7815
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1125C"
+
+#: src/xml/xmli18n-tmp.h:7816
+msgid "HP DeskJet 1200C"
+msgstr "HP DeskJet 1200C"
+
+#: src/xml/xmli18n-tmp.h:7817
+msgid "HP DeskJet 1220C"
+msgstr "HP DeskJet 1220C"
+
+#: src/xml/xmli18n-tmp.h:7818
+msgid "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/xml/xmli18n-tmp.h:7819
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600CM"
+
+#: src/xml/xmli18n-tmp.h:7820
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 2000"
+
+#: src/xml/xmli18n-tmp.h:7821
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 2500"
+
+#: src/xml/xmli18n-tmp.h:7822
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 2500CM"
+
+#: src/xml/xmli18n-tmp.h:7823
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340C"
+
+#: src/xml/xmli18n-tmp.h:7824
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 3810"
+
+#: src/xml/xmli18n-tmp.h:7825
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 3816"
+
+#: src/xml/xmli18n-tmp.h:7826
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 3820"
+
+#: src/xml/xmli18n-tmp.h:7827
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 3822"
+
+#: src/xml/xmli18n-tmp.h:7828
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:7829
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 2D"
+
+#: src/xml/xmli18n-tmp.h:7830
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet 2P Plus"
+
+#: src/xml/xmli18n-tmp.h:7831
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 2P"
+
+#: src/xml/xmli18n-tmp.h:7832
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:7833
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 3D"
+
+#: src/xml/xmli18n-tmp.h:7834
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 3P con PCL5"
+
+#: src/xml/xmli18n-tmp.h:7835
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 3P con PS"
+
+#: src/xml/xmli18n-tmp.h:7836
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4 Plus"
+
+#: src/xml/xmli18n-tmp.h:7837
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4"
+
+#: src/xml/xmli18n-tmp.h:7838
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:7839
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4M"
+
+#: src/xml/xmli18n-tmp.h:7840
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4ML"
+
+#: src/xml/xmli18n-tmp.h:7841
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4P"
+
+#: src/xml/xmli18n-tmp.h:7842
+msgid "HP LaserJet 4Si"
+msgstr "HP LaserJet 4Si"
+
+#: src/xml/xmli18n-tmp.h:7843
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
+
+#: src/xml/xmli18n-tmp.h:7844
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:7845
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 5L"
+
+#: src/xml/xmli18n-tmp.h:7846
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5M"
+
+#: src/xml/xmli18n-tmp.h:7847
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:7848
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5P"
+
+#: src/xml/xmli18n-tmp.h:7849
+msgid "HP LaserJet 5Si"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:7850
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 6"
+
+#: src/xml/xmli18n-tmp.h:7851
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 6L"
+
+#: src/xml/xmli18n-tmp.h:7852
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 6MP"
+
+#: src/xml/xmli18n-tmp.h:7853
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 6P"
+
+#: src/xml/xmli18n-tmp.h:7854
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:7855
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 1012"
+
+#: src/xml/xmli18n-tmp.h:7856
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:7857
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1022"
+
+#: src/xml/xmli18n-tmp.h:7858
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 1100"
+
+#: src/xml/xmli18n-tmp.h:7859
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 1100A"
+
+#: src/xml/xmli18n-tmp.h:7860
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 1150"
+
+#: src/xml/xmli18n-tmp.h:7861
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:7862
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:7863
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 1220"
+
+#: src/xml/xmli18n-tmp.h:7864
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:7865
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:7866
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:7867
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 2100M"
+
+#: src/xml/xmli18n-tmp.h:7868
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 2200"
+
+#: src/xml/xmli18n-tmp.h:7869
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:7870
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:7871
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:7872
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:7873
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:7874
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:7875
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:7876
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:7877
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:7878
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:7879
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 3200"
+
+#: src/xml/xmli18n-tmp.h:7880
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 3200m"
+
+#: src/xml/xmli18n-tmp.h:7881
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 3200se"
+
+#: src/xml/xmli18n-tmp.h:7882
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:7883
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 3310 MFP"
+
+#: src/xml/xmli18n-tmp.h:7884
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 3320 MFP"
+
+#: src/xml/xmli18n-tmp.h:7885
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 3320N MFP"
+
+#: src/xml/xmli18n-tmp.h:7886
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 3330 MFP"
+
+#: src/xml/xmli18n-tmp.h:7887
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:7888
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:7889
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:7890
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4000"
+
+#: src/xml/xmli18n-tmp.h:7891
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:7892
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4100"
+
+#: src/xml/xmli18n-tmp.h:7893
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:7894
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:7895
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:7896
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4300"
+
+#: src/xml/xmli18n-tmp.h:7897
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:7898
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:7899
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:7900
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5100"
+
+#: src/xml/xmli18n-tmp.h:7901
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:7902
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:7903
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 8000"
+
+#: src/xml/xmli18n-tmp.h:7904
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 8100"
+
+#: src/xml/xmli18n-tmp.h:7905
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 8150"
+
+#: src/xml/xmli18n-tmp.h:7906
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:7907
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:7908
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:7909
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:7910
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:7911
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:7912
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:7913
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:7914
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:7915
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:7916
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:7917
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:7918
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:7919
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:7920
+msgid "HP Mopier 240"
+msgstr "HP Mopier 240"
+
+#: src/xml/xmli18n-tmp.h:7921
+msgid "HP Mopier 320"
+msgstr "HP Mopier 320"
+
+#: src/xml/xmli18n-tmp.h:7922
+msgid "HP OfficeJet 300"
+msgstr "HP OfficeJet 300"
+
+#: src/xml/xmli18n-tmp.h:7923
+msgid "HP OfficeJet 330"
+msgstr "HP OfficeJet 330"
+
+#: src/xml/xmli18n-tmp.h:7924
+msgid "HP OfficeJet 350"
+msgstr "HP OfficeJet 350"
+
+#: src/xml/xmli18n-tmp.h:7925
+msgid "HP OfficeJet 500"
+msgstr "HP OfficeJet 500"
+
+#: src/xml/xmli18n-tmp.h:7926
+msgid "HP OfficeJet 520"
+msgstr "HP OfficeJet 520"
+
+#: src/xml/xmli18n-tmp.h:7927
+msgid "HP OfficeJet 570"
+msgstr "HP OfficeJet 570"
+
+#: src/xml/xmli18n-tmp.h:7928
+msgid "HP OfficeJet 580"
+msgstr "HP OfficeJet 580"
+
+#: src/xml/xmli18n-tmp.h:7929
+msgid "HP OfficeJet 590"
+msgstr "HP OfficeJet 590"
+
+#: src/xml/xmli18n-tmp.h:7930
+msgid "HP OfficeJet 600"
+msgstr "HP OfficeJet 600"
+
+#: src/xml/xmli18n-tmp.h:7931
+msgid "HP OfficeJet 610"
+msgstr "HP OfficeJet 610"
+
+#: src/xml/xmli18n-tmp.h:7932
+msgid "HP OfficeJet 625"
+msgstr "HP OfficeJet 625"
+
+#: src/xml/xmli18n-tmp.h:7933
+msgid "HP OfficeJet 630"
+msgstr "HP OfficeJet 630"
+
+#: src/xml/xmli18n-tmp.h:7934
+msgid "HP OfficeJet 635"
+msgstr "HP OfficeJet 635"
+
+#: src/xml/xmli18n-tmp.h:7935
+msgid "HP OfficeJet 700"
+msgstr "HP OfficeJet 700"
+
+#: src/xml/xmli18n-tmp.h:7936
+msgid "HP OfficeJet 710"
+msgstr "HP OfficeJet 710"
+
+#: src/xml/xmli18n-tmp.h:7937
+msgid "HP OfficeJet 720"
+msgstr "HP OfficeJet 720"
+
+#: src/xml/xmli18n-tmp.h:7938
+msgid "HP OfficeJet 725"
+msgstr "HP OfficeJet 725"
+
+#: src/xml/xmli18n-tmp.h:7939
+msgid "HP OfficeJet 5105"
+msgstr "HP OfficeJet 5105"
+
+#: src/xml/xmli18n-tmp.h:7940
+msgid "HP OfficeJet 5110"
+msgstr "HP OfficeJet 5110"
+
+#: src/xml/xmli18n-tmp.h:7941
+msgid "HP OfficeJet 5110xi"
+msgstr "HP OfficeJet 5110xi"
+
+#: src/xml/xmli18n-tmp.h:7942
+msgid "HP OfficeJet 6105"
+msgstr "HP OfficeJet 6105"
+
+#: src/xml/xmli18n-tmp.h:7943
+msgid "HP OfficeJet 6110"
+msgstr "HP OfficeJet 6110"
+
+#: src/xml/xmli18n-tmp.h:7944
+msgid "HP OfficeJet 7110"
+msgstr "HP OfficeJet 7110"
+
+#: src/xml/xmli18n-tmp.h:7945
+msgid "HP OfficeJet 7130"
+msgstr "HP OfficeJet 7130"
+
+#: src/xml/xmli18n-tmp.h:7946
+msgid "HP OfficeJet 7140"
+msgstr "HP OfficeJet 7140"
+
+#: src/xml/xmli18n-tmp.h:7947
+msgid "HP OfficeJet D125"
+msgstr "HP OfficeJet D125"
+
+#: src/xml/xmli18n-tmp.h:7948
+msgid "HP OfficeJet D135"
+msgstr "HP OfficeJet D135"
+
+#: src/xml/xmli18n-tmp.h:7949
+msgid "HP OfficeJet D145"
+msgstr "HP OfficeJet D145"
+
+#: src/xml/xmli18n-tmp.h:7950
+msgid "HP OfficeJet D155"
+msgstr "HP OfficeJet D155"
+
+#: src/xml/xmli18n-tmp.h:7951
+msgid "HP OfficeJet G55"
+msgstr "HP OfficeJet G55"
+
+#: src/xml/xmli18n-tmp.h:7952
+msgid "HP OfficeJet G85"
+msgstr "HP OfficeJet G85"
+
+#: src/xml/xmli18n-tmp.h:7953
+msgid "HP OfficeJet G95"
+msgstr "HP OfficeJet G95"
+
+#: src/xml/xmli18n-tmp.h:7954
+msgid "HP OfficeJet K60"
+msgstr "HP OfficeJet K60"
+
+#: src/xml/xmli18n-tmp.h:7955
+msgid "HP OfficeJet K60xi"
+msgstr "HP OfficeJet K60xi"
+
+#: src/xml/xmli18n-tmp.h:7956
+msgid "HP OfficeJet K80"
+msgstr "HP OfficeJet K80"
+
+#: src/xml/xmli18n-tmp.h:7957
+msgid "HP OfficeJet K80xi"
+msgstr "HP OfficeJet K80xi"
+
+#: src/xml/xmli18n-tmp.h:7958
+msgid "HP OfficeJet LX"
+msgstr "HP OfficeJet LX"
+
+#: src/xml/xmli18n-tmp.h:7959
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP OfficeJet Pro 1150C"
+
+#: src/xml/xmli18n-tmp.h:7960
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP OfficeJet Pro 1170C"
+
+#: src/xml/xmli18n-tmp.h:7961
+msgid "HP OfficeJet Pro 1175C"
+msgstr "HP OfficeJet 1175C"
+
+#: src/xml/xmli18n-tmp.h:7962
+msgid "HP OfficeJet R40"
+msgstr "HP OfficeJet R40"
+
+#: src/xml/xmli18n-tmp.h:7963
+msgid "HP OfficeJet R45"
+msgstr "HP OfficeJet R45"
+
+#: src/xml/xmli18n-tmp.h:7964
+msgid "HP OfficeJet R60"
+msgstr "HP OfficeJet R60"
+
+#: src/xml/xmli18n-tmp.h:7965
+msgid "HP OfficeJet R65"
+msgstr "HP OfficeJet R65"
+
+#: src/xml/xmli18n-tmp.h:7966
+msgid "HP OfficeJet R80"
+msgstr "HP OfficeJet R80"
+
+#: src/xml/xmli18n-tmp.h:7967
+msgid "HP OfficeJet T45"
+msgstr "HP OfficeJet T45"
+
+#: src/xml/xmli18n-tmp.h:7968
+msgid "HP OfficeJet T65"
+msgstr "HP OfficeJet T65"
+
+#: src/xml/xmli18n-tmp.h:7969
+msgid "HP OfficeJet V40"
+msgstr "HP OfficeJet V40"
+
+#: src/xml/xmli18n-tmp.h:7970
+msgid "HP OfficeJet V40xi"
+msgstr "HP OfficeJet V40xi"
+
+#: src/xml/xmli18n-tmp.h:7971
+msgid "HP OfficeJet"
+msgstr "HP OfficeJet"
+
+#: src/xml/xmli18n-tmp.h:7972
+msgid "HP PSC 370"
+msgstr "HP PSC 370"
+
+#: src/xml/xmli18n-tmp.h:7973
+msgid "HP PSC 380"
+msgstr "HP PSC 380"
+
+#: src/xml/xmli18n-tmp.h:7974
+msgid "HP PSC 500"
+msgstr "HP PSC 500"
+
+#: src/xml/xmli18n-tmp.h:7975
+msgid "HP PSC 750"
+msgstr "HP PSC 750"
+
+#: src/xml/xmli18n-tmp.h:7976
+msgid "HP PSC 950"
+msgstr "HP PSC 950"
+
+#: src/xml/xmli18n-tmp.h:7977
+msgid "HP PSC 950xi"
+msgstr "HP PSC 950xi"
+
+#: src/xml/xmli18n-tmp.h:7978
+msgid "HP PSC 2110"
+msgstr "HP PSC 2110"
+
+#: src/xml/xmli18n-tmp.h:7979
+msgid "HP PSC 2150"
+msgstr "HP PSC 2150"
+
+#: src/xml/xmli18n-tmp.h:7980
+msgid "HP PSC 2210"
+msgstr "HP PSC 2210"
+
+#: src/xml/xmli18n-tmp.h:7981
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart 7150"
+
+#: src/xml/xmli18n-tmp.h:7982
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart 7345"
+
+#: src/xml/xmli18n-tmp.h:7983
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart 7350"
+
+#: src/xml/xmli18n-tmp.h:7984
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart 7550"
+
+#: src/xml/xmli18n-tmp.h:7985
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P100"
+
+#: src/xml/xmli18n-tmp.h:7986
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P130"
+
+#: src/xml/xmli18n-tmp.h:7987
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P230"
+
+#: src/xml/xmli18n-tmp.h:7988
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/xml/xmli18n-tmp.h:7989
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/xml/xmli18n-tmp.h:7990
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1115"
+
+#: src/xml/xmli18n-tmp.h:7991
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1215"
+
+#: src/xml/xmli18n-tmp.h:7992
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1218"
+
+#: src/xml/xmli18n-tmp.h:7993
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1315"
+
+#: src/xml/xmli18n-tmp.h:7994
+msgid "HP e-printer e20"
+msgstr "HP e-printer e20"
+
+#: src/xml/xmli18n-tmp.h:7995
+msgid "IBM 4019"
+msgstr "IBM 4019"
+
+#: src/xml/xmli18n-tmp.h:7996
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr "IBM 4029 030 LaserPrinter 10"
+
+#: src/xml/xmli18n-tmp.h:7997
+msgid "IBM 4312"
+msgstr "IBM 4312"
+
+#: src/xml/xmli18n-tmp.h:7998
+msgid "IBM Infoprint 12"
+msgstr "IBM Infoprint 12"
+
+#: src/xml/xmli18n-tmp.h:7999
+msgid "IBM Page Printer 3112"
+msgstr "IBM Page Printer 3112"
+
+#: src/xml/xmli18n-tmp.h:8000
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:8001
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:8002
+msgid "Infotec 4651 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:8003
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:8004
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:8005
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:8006
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:8007
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:8008
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:8009
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:8010
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:8011
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:8012
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:8013
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:8014
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:8015
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:8016
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:8017
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:8018
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:8019
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:8020
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:8021
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:8022
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:8023
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:8024
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:8025
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:8026
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:8027
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:8028
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:8029
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:8030
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:8031
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:8032
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:8033
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:8034
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:8035
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:8036
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:8037
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:8038
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:8039
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:8040
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:8041
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:8042
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:8043
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:8044
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:8045
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8046
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8047
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8048
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8049
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8050
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8051
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8052
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8053
+msgid "Kyocera CS-1815"
+msgstr "Kyocera CS-1815"
+
+#: src/xml/xmli18n-tmp.h:8054
+msgid "Kyocera F-1010"
+msgstr "Kyocera F-1010"
+
+#: src/xml/xmli18n-tmp.h:8055
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr "Kyocera FS-600 - KPDL-2"
+
+#: src/xml/xmli18n-tmp.h:8056
+msgid "Kyocera FS-600"
+msgstr "Kyocera FS-600"
+
+#: src/xml/xmli18n-tmp.h:8057
+msgid "Kyocera FS-680"
+msgstr "Kyocera FS-680"
+
+#: src/xml/xmli18n-tmp.h:8058
+msgid "Kyocera FS-800"
+msgstr "Kyocera FS-800"
+
+#: src/xml/xmli18n-tmp.h:8059
+msgid "Kyocera FS-920"
+msgstr "Kyocera FS-920"
+
+#: src/xml/xmli18n-tmp.h:8060
+msgid "Kyocera FS-1000"
+msgstr "Kyocera FS-1000"
+
+#: src/xml/xmli18n-tmp.h:8061
+msgid "Kyocera FS-1000+"
+msgstr "Kyocera FS-1000+"
+
+#: src/xml/xmli18n-tmp.h:8062
+msgid "Kyocera FS-1010"
+msgstr "Kyocera FS-1010"
+
+#: src/xml/xmli18n-tmp.h:8063
+msgid "Kyocera FS-1018MFP"
+msgstr "Kyocera FS-1018MFP"
+
+#: src/xml/xmli18n-tmp.h:8064
+msgid "Kyocera FS-1020D"
+msgstr "Kyocera FS-1020D"
+
+#: src/xml/xmli18n-tmp.h:8065
+msgid "Kyocera FS-1030D"
+msgstr "Kyocera FS-1030D"
+
+#: src/xml/xmli18n-tmp.h:8066
+msgid "Kyocera FS-1050"
+msgstr "Kyocera FS-1050"
+
+#: src/xml/xmli18n-tmp.h:8067
+msgid "Kyocera FS-1118MFP"
+msgstr "Kyocera FS-1118MFP"
+
+#: src/xml/xmli18n-tmp.h:8068
+msgid "Kyocera FS-1200"
+msgstr "Kyocera FS-1200"
+
+#: src/xml/xmli18n-tmp.h:8069
+msgid "Kyocera FS-1600"
+msgstr "Kyocera FS-1600"
+
+#: src/xml/xmli18n-tmp.h:8070
+msgid "Kyocera FS-1600+"
+msgstr "Kyocera FS-1600+"
+
+#: src/xml/xmli18n-tmp.h:8071
+msgid "Kyocera FS-1700"
+msgstr "Kyocera FS-1700"
+
+#: src/xml/xmli18n-tmp.h:8072
+msgid "Kyocera FS-1700+"
+msgstr "Kyocera FS-1700+"
+
+#: src/xml/xmli18n-tmp.h:8073
+msgid "Kyocera FS-1714M"
+msgstr "Kyocera FS-1714M"
+
+#: src/xml/xmli18n-tmp.h:8074
+msgid "Kyocera FS-1750"
+msgstr "Kyocera FS-1750"
+
+#: src/xml/xmli18n-tmp.h:8075
+msgid "Kyocera FS-1800"
+msgstr "Kyocera FS-1800"
+
+#: src/xml/xmli18n-tmp.h:8076
+msgid "Kyocera FS-1800+"
+msgstr "Kyocera FS-1800+"
+
+#: src/xml/xmli18n-tmp.h:8077
+msgid "Kyocera FS-1900"
+msgstr "Kyocera FS-1900"
+
+#: src/xml/xmli18n-tmp.h:8078
+msgid "Kyocera FS-1920"
+msgstr "Kyocera FS-1920"
+
+#: src/xml/xmli18n-tmp.h:8079
+msgid "Kyocera FS-2000D"
+msgstr "Kyocera FS-2000D"
+
+#: src/xml/xmli18n-tmp.h:8080
+msgid "Kyocera FS-3500"
+msgstr "Kyocera FS-3500"
+
+#: src/xml/xmli18n-tmp.h:8081
+msgid "Kyocera FS-3600"
+msgstr "Kyocera FS-3600"
+
+#: src/xml/xmli18n-tmp.h:8082
+msgid "Kyocera FS-3600+"
+msgstr "Kyocera FS-3600+"
+
+#: src/xml/xmli18n-tmp.h:8083
+msgid "Kyocera FS-3700"
+msgstr "Kyocera FS-3700"
+
+#: src/xml/xmli18n-tmp.h:8084
+msgid "Kyocera FS-3700+"
+msgstr "Kyocera FS-3700+"
+
+#: src/xml/xmli18n-tmp.h:8085
+msgid "Kyocera FS-3718M"
+msgstr "Kyocera FS-3718M"
+
+#: src/xml/xmli18n-tmp.h:8086
+msgid "Kyocera FS-3750"
+msgstr "Kyocera FS-3750"
+
+#: src/xml/xmli18n-tmp.h:8087
+msgid "Kyocera FS-3800"
+msgstr "Kyocera FS-3800"
+
+#: src/xml/xmli18n-tmp.h:8088
+msgid "Kyocera FS-3820N"
+msgstr "Kyocera FS-3820N"
+
+#: src/xml/xmli18n-tmp.h:8089
+msgid "Kyocera FS-3830N"
+msgstr "Kyocera FS-3830N"
+
+#: src/xml/xmli18n-tmp.h:8090
+msgid "Kyocera FS-3900DN"
+msgstr "Kyocera FS-3900DN"
+
+#: src/xml/xmli18n-tmp.h:8091
+msgid "Kyocera FS-4000DN"
+msgstr "Kyocera FS-4000DN"
+
+#: src/xml/xmli18n-tmp.h:8092
+msgid "Kyocera FS-5800C"
+msgstr "Kyocera FS-5800C"
+
+#: src/xml/xmli18n-tmp.h:8093
+msgid "Kyocera FS-5900C"
+msgstr "Kyocera FS-5900C"
+
+#: src/xml/xmli18n-tmp.h:8094
+msgid "Kyocera FS-6020"
+msgstr "Kyocera FS-6020"
+
+#: src/xml/xmli18n-tmp.h:8095
+msgid "Kyocera FS-6026"
+msgstr "Kyocera FS-6026"
+
+#: src/xml/xmli18n-tmp.h:8096
+msgid "Kyocera FS-6300"
+msgstr "Kyocera FS-6300"
+
+#: src/xml/xmli18n-tmp.h:8097
+msgid "Kyocera FS-6500"
+msgstr "Kyocera FS-6500"
+
+#: src/xml/xmli18n-tmp.h:8098
+msgid "Kyocera FS-6500+"
+msgstr "Kyocera FS-6500+"
+
+#: src/xml/xmli18n-tmp.h:8099
+msgid "Kyocera FS-6700"
+msgstr "Kyocera FS-6700"
+
+#: src/xml/xmli18n-tmp.h:8100
+msgid "Kyocera FS-6750"
+msgstr "Kyocera FS-6750"
+
+#: src/xml/xmli18n-tmp.h:8101
+msgid "Kyocera FS-6900"
+msgstr "Kyocera FS-6900"
+
+#: src/xml/xmli18n-tmp.h:8102
+msgid "Kyocera FS-6950DN"
+msgstr "Kyocera FS-6950DN"
+
+#: src/xml/xmli18n-tmp.h:8103
+msgid "Kyocera FS-7000"
+msgstr "Kyocera FS-7000"
+
+#: src/xml/xmli18n-tmp.h:8104
+msgid "Kyocera FS-7000+"
+msgstr "Kyocera FS-7000+"
+
+#: src/xml/xmli18n-tmp.h:8105
+msgid "Kyocera FS-7028M"
+msgstr "Kyocera FS-7028M"
+
+#: src/xml/xmli18n-tmp.h:8106
+msgid "Kyocera FS-8000C"
+msgstr "Kyocera FS-8000C"
+
+#: src/xml/xmli18n-tmp.h:8107
+msgid "Kyocera FS-9000"
+msgstr "Kyocera FS-9000"
+
+#: src/xml/xmli18n-tmp.h:8108
+msgid "Kyocera FS-9100DN"
+msgstr "Kyocera FS-9100DN"
+
+#: src/xml/xmli18n-tmp.h:8109
+msgid "Kyocera FS-9130DN"
+msgstr "Kyocera FS-9130DN"
+
+#: src/xml/xmli18n-tmp.h:8110
+msgid "Kyocera FS-9500DN"
+msgstr "Kyocera FS-9500DN"
+
+#: src/xml/xmli18n-tmp.h:8111
+msgid "Kyocera FS-9530DN"
+msgstr "Kyocera FS-9530DN"
+
+#: src/xml/xmli18n-tmp.h:8112
+msgid "Kyocera KM-1510"
+msgstr "Kyocera KM-1510"
+
+#: src/xml/xmli18n-tmp.h:8113
+msgid "Kyocera KM-1530"
+msgstr "Kyocera KM-1530"
+
+#: src/xml/xmli18n-tmp.h:8114
+msgid "Kyocera KM-1810"
+msgstr "Kyocera KM-1810"
+
+#: src/xml/xmli18n-tmp.h:8115
+msgid "Kyocera KM-1815"
+msgstr "Kyocera KM-1815"
+
+#: src/xml/xmli18n-tmp.h:8116
+msgid "Kyocera KM-1820"
+msgstr "Kyocera KM-1820"
+
+#: src/xml/xmli18n-tmp.h:8117
+msgid "Kyocera KM-2030"
+msgstr "Kyocera KM-2030"
+
+#: src/xml/xmli18n-tmp.h:8118
+msgid "Kyocera KM-2530"
+msgstr "Kyocera KM-2530"
+
+#: src/xml/xmli18n-tmp.h:8119
+msgid "Kyocera KM-3050"
+msgstr "Kyocera KM-3050"
+
+#: src/xml/xmli18n-tmp.h:8120
+msgid "Kyocera KM-3530"
+msgstr "Kyocera KM-3530"
+
+#: src/xml/xmli18n-tmp.h:8121
+msgid "Kyocera KM-4050"
+msgstr "Kyocera KM-4050"
+
+#: src/xml/xmli18n-tmp.h:8122
+msgid "Kyocera KM-4230"
+msgstr "Kyocera KM-4230"
+
+#: src/xml/xmli18n-tmp.h:8123
+msgid "Kyocera KM-4230/5230"
+msgstr "Kyocera KM-4230/5230"
+
+#: src/xml/xmli18n-tmp.h:8124
+msgid "Kyocera KM-4530"
+msgstr "Kyocera KM-4530"
+
+#: src/xml/xmli18n-tmp.h:8125
+msgid "Kyocera KM-5050"
+msgstr "Kyocera KM-5050"
+
+#: src/xml/xmli18n-tmp.h:8126
+msgid "Kyocera KM-5230"
+msgstr "Kyocera KM-5230"
+
+#: src/xml/xmli18n-tmp.h:8127
+msgid "Kyocera KM-5530"
+msgstr "Kyocera KM-5530"
+
+#: src/xml/xmli18n-tmp.h:8128
+msgid "Kyocera KM-6030"
+msgstr "Kyocera KM-6030"
+
+#: src/xml/xmli18n-tmp.h:8129
+msgid "Kyocera KM-6230"
+msgstr "Kyocera KM-6230"
+
+#: src/xml/xmli18n-tmp.h:8130
+msgid "Kyocera KM-8030"
+msgstr "Kyocera KM-8030"
+
+#: src/xml/xmli18n-tmp.h:8131
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
+
+#: src/xml/xmli18n-tmp.h:8132
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
+
+#: src/xml/xmli18n-tmp.h:8133
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
+
+#: src/xml/xmli18n-tmp.h:8134
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
+
+#: src/xml/xmli18n-tmp.h:8135
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
+
+#: src/xml/xmli18n-tmp.h:8136
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
+
+#: src/xml/xmli18n-tmp.h:8137
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
+
+#: src/xml/xmli18n-tmp.h:8138
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
+
+#: src/xml/xmli18n-tmp.h:8139
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
+
+#: src/xml/xmli18n-tmp.h:8140
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
+
+#: src/xml/xmli18n-tmp.h:8141
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
+
+#: src/xml/xmli18n-tmp.h:8142
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
+
+#: src/xml/xmli18n-tmp.h:8143
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
+
+#: src/xml/xmli18n-tmp.h:8144
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
+
+#: src/xml/xmli18n-tmp.h:8145
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
+
+#: src/xml/xmli18n-tmp.h:8146
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
+
+#: src/xml/xmli18n-tmp.h:8147
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
+
+#: src/xml/xmli18n-tmp.h:8148
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
+
+#: src/xml/xmli18n-tmp.h:8149
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
+
+#: src/xml/xmli18n-tmp.h:8150
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
+
+#: src/xml/xmli18n-tmp.h:8151
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
+
+#: src/xml/xmli18n-tmp.h:8152
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
+
+#: src/xml/xmli18n-tmp.h:8153
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
+
+#: src/xml/xmli18n-tmp.h:8154
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
+
+#: src/xml/xmli18n-tmp.h:8155
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
+
+#: src/xml/xmli18n-tmp.h:8156
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
+
+#: src/xml/xmli18n-tmp.h:8157
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
+
+#: src/xml/xmli18n-tmp.h:8158
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
+
+#: src/xml/xmli18n-tmp.h:8159
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
+
+#: src/xml/xmli18n-tmp.h:8160
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
+
+#: src/xml/xmli18n-tmp.h:8161
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
+
+#: src/xml/xmli18n-tmp.h:8162
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
+
+#: src/xml/xmli18n-tmp.h:8163
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
+
+#: src/xml/xmli18n-tmp.h:8164
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
+
+#: src/xml/xmli18n-tmp.h:8165
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
+
+#: src/xml/xmli18n-tmp.h:8166
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
+
+#: src/xml/xmli18n-tmp.h:8167
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
+
+#: src/xml/xmli18n-tmp.h:8168
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
+
+#: src/xml/xmli18n-tmp.h:8169
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
+
+#: src/xml/xmli18n-tmp.h:8170
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
+
+#: src/xml/xmli18n-tmp.h:8171
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
+
+#: src/xml/xmli18n-tmp.h:8172
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
+
+#: src/xml/xmli18n-tmp.h:8173
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
+
+#: src/xml/xmli18n-tmp.h:8174
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
+
+#: src/xml/xmli18n-tmp.h:8175
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
+
+#: src/xml/xmli18n-tmp.h:8176
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
+
+#: src/xml/xmli18n-tmp.h:8177
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
+
+#: src/xml/xmli18n-tmp.h:8178
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
+
+#: src/xml/xmli18n-tmp.h:8179
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
+
+#: src/xml/xmli18n-tmp.h:8180
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
+
+#: src/xml/xmli18n-tmp.h:8181
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
+
+#: src/xml/xmli18n-tmp.h:8182
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
+
+#: src/xml/xmli18n-tmp.h:8183
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/xml/xmli18n-tmp.h:8184
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
+
+#: src/xml/xmli18n-tmp.h:8185
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
+
+#: src/xml/xmli18n-tmp.h:8186
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
+
+#: src/xml/xmli18n-tmp.h:8187
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
+
+#: src/xml/xmli18n-tmp.h:8188
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
+
+#: src/xml/xmli18n-tmp.h:8189
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
+
+#: src/xml/xmli18n-tmp.h:8190
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
+
+#: src/xml/xmli18n-tmp.h:8191
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
+
+#: src/xml/xmli18n-tmp.h:8192
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
+
+#: src/xml/xmli18n-tmp.h:8193
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
+
+#: src/xml/xmli18n-tmp.h:8194
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
+
+#: src/xml/xmli18n-tmp.h:8195
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
+
+#: src/xml/xmli18n-tmp.h:8196
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
+
+#: src/xml/xmli18n-tmp.h:8197
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
+
+#: src/xml/xmli18n-tmp.h:8198
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
+
+#: src/xml/xmli18n-tmp.h:8199
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
+
+#: src/xml/xmli18n-tmp.h:8200
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
+
+#: src/xml/xmli18n-tmp.h:8201
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
+
+#: src/xml/xmli18n-tmp.h:8202
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
+
+#: src/xml/xmli18n-tmp.h:8203
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
+
+#: src/xml/xmli18n-tmp.h:8204
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
+
+#: src/xml/xmli18n-tmp.h:8205
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
+
+#: src/xml/xmli18n-tmp.h:8206
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
+
+#: src/xml/xmli18n-tmp.h:8207
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
+
+#: src/xml/xmli18n-tmp.h:8208
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
+
+#: src/xml/xmli18n-tmp.h:8209
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
+
+#: src/xml/xmli18n-tmp.h:8210
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
+
+#: src/xml/xmli18n-tmp.h:8211
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
+
+#: src/xml/xmli18n-tmp.h:8212
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
+
+#: src/xml/xmli18n-tmp.h:8213
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
+
+#: src/xml/xmli18n-tmp.h:8214
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
+
+#: src/xml/xmli18n-tmp.h:8215
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
+
+#: src/xml/xmli18n-tmp.h:8216
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
+
+#: src/xml/xmli18n-tmp.h:8217
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
+
+#: src/xml/xmli18n-tmp.h:8218
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
+
+#: src/xml/xmli18n-tmp.h:8219
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
+
+#: src/xml/xmli18n-tmp.h:8220
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
+
+#: src/xml/xmli18n-tmp.h:8221
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
+
+#: src/xml/xmli18n-tmp.h:8222
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
+
+#: src/xml/xmli18n-tmp.h:8223
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
+
+#: src/xml/xmli18n-tmp.h:8224
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
+
+#: src/xml/xmli18n-tmp.h:8225
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
+
+#: src/xml/xmli18n-tmp.h:8226
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
+
+#: src/xml/xmli18n-tmp.h:8227
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
+
+#: src/xml/xmli18n-tmp.h:8228
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
+
+#: src/xml/xmli18n-tmp.h:8229
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
+
+#: src/xml/xmli18n-tmp.h:8230
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
+
+#: src/xml/xmli18n-tmp.h:8231
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
+
+#: src/xml/xmli18n-tmp.h:8232
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
+
+#: src/xml/xmli18n-tmp.h:8233
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
+
+#: src/xml/xmli18n-tmp.h:8234
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
+
+#: src/xml/xmli18n-tmp.h:8235
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
+
+#: src/xml/xmli18n-tmp.h:8236
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
+
+#: src/xml/xmli18n-tmp.h:8237
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
+
+#: src/xml/xmli18n-tmp.h:8238
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
+
+#: src/xml/xmli18n-tmp.h:8239
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8240
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8241
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
+
+#: src/xml/xmli18n-tmp.h:8242
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8243
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8244
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
+
+#: src/xml/xmli18n-tmp.h:8245
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8246
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8247
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
+
+#: src/xml/xmli18n-tmp.h:8248
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8249
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8250
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
+
+#: src/xml/xmli18n-tmp.h:8251
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
+
+#: src/xml/xmli18n-tmp.h:8252
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
+
+#: src/xml/xmli18n-tmp.h:8253
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
+
+#: src/xml/xmli18n-tmp.h:8254
+msgid "Oki B4350"
+msgstr "Oki B4350"
+
+#: src/xml/xmli18n-tmp.h:8255
+msgid "Oki OL400"
+msgstr "Oki OL400"
+
+#: src/xml/xmli18n-tmp.h:8256
+msgid "Oki OL400e"
+msgstr "Oki OL400e"
+
+#: src/xml/xmli18n-tmp.h:8257
+msgid "Oki OL400ex"
+msgstr "Oki OL400ex"
+
+#: src/xml/xmli18n-tmp.h:8258
+msgid "Oki OL410e"
+msgstr "Oki OL410e"
+
+#: src/xml/xmli18n-tmp.h:8259
+msgid "Oki OL600e"
+msgstr "Oki OL600e"
+
+#: src/xml/xmli18n-tmp.h:8260
+msgid "Oki OL610e/S"
+msgstr "Oki OL610e/S"
+
+#: src/xml/xmli18n-tmp.h:8261
+msgid "Oki OL800"
+msgstr "Oki OL800"
+
+#: src/xml/xmli18n-tmp.h:8262
+msgid "Oki OL810ex"
+msgstr "Oki OL810ex"
+
+#: src/xml/xmli18n-tmp.h:8263
+msgid "Oki Okipage 6e"
+msgstr "Oki Okipage 6e"
+
+#: src/xml/xmli18n-tmp.h:8264
+msgid "Oki Okipage 6ex"
+msgstr "Oki Okipage 6ex"
+
+#: src/xml/xmli18n-tmp.h:8265
+msgid "Oki Okipage 8p"
+msgstr "Oki Okipage 8p"
+
+#: src/xml/xmli18n-tmp.h:8266
+msgid "Oki Okipage 10e"
+msgstr "Oki Okipage 10e"
+
+#: src/xml/xmli18n-tmp.h:8267
+msgid "Oki Okipage 10ex"
+msgstr "Oki Okipage 10ex"
+
+#: src/xml/xmli18n-tmp.h:8268
+msgid "Oki Okipage 14ex"
+msgstr "Oki Okipage 14ex"
+
+#: src/xml/xmli18n-tmp.h:8269
+msgid "Oki Super 6e"
+msgstr "Oki Super 6e"
+
+#: src/xml/xmli18n-tmp.h:8270
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
+
+#: src/xml/xmli18n-tmp.h:8271
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
+
+#: src/xml/xmli18n-tmp.h:8272
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
+
+#: src/xml/xmli18n-tmp.h:8273
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
+
+#: src/xml/xmli18n-tmp.h:8274
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
+
+#: src/xml/xmli18n-tmp.h:8275
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
+
+#: src/xml/xmli18n-tmp.h:8276
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
+
+#: src/xml/xmli18n-tmp.h:8277
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
+
+#: src/xml/xmli18n-tmp.h:8278
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
+
+#: src/xml/xmli18n-tmp.h:8279
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
+
+#: src/xml/xmli18n-tmp.h:8280
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
+
+#: src/xml/xmli18n-tmp.h:8281
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
+
+#: src/xml/xmli18n-tmp.h:8282
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
+
+#: src/xml/xmli18n-tmp.h:8283
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
+
+#: src/xml/xmli18n-tmp.h:8284
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
+
+#: src/xml/xmli18n-tmp.h:8285
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
+
+#: src/xml/xmli18n-tmp.h:8286
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
+
+#: src/xml/xmli18n-tmp.h:8287
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
+
+#: src/xml/xmli18n-tmp.h:8288
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
+
+#: src/xml/xmli18n-tmp.h:8289
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
+
+#: src/xml/xmli18n-tmp.h:8290
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
+
+#: src/xml/xmli18n-tmp.h:8291
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
+
+#: src/xml/xmli18n-tmp.h:8292
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
+
+#: src/xml/xmli18n-tmp.h:8293
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
+
+#: src/xml/xmli18n-tmp.h:8294
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
+
+#: src/xml/xmli18n-tmp.h:8295
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
+
+#: src/xml/xmli18n-tmp.h:8296
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
+
+#: src/xml/xmli18n-tmp.h:8297
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
+
+#: src/xml/xmli18n-tmp.h:8298
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
+
+#: src/xml/xmli18n-tmp.h:8299
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
+
+#: src/xml/xmli18n-tmp.h:8300
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
+
+#: src/xml/xmli18n-tmp.h:8301
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
+
+#: src/xml/xmli18n-tmp.h:8302
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
+
+#: src/xml/xmli18n-tmp.h:8303
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
+
+#: src/xml/xmli18n-tmp.h:8304
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
+
+#: src/xml/xmli18n-tmp.h:8305
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
+
+#: src/xml/xmli18n-tmp.h:8306
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
+
+#: src/xml/xmli18n-tmp.h:8307
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
+
+#: src/xml/xmli18n-tmp.h:8308
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
+
+#: src/xml/xmli18n-tmp.h:8309
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
+
+#: src/xml/xmli18n-tmp.h:8310
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
+
+#: src/xml/xmli18n-tmp.h:8311
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
+
+#: src/xml/xmli18n-tmp.h:8312
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
+
+#: src/xml/xmli18n-tmp.h:8313
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
+
+#: src/xml/xmli18n-tmp.h:8314
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
+
+#: src/xml/xmli18n-tmp.h:8315
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
+
+#: src/xml/xmli18n-tmp.h:8316
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
+
+#: src/xml/xmli18n-tmp.h:8317
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
+
+#: src/xml/xmli18n-tmp.h:8318
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8319
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8320
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
+
+#: src/xml/xmli18n-tmp.h:8321
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8322
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8323
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
+
+#: src/xml/xmli18n-tmp.h:8324
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8325
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8326
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
+
+#: src/xml/xmli18n-tmp.h:8327
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8328
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8329
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
+
+#: src/xml/xmli18n-tmp.h:8330
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
+
+#: src/xml/xmli18n-tmp.h:8331
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
+
+#: src/xml/xmli18n-tmp.h:8332
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
+
+#: src/xml/xmli18n-tmp.h:8333
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:8334
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
+
+#: src/xml/xmli18n-tmp.h:8335
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
+
+#: src/xml/xmli18n-tmp.h:8336
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
+
+#: src/xml/xmli18n-tmp.h:8337
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
+
+#: src/xml/xmli18n-tmp.h:8338
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
+
+#: src/xml/xmli18n-tmp.h:8339
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
+
+#: src/xml/xmli18n-tmp.h:8340
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
+
+#: src/xml/xmli18n-tmp.h:8341
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
+
+#: src/xml/xmli18n-tmp.h:8342
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
+
+#: src/xml/xmli18n-tmp.h:8343
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
+
+#: src/xml/xmli18n-tmp.h:8344
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
+
+#: src/xml/xmli18n-tmp.h:8345
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
+
+#: src/xml/xmli18n-tmp.h:8346
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
+
+#: src/xml/xmli18n-tmp.h:8347
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
+
+#: src/xml/xmli18n-tmp.h:8348
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
+
+#: src/xml/xmli18n-tmp.h:8349
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
+
+#: src/xml/xmli18n-tmp.h:8350
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:8351
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
+
+#: src/xml/xmli18n-tmp.h:8352
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
+
+#: src/xml/xmli18n-tmp.h:8353
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:8354
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
+
+#: src/xml/xmli18n-tmp.h:8355
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
+
+#: src/xml/xmli18n-tmp.h:8356
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
+
+#: src/xml/xmli18n-tmp.h:8357
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:8358
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
+
+#: src/xml/xmli18n-tmp.h:8359
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
+
+#: src/xml/xmli18n-tmp.h:8360
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/xml/xmli18n-tmp.h:8361
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:8362
+msgid "Savin 2522"
+msgstr "Savin 2522"
+
+#: src/xml/xmli18n-tmp.h:8363
+msgid "Savin 2527"
+msgstr "Savin 2527"
+
+#: src/xml/xmli18n-tmp.h:8364
+msgid "Savin 2532"
+msgstr "Savin 2532"
+
+#: src/xml/xmli18n-tmp.h:8365
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
+
+#: src/xml/xmli18n-tmp.h:8366
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
+
+#: src/xml/xmli18n-tmp.h:8367
+msgid "Savin 2560"
+msgstr "Savin 2560"
+
+#: src/xml/xmli18n-tmp.h:8368
+msgid "Savin 2575"
+msgstr "Savin 2575"
+
+#: src/xml/xmli18n-tmp.h:8369
+msgid "Savin 3515"
+msgstr "Savin 3515"
+
+#: src/xml/xmli18n-tmp.h:8370
+msgid "Savin 40105"
+msgstr "Savin 40105"
+
+#: src/xml/xmli18n-tmp.h:8371
+msgid "Savin 4015"
+msgstr "Savin 4015"
+
+#: src/xml/xmli18n-tmp.h:8372
+msgid "Savin 4018"
+msgstr "Savin 4018"
+
+#: src/xml/xmli18n-tmp.h:8373
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
+
+#: src/xml/xmli18n-tmp.h:8374
+msgid "Savin 4022"
+msgstr "Savin 4022"
+
+#: src/xml/xmli18n-tmp.h:8375
+msgid "Savin 4027"
+msgstr "Savin 4027"
+
+#: src/xml/xmli18n-tmp.h:8376
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
+
+#: src/xml/xmli18n-tmp.h:8377
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
+
+#: src/xml/xmli18n-tmp.h:8378
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
+
+#: src/xml/xmli18n-tmp.h:8379
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
+
+#: src/xml/xmli18n-tmp.h:8380
+msgid "Savin 4051"
+msgstr "Savin 4051"
+
+#: src/xml/xmli18n-tmp.h:8381
+msgid "Savin 4060"
+msgstr "Savin 4060"
+
+#: src/xml/xmli18n-tmp.h:8382
+msgid "Savin 4075"
+msgstr "Savin 4075"
+
+#: src/xml/xmli18n-tmp.h:8383
+msgid "Savin 4090"
+msgstr "Savin 4090"
+
+#: src/xml/xmli18n-tmp.h:8384
+msgid "Savin 7025"
+msgstr "Savin 7025"
+
+#: src/xml/xmli18n-tmp.h:8385
+msgid "Savin 8016"
+msgstr "Savin 8016"
+
+#: src/xml/xmli18n-tmp.h:8386
+msgid "Savin 8020"
+msgstr "Savin 8020"
+
+#: src/xml/xmli18n-tmp.h:8387
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
+
+#: src/xml/xmli18n-tmp.h:8388
+msgid "Savin 8025"
+msgstr "Savin 8025"
+
+#: src/xml/xmli18n-tmp.h:8389
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
+
+#: src/xml/xmli18n-tmp.h:8390
+msgid "Savin 8030"
+msgstr "Savin 8030"
+
+#: src/xml/xmli18n-tmp.h:8391
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
+
+#: src/xml/xmli18n-tmp.h:8392
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
+
+#: src/xml/xmli18n-tmp.h:8393
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
+
+#: src/xml/xmli18n-tmp.h:8394
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
+
+#: src/xml/xmli18n-tmp.h:8395
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
+
+#: src/xml/xmli18n-tmp.h:8396
+msgid "Savin 8055"
+msgstr "Savin 8055"
+
+#: src/xml/xmli18n-tmp.h:8397
+msgid "Savin 8065"
+msgstr "Savin 8065"
+
+#: src/xml/xmli18n-tmp.h:8398
+msgid "Savin 8075"
+msgstr "Savin 8075"
+
+#: src/xml/xmli18n-tmp.h:8399
+msgid "Savin 8090"
+msgstr "Savin 8090"
+
+#: src/xml/xmli18n-tmp.h:8400
+msgid "Savin 8110"
+msgstr "Savin 8110"
+
+#: src/xml/xmli18n-tmp.h:8401
+msgid "Savin 8135"
+msgstr "Savin 8135"
+
+#: src/xml/xmli18n-tmp.h:8402
+msgid "Savin 816"
+msgstr "Savin 816"
+
+#: src/xml/xmli18n-tmp.h:8403
+msgid "Savin 9016"
+msgstr "Savin 9016"
+
+#: src/xml/xmli18n-tmp.h:8404
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
+
+#: src/xml/xmli18n-tmp.h:8405
+msgid "Savin 9025"
+msgstr "Savin 9025"
+
+#: src/xml/xmli18n-tmp.h:8406
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
+
+#: src/xml/xmli18n-tmp.h:8407
+msgid "Savin 9033"
+msgstr "Savin 9033"
+
+#: src/xml/xmli18n-tmp.h:8408
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
+
+#: src/xml/xmli18n-tmp.h:8409
+msgid "Savin 9040"
+msgstr "Savin 9040"
+
+#: src/xml/xmli18n-tmp.h:8410
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
+
+#: src/xml/xmli18n-tmp.h:8411
+msgid "Savin 9050"
+msgstr "Savin 9050"
+
+#: src/xml/xmli18n-tmp.h:8412
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
+
+#: src/xml/xmli18n-tmp.h:8413
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
+
+#: src/xml/xmli18n-tmp.h:8414
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
+
+#: src/xml/xmli18n-tmp.h:8415
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
+
+#: src/xml/xmli18n-tmp.h:8416
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
+
+#: src/xml/xmli18n-tmp.h:8417
+msgid "Star LS-04"
+msgstr "Star LS-04"
+
+#: src/xml/xmli18n-tmp.h:8418
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
+
+#: src/xml/xmli18n-tmp.h:8419
+msgid "Tally MT908"
+msgstr "Tally MT908"
+
+#: src/xml/xmli18n-tmp.h:8420
+msgid "Tektronix Phaser 750DP"
+msgstr "Tektronix Phaser 750DP"
+
+#: src/xml/xmli18n-tmp.h:8421
+msgid "Tektronix Phaser 750DX"
+msgstr "Tektronix Phaser 750DX"
+
+#: src/xml/xmli18n-tmp.h:8422
+msgid "Tektronix Phaser 750N"
+msgstr "Tektronix Phaser 750N"
+
+#: src/xml/xmli18n-tmp.h:8423
+msgid "Tektronix Phaser 750P"
+msgstr "Tektronix Phaser 750P"
+
+#: src/xml/xmli18n-tmp.h:8424
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
+
+#: src/xml/xmli18n-tmp.h:8425
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
+
+#: src/xml/xmli18n-tmp.h:8426
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
+
+#: src/xml/xmli18n-tmp.h:8427
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
+
+#: src/xml/xmli18n-tmp.h:8428
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
+
+#: src/xml/xmli18n-tmp.h:8429
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
+
+#: src/xml/xmli18n-tmp.h:8430
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
+
+#: src/xml/xmli18n-tmp.h:8431
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
+
+#: src/xml/xmli18n-tmp.h:8432
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
+
+#: src/xml/xmli18n-tmp.h:8433
+msgid "Xerox Phaser 2135"
+msgstr "Xerox Phaser 2135"
+
+#: src/xml/xmli18n-tmp.h:8434
+msgid "Xerox Phaser 4400B"
+msgstr "Xerox Phaser 4400B"
+
+#: src/xml/xmli18n-tmp.h:8435
+msgid "Xerox Phaser 4400DT"
+msgstr "Xerox Phaser 4400DT"
+
+#: src/xml/xmli18n-tmp.h:8436
+msgid "Xerox Phaser 4400DX"
+msgstr "Xerox Phaser 4400DX"
+
+#: src/xml/xmli18n-tmp.h:8437
+msgid "Xerox Phaser 4400N"
+msgstr "Xerox Phaser 4400N"
+
+#: src/xml/xmli18n-tmp.h:8438
+msgid "Xerox Phaser 4500B"
+msgstr "Xerox Phaser 4500B"
+
+#: src/xml/xmli18n-tmp.h:8439
+msgid "Xerox Phaser 4500DT"
+msgstr "Xerox Phaser 4500DT"
+
+#: src/xml/xmli18n-tmp.h:8440
+msgid "Xerox Phaser 4500DX"
+msgstr "Xerox Phaser 4500DX"
+
+#: src/xml/xmli18n-tmp.h:8441
+msgid "Xerox Phaser 4500N"
+msgstr "Xerox Phaser 4500N"
+
+#: src/xml/xmli18n-tmp.h:8442
+msgid "Xerox Phaser 4510B"
+msgstr "Xerox Phaser 4510B"
+
+#: src/xml/xmli18n-tmp.h:8443
+msgid "Xerox Phaser 4510DT"
+msgstr "Xerox Phaser 4510DT"
+
+#: src/xml/xmli18n-tmp.h:8444
+msgid "Xerox Phaser 4510DX"
+msgstr "Xerox Phaser 4510DX"
+
+#: src/xml/xmli18n-tmp.h:8445
+msgid "Xerox Phaser 4510N"
+msgstr "Xerox Phaser 4510N"
+
+#: src/xml/xmli18n-tmp.h:8446
+msgid "Xerox Phaser 5500B"
+msgstr "Xerox Phaser 5500B"
+
+#: src/xml/xmli18n-tmp.h:8447
+msgid "Xerox Phaser 5500DN"
+msgstr "Xerox Phaser 5500DN"
+
+#: src/xml/xmli18n-tmp.h:8448
+msgid "Xerox Phaser 5500DT"
+msgstr "Xerox Phaser 5500DT"
+
+#: src/xml/xmli18n-tmp.h:8449
+msgid "Xerox Phaser 5500DX"
+msgstr "Xerox Phaser 5500DX"
+
+#: src/xml/xmli18n-tmp.h:8450
+msgid "Xerox Phaser 5500N"
+msgstr "Xerox Phaser 5500N"
+
+#: src/xml/xmli18n-tmp.h:8451
+msgid "Xerox Phaser 6130N"
+msgstr "Xerox Phaser 6130N"
+
+#: src/xml/xmli18n-tmp.h:8452
+msgid "Xerox Phaser 6180DN"
+msgstr "Xerox Phaser 6180DN"
+
+#: src/xml/xmli18n-tmp.h:8453
+msgid "Xerox Phaser 6180MFP-D"
+msgstr "Xerox Phaser 6180MFP-D"
+
+#: src/xml/xmli18n-tmp.h:8454
+msgid "Xerox Phaser 6200B"
+msgstr "Xerox Phaser 6200B"
+
+#: src/xml/xmli18n-tmp.h:8455
+msgid "Xerox Phaser 6200DP"
+msgstr "Xerox Phaser 6200DP"
+
+#: src/xml/xmli18n-tmp.h:8456
+msgid "Xerox Phaser 6200DX"
+msgstr "Xerox Phaser 6200DX"
+
+#: src/xml/xmli18n-tmp.h:8457
+msgid "Xerox Phaser 6200N"
+msgstr "Xerox Phaser 6200N"
+
+#: src/xml/xmli18n-tmp.h:8458
+msgid "Xerox Phaser 6250B"
+msgstr "Xerox Phaser 6250B"
+
+#: src/xml/xmli18n-tmp.h:8459
+msgid "Xerox Phaser 6250DP"
+msgstr "Xerox Phaser 6250DP"
+
+#: src/xml/xmli18n-tmp.h:8460
+msgid "Xerox Phaser 6250DT"
+msgstr "Xerox Phaser 6250DT"
+
+#: src/xml/xmli18n-tmp.h:8461
+msgid "Xerox Phaser 6250DX"
+msgstr "Xerox Phaser 6250DX"
+
+#: src/xml/xmli18n-tmp.h:8462
+msgid "Xerox Phaser 6250N"
+msgstr "Xerox Phaser 6250N"
+
+#: src/xml/xmli18n-tmp.h:8463
+msgid "Xerox Phaser 6300DN"
+msgstr "Xerox Phaser 6300DN"
+
+#: src/xml/xmli18n-tmp.h:8464
+msgid "Xerox Phaser 6300N"
+msgstr "Xerox Phaser 6300N"
+
+#: src/xml/xmli18n-tmp.h:8465
+msgid "Xerox Phaser 6350DP"
+msgstr "Xerox Phaser 6350DP"
+
+#: src/xml/xmli18n-tmp.h:8466
+msgid "Xerox Phaser 6350DT"
+msgstr "Xerox Phaser 6350DT"
+
+#: src/xml/xmli18n-tmp.h:8467
+msgid "Xerox Phaser 6350DX"
+msgstr "Xerox Phaser 6350DX"
+
+#: src/xml/xmli18n-tmp.h:8468
+msgid "Xerox Phaser 6360DN"
+msgstr "Xerox Phaser 6360DN"
+
+#: src/xml/xmli18n-tmp.h:8469
+msgid "Xerox Phaser 6360DX"
+msgstr "Xerox Phaser 6360DX"
+
+#: src/xml/xmli18n-tmp.h:8470
+msgid "Xerox Phaser 7300B"
+msgstr "Xerox Phaser 7300B"
+
+#: src/xml/xmli18n-tmp.h:8471
+msgid "Xerox Phaser 7300DN"
+msgstr "Xerox Phaser 7300DN"
+
+#: src/xml/xmli18n-tmp.h:8472
+msgid "Xerox Phaser 7300DT"
+msgstr "Xerox Phaser 7300DT"
+
+#: src/xml/xmli18n-tmp.h:8473
+msgid "Xerox Phaser 7300DX"
+msgstr "Xerox Phaser 7300DX"
+
+#: src/xml/xmli18n-tmp.h:8474
+msgid "Xerox Phaser 7300N"
+msgstr "Xerox Phaser 7300N"
+
+#: src/xml/xmli18n-tmp.h:8475
+msgid "Xerox Phaser 7400DN"
+msgstr "Xerox Phaser 7400DN"
+
+#: src/xml/xmli18n-tmp.h:8476
+msgid "Xerox Phaser 7400DT"
+msgstr "Xerox Phaser 7400DT"
+
+#: src/xml/xmli18n-tmp.h:8477
+msgid "Xerox Phaser 7400DX"
+msgstr "Xerox Phaser 7400DX"
+
+#: src/xml/xmli18n-tmp.h:8478
+msgid "Xerox Phaser 7400DXF"
+msgstr "Xerox Phaser 7400DXF"
+
+#: src/xml/xmli18n-tmp.h:8479
+msgid "Xerox Phaser 7400N"
+msgstr "Xerox Phaser 7400N"
+
+#: src/xml/xmli18n-tmp.h:8480
+msgid "Xerox Phaser 7700DN"
+msgstr "Xerox Phaser 7700DN"
+
+#: src/xml/xmli18n-tmp.h:8481
+msgid "Xerox Phaser 7700DX"
+msgstr "Xerox Phaser 7700DX"
+
+#: src/xml/xmli18n-tmp.h:8482
+msgid "Xerox Phaser 7700GX"
+msgstr "Xerox Phaser 7700GX"
+
+#: src/xml/xmli18n-tmp.h:8483
+msgid "Xerox Phaser 7750B"
+msgstr "Xerox Phaser 7750B"
+
+#: src/xml/xmli18n-tmp.h:8484
+msgid "Xerox Phaser 7750DN"
+msgstr "Xerox Phaser 7750DN"
+
+#: src/xml/xmli18n-tmp.h:8485
+msgid "Xerox Phaser 7750DXF"
+msgstr "Xerox Phaser 7750DXF"
+
+#: src/xml/xmli18n-tmp.h:8486
+msgid "Xerox Phaser 7750GX"
+msgstr "Xerox Phaser 7750GX"
+
+#: src/xml/xmli18n-tmp.h:8487
+msgid "Xerox Phaser 7760DN"
+msgstr "Xerox Phaser 7760DN"
+
+#: src/xml/xmli18n-tmp.h:8488
+msgid "Xerox Phaser 7760DX"
+msgstr "Xerox Phaser 7760DX"
+
+#: src/xml/xmli18n-tmp.h:8489
+msgid "Xerox Phaser 7760GX"
+msgstr "Xerox Phaser 7760GX"
+
+#: src/xml/xmli18n-tmp.h:8490
+msgid "Xerox Phaser 8400B"
+msgstr "Xerox Phaser 8400B"
+
+#: src/xml/xmli18n-tmp.h:8491
+msgid "Xerox Phaser 8400BD"
+msgstr "Xerox Phaser 8400BD"
+
+#: src/xml/xmli18n-tmp.h:8492
+msgid "Xerox Phaser 8400DP"
+msgstr "Xerox Phaser 8400DP"
+
+#: src/xml/xmli18n-tmp.h:8493
+msgid "Xerox Phaser 8400DX"
+msgstr "Xerox Phaser 8400DX"
+
+#: src/xml/xmli18n-tmp.h:8494
+msgid "Xerox Phaser 8400N"
+msgstr "Xerox Phaser 8400N"
+
+#: src/xml/xmli18n-tmp.h:8495
+msgid "Xerox Phaser 8500DN"
+msgstr "Xerox Phaser 8500DN"
+
+#: src/xml/xmli18n-tmp.h:8496
+msgid "Xerox Phaser 8500N"
+msgstr "Xerox Phaser 8500N"
+
+#: src/xml/xmli18n-tmp.h:8497
+msgid "Xerox Phaser 8550DP"
+msgstr "Xerox Phaser 8550DP"
+
+#: src/xml/xmli18n-tmp.h:8498
+msgid "Xerox Phaser 8550DT"
+msgstr "Xerox Phaser 8550DT"
+
+#: src/xml/xmli18n-tmp.h:8499
+msgid "Xerox Phaser 8550DX"
+msgstr "Xerox Phaser 8550DX"
+
+#: src/xml/xmli18n-tmp.h:8500
+msgid "Xerox Phaser 8560DN"
+msgstr "Xerox Phaser 8560DN"
+
+#: src/xml/xmli18n-tmp.h:8501
+msgid "Xerox WorkCentre 7345"
+msgstr "Xerox WorkCentre 7345"
+
+#: src/xml/xmli18n-tmp.h:8502
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
+
+#: src/xml/xmli18n-tmp.h:8503
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
+
+#: src/xml/xmli18n-tmp.h:8504
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
+
+#: src/xml/xmli18n-tmp.h:8505
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
+
+#: src/xml/xmli18n-tmp.h:8506
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
+
+#: src/xml/xmli18n-tmp.h:8507
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
+
+#: src/xml/xmli18n-tmp.h:8508
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/xml/xmli18n-tmp.h:8509
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
+
+#: src/xml/xmli18n-tmp.h:8510
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
+
+#: src/xml/xmli18n-tmp.h:8511
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
+
+#: src/xml/xmli18n-tmp.h:8512
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
+
+#: src/xml/xmli18n-tmp.h:8513
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
+
+#: src/xml/xmli18n-tmp.h:8514
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
+
+#: src/xml/xmli18n-tmp.h:8515
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
+
+#: src/xml/xmli18n-tmp.h:8516
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
+
+#: src/xml/xmli18n-tmp.h:8517
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
+
+#: src/xml/xmli18n-tmp.h:8518
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
+
+#: src/xml/xmli18n-tmp.h:8519
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
+
+#: src/xml/xmli18n-tmp.h:8520
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
+
+#: src/xml/xmli18n-tmp.h:8521
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:8522
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
+
+#: src/xml/xmli18n-tmp.h:8523
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
+
+#: src/xml/xmli18n-tmp.h:8524
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:8525
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
+
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Canon SELPHY-CP-530"
+
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Canon SELPHY-CP-730"
+
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Canon SELPHY-CP-740"
+
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Canon SELPHY-CP-750"
+
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8538
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
+
+#: src/xml/xmli18n-tmp.h:8539
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
+
+#: src/xml/xmli18n-tmp.h:8540
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
+
+#: src/xml/xmli18n-tmp.h:8541
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
+
+#: src/xml/xmli18n-tmp.h:8542
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
+
+#: src/xml/xmli18n-tmp.h:8543
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/xml/xmli18n-tmp.h:8544
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
+
+#: src/xml/xmli18n-tmp.h:8545
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
+
+#: src/xml/xmli18n-tmp.h:8546
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-DOCk"
+
+#: src/xml/xmli18n-tmp.h:8547
+msgid "Kodak EasyShare-G600-Printer-Dock"
+msgstr "Kodak EasyShare-G600-Printer-Dock"
+
+#: src/xml/xmli18n-tmp.h:8548
+msgid "Kodak PD-4000"
+msgstr "Kodak PD-4000"
+
+#: src/xml/xmli18n-tmp.h:8549
+msgid "Kodak PD-6000"
+msgstr "Kodak PD-6000"
+
+#: src/xml/xmli18n-tmp.h:8550
+msgid "Kodak Photo-Printer"
+msgstr "Kodak Photo-Printer"
+
+#: src/xml/xmli18n-tmp.h:8551
+msgid "Kodak Photo-Printer-500"
+msgstr "Kodak Photo-Printer-500"
+
+#: src/xml/xmli18n-tmp.h:8552
+msgid "Kodak Printer-Dock-Plus"
+msgstr "Kodak Printer-Dock-Plus"
+
+#: src/xml/xmli18n-tmp.h:8553
+msgid "Kodak Printer-Dock-Plus-S3"
+msgstr "Kodak Printer-Dock-Plus-S3"
+
+#: src/xml/xmli18n-tmp.h:8554
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
+
+#: src/xml/xmli18n-tmp.h:8555
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:8556
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:8557
+msgid "RAW DATA 16 bit"
+msgstr "Datos en cru a 16 bits"
+
+#: src/xml/xmli18n-tmp.h:8558
+msgid "RAW DATA 8 bit"
+msgstr "Datos en cru a 8 bits"
+
+#, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#~ msgid "Canon PIXMA iP1200"
+#~ msgstr "Canon PIXMA iP1200"
+
+#~ msgid "Canon PIXMA iP1300"
+#~ msgstr "Canon PIXMA iP1300"
+
+#~ msgid "Canon PIXMA iP1500"
+#~ msgstr "Canon PIXMA iP1500"
+
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP1600"
+
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP1700"
+
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP1800"
+
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2500"
+
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2600"
+
+#~ msgid "Basic Printer Setup"
+#~ msgstr "Opcións básicas de impresión"
+
+#~ msgid "Screening Adjustment"
+#~ msgstr "Axuste de pantalla"
+
+#~ msgid "Advanced Printer Functionality"
+#~ msgstr "Funcións avanzadas da impresora"
+
+#~ msgid "Advanced Printer Setup"
+#~ msgstr "Configuración avanzada da impresora"
+
+#~ msgid "Basic Output Adjustment"
+#~ msgstr "Axuste básico da saída"
+
+#~ msgid "Core Parameter"
+#~ msgstr "Parámetro básico"
+
+#~ msgid "Advanced Ink Adjustment"
+#~ msgstr "Axuste avanzado da tinta"
+
+#~ msgid "Basic Image Adjustment"
+#~ msgstr "Axuste básico de imaxe"
+
+#~ msgid "Advanced Image Control"
+#~ msgstr "Control avanzado de imáxe"
+
+#~ msgid "GrayBalance"
+#~ msgstr "BalanceCian"
+
+#~ msgid "Output Curves"
+#~ msgstr "Curvas de saída"
+
+#~ msgid "Advanced HSL Curves"
+#~ msgstr "Curvas HSL avanzandas"
+
+#~ msgid "Advanced Output Adjustment"
+#~ msgstr "Axuste avanzado da saída"
+
+#~ msgid "Epson AcuLaser C2000PS"
+#~ msgstr "Epson AcuLaser C2000PS"
+
+#~ msgid "Epson AcuLaser C8500"
+#~ msgstr "Epson AcuLaser C8500"
+
+#~ msgid "Epson AcuLaser C2000"
+#~ msgstr "Epson AcuLaser C2000"
+
+#~ msgid "Epson AcuLaser C8500PS"
+#~ msgstr "Epson AcuLaser C8500PS"
+
+#~ msgid "Epson AcuLaser C8600"
+#~ msgstr "Epson AcuLaser C8600"
+
+#~ msgid "Epson AcuLaser C8600PS"
+#~ msgstr "Epson AcuLaser C8600PS"
+
+#~ msgid "Epson EPL-6100PS"
+#~ msgstr "Epson EPL-6100PS"
+
+#~ msgid "Epson EPL-5900PS"
+#~ msgstr "Epson EPL-5900PS"
+
+#~ msgid "Epson EPL-N2500PS"
+#~ msgstr "Epson EPL-N2500PS"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 4496a57..58429c1 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr ""
 
@@ -130,284 +130,283 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr ""
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr ""
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr ""
+
+#: src/main/print-canon.c:307
+msgid "Type of inkset in the printer"
+msgstr ""
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr ""
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr ""
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr ""
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -456,154 +455,195 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr ""
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr ""
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr ""
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr ""
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -637,7 +677,7 @@ msgid "Pre-Dithered"
 msgstr ""
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr ""
 
@@ -653,11 +693,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -757,8 +797,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -810,178 +850,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr ""
 
@@ -990,8 +1030,8 @@ msgid "Adjust the cyan gamma"
 msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1043,178 +1083,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr ""
 
@@ -1223,8 +1263,8 @@ msgid "Adjust the magenta gamma"
 msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1276,178 +1316,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr ""
 
@@ -1456,18 +1496,18 @@ msgid "Adjust the yellow gamma"
 msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1484,14 +1524,14 @@ msgid "Adjust the green gamma"
 msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1503,7 +1543,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1511,7 +1551,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr ""
 
@@ -1519,7 +1559,7 @@ msgstr ""
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr ""
 
@@ -1797,10 +1837,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr ""
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1809,14 +1845,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1826,7 +1854,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr ""
 
@@ -2161,136 +2189,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr ""
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr ""
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr ""
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr ""
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2344,104 +2380,104 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2760,24 +2796,17 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr ""
 
@@ -2785,32 +2814,32 @@ msgstr ""
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2842,7 +2871,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr ""
 
@@ -2931,26 +2960,19 @@ msgid "2400x600 DPI"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr ""
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr ""
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -2979,15 +3001,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr ""
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr ""
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr ""
 
@@ -2995,7 +3017,7 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3004,33 +3026,36 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3688,113 +3713,113 @@ msgstr ""
 msgid "(Default Printer)"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr ""
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr ""
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr ""
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr ""
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr ""
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -3976,35 +4001,35 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4012,7 +4037,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4054,22 +4079,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4091,83 +4116,83 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr ""
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4189,114 +4214,114 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr ""
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4338,334 +4363,334 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4704,7 +4729,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4740,17 +4765,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4762,38 +4787,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4803,44 +4828,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -4851,12 +4876,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4864,42 +4889,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -4908,11 +4933,19 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr ""
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr ""
@@ -5181,21 +5214,21 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5223,7 +5256,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr ""
 
@@ -5509,29 +5542,29 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -5891,8 +5924,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr ""
 
@@ -5967,8 +6000,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -5981,10 +6014,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6125,6 +6158,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr ""
 
@@ -6185,6 +6219,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr ""
 
@@ -6245,6 +6280,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr ""
 
@@ -6370,7 +6406,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr ""
 
@@ -6448,6 +6485,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr ""
 
@@ -6484,12 +6522,13 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr ""
 
@@ -6511,6 +6550,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr ""
 
@@ -6584,7594 +6624,8070 @@ msgstr ""
 msgid "Vivid Magenta"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 msgid "L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 msgid "4x8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 msgid "A3+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+msgid "Canon S520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
-msgid "Canon PIXMA iP1000"
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6825
-msgid "Canon PIXMA iP1200"
+#: src/xml/xmli18n-tmp.h:6858
+msgid "Canon S900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6826
-msgid "Canon PIXMA iP1300"
+#: src/xml/xmli18n-tmp.h:6859
+msgid "Canon S9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6827
-msgid "Canon PIXMA iP1500"
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6828
-msgid "Canon PIXMA iP1600"
+#: src/xml/xmli18n-tmp.h:6861
+msgid "Canon SELPHY DS700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6829
-msgid "Canon PIXMA iP1700"
+#: src/xml/xmli18n-tmp.h:6862
+msgid "Canon SELPHY DS810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6830
-msgid "Canon PIXMA iP1800"
+#: src/xml/xmli18n-tmp.h:6863
+msgid "Canon PIXMA mini220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
+#: src/xml/xmli18n-tmp.h:6864
+msgid "Canon PIXMA mini320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6865
+msgid "Canon PIXMA mini360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6833
-msgid "Canon PIXMA iP2200"
+#: src/xml/xmli18n-tmp.h:6866
+msgid "Canon PIXMA iP90"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6834
-msgid "Canon PIXMA iP2500"
+#: src/xml/xmli18n-tmp.h:6867
+msgid "Canon PIXMA iP90v"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6835
-msgid "Canon PIXMA iP2600"
+#: src/xml/xmli18n-tmp.h:6868
+msgid "Canon PIXMA iP100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+msgid "Canon PIXMA iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+msgid "Canon PIXMA iP3300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6874
+msgid "Canon PIXMA iP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6875
+msgid "Canon PIXMA iP3600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+msgid "Canon PIXMA iP4000R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+msgid "Canon PIXMA iP4100R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 msgid "Canon PIXMA iP4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+msgid "Canon PIXMA iP4900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+msgid "Canon PIXMA iP5200R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 msgid "Canon PIXMA iP6100D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+msgid "Canon PIXMA iP6210D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6894
+msgid "Canon PIXMA iP6220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6895
+msgid "Canon PIXMA iP6310D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6896
+msgid "Canon PIXMA iP6320D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6897
 msgid "Canon PIXMA iP6600D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+msgid "Canon PIXMA iP7100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6900
+msgid "Canon PIXMA iP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6901
+msgid "Canon PIXMA iP8100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+msgid "Canon PIXMA iP8600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6904
+msgid "Canon PIXMA iP9910"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 msgid "Canon PIXMA iX6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 msgid "Canon PIXMA iX7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 msgid "Canon PIXMA Pro9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 msgid "Canon PIXMA Pro9000mk2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 msgid "Canon PIXMA Pro9500mk2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+msgid "Canon PIXMA MP140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+msgid "Canon PIXMA MP190"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6919
+msgid "Canon PIXMA MP210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+msgid "Canon PIXMA MP240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+msgid "Canon PIXMA MP260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+msgid "Canon PIXMA MP375R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+msgid "Canon PIXMA MP470"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+msgid "Canon PIXMA MP490"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6935
 msgid "Canon PIXMA MP493"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+msgid "Canon PIXMA MP530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+msgid "Canon PIXMA MP560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6944
 msgid "Canon PIXMA MP600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+msgid "Canon PIXMA MP600R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 msgid "Canon PIXMA MP620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 msgid "Canon PIXMA MP630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 msgid "Canon PIXMA MP640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 msgid "Canon PIXMA MP800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+msgid "Canon PIXMA MP800R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6961
 msgid "Canon PIXMA MP810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+msgid "Canon PIXMA MP900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 msgid "Canon PIXMA MP960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 msgid "Canon PIXMA MP980"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+msgid "Canon PIXMA MG2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6973
+msgid "Canon PIXMA MG3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6974
+msgid "Canon PIXMA MG4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6975
 msgid "Canon PIXMA MG5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 msgid "Canon PIXMA MG5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+msgid "Canon PIXMA MG5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6978
 msgid "Canon PIXMA MG6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+msgid "Canon PIXMA MG6200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6980
 msgid "Canon PIXMA MG8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+msgid "Canon PIXMA MG8200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+msgid "Canon PIXMA MX320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 msgid "Canon PIXMA MX360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+msgid "Canon PIXMA MX370"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6990
 msgid "Canon PIXMA MX410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 msgid "Canon PIXMA MX420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+msgid "Canon PIXMA MX430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6993
+msgid "Canon PIXMA MX510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6994
 msgid "Canon PIXMA MX700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+msgid "Canon PIXMA MX710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Canon PIXMA MX880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+msgid "Canon PIXMA MX890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+msgid "Canon PIXMA E500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7003
+msgid "Canon PIXMA E600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7004
+msgid "Canon 50i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7005
+msgid "Canon 80i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7006
+msgid "Canon 450i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7007
+msgid "Canon 455i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7008
+msgid "Canon 470PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7009
+msgid "Canon 475PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7010
+msgid "Canon 550i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7011
+msgid "Canon 560i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7012
+msgid "Canon 850i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7013
+msgid "Canon 860i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7014
+msgid "Canon 865R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7015
+msgid "Canon 900PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7016
+msgid "Canon 950i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7017
+msgid "Canon 960i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7018
+msgid "Canon 990i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7019
+msgid "Canon 6100i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7020
+msgid "Canon 6500i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7021
+msgid "Canon 9100i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7022
+msgid "Canon 9900i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7023
+msgid "Canon i70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+msgid "Canon i450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7026
+msgid "Canon i450X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+msgid "Canon i455X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7029
+msgid "Canon i470D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7030
+msgid "Canon i475D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7031
+msgid "Canon i550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7032
+msgid "Canon i550X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+msgid "Canon i560X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7041
+msgid "Canon i900D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7042
+msgid "Canon i905D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7043
+msgid "Canon i950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7044
+msgid "Canon i960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7045
+msgid "Canon i965"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7046
+msgid "Canon i990"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7047
+msgid "Canon i6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7048
+msgid "Canon i6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7049
+msgid "Canon i9100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7050
+msgid "Canon i9900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7051
+msgid "Canon i9950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Epson Artisan 50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+msgid "Epson Artisan 835"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Epson B-310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Epson B-310N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Epson B-510DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+msgid "Epson Stylus Office BX535WD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+msgid "Epson Stylus Office BX630FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7151
+msgid "Epson Stylus Office BX635FWD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+msgid "Epson Stylus Office TX620FWD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 msgid "Epson Stylus Photo P50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+msgid "Epson Stylus Photo R2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 msgid "Epson Stylus Photo R3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+msgid "Epson Stylus Photo RX650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Epson Stylus Pro 3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Epson Stylus Pro 3880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Epson Stylus Pro 3885"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Epson Stylus Pro 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Epson Stylus Pro 4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Epson Stylus Pro 4880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Epson Stylus Pro 7700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Epson Stylus Pro 7890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+msgid "Epson Stylus Pro 7900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Epson Stylus Pro 9700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Epson Stylus Pro 9890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+msgid "Epson Stylus Pro 9900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Epson Stylus Pro 11800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+msgid "Epson Stylus CX3900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+msgid "Epson Stylus NX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+msgid "Epson Stylus NX530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7349
+msgid "Epson Stylus NX635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Epson Stylus Photo PX650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+msgid "Epson Stylus SX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+msgid "Epson Stylus SX525"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7374
+msgid "Epson Stylus SX535FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Epson Stylus SX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Epson Stylus T13"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Epson Stylus T22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Epson Stylus T22E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Epson Stylus T59"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Epson Stylus T60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+msgid "Epson Stylus TX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Epson Stylus TX659"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+msgid "Epson WorkForce 545"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+msgid "Epson WorkForce 630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Epson WorkForce 635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Epson WorkForce 645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+msgid "Epson ME Office 940FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+msgid "Epson PX 7V"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+msgid "Epson PX 204"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+msgid "Epson PX 504A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8526
+msgid "Canon SELPHY-CP400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
+#: src/xml/xmli18n-tmp.h:8527
+msgid "Canon SELPHY-CP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
+#: src/xml/xmli18n-tmp.h:8528
+msgid "Canon SELPHY-CP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8529
+msgid "Canon SELPHY-CP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
+#: src/xml/xmli18n-tmp.h:8530
+msgid "Canon SELPHY-CP530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8531
+msgid "Canon SELPHY-CP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8532
+msgid "Canon SELPHY-CP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8533
+msgid "Canon SELPHY-CP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
+#: src/xml/xmli18n-tmp.h:8534
+msgid "Canon SELPHY-CP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:8535
+msgid "Canon SELPHY-CP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+msgid "Canon SELPHY-CP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+msgid "Canon SELPHY-CP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index b132f49..cc4c8d7 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index e7139c6..f7db0ad 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2010-02-14 00:47+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -146,284 +146,284 @@ msgstr "Színátalakítási modul"
 msgid "Dither algorithm"
 msgstr "Szórási algoritmus"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Oldalméret"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Papír típusa"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 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:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Papír forrása"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "A nyomtatáshoz használt hordozó forrása"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "CD középpontjának mérete"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Csak a CD középpontján kívülre nyomtatás, vagy a lyuk felé vezető úton"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "CD méret (egyéni)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "A CD külső átmérőjének változtatható beállítása"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "CD középpontjának mérete (egyéni)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "A CD középpontjának változtatható beállítása"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "CD vízszintes finomhangolása"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Finomhangolás a vízszintes pozícióig a CD-re nyomtatáshoz"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "CD függőleges finomhangolása"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "A nyomtatás felbontása és minősége"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tinta típusa"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "A nyomtatóban levő tinta típusa"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Tintacsatornák"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 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:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Nyomtatás kimeneti módja"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Tintakészlet"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "A nyomtatóban levő tinta típusa"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Szegély nélküli"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Nyomtatás szegélyek nélkül"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Kétoldalas/fordítva beállítás"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Nyomtatási minőség"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Ciánkék sűrűsége"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 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:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Bíborvörös sűrűsége"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 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:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Sárga sűrűsége"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "A nyomat sárga-sűrűségének beállítása"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Fekete sűrűsége"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "A nyomat fekete-sűrűségének beállítása"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Világos ciánkék átmenet"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Világos bíborvörös átmenet"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Világossárga átmenet"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "hosszabbik él (szabvány)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "5 hüvelykes CD"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "3 hüvelykes CD"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - Egyéni"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normál"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Nyomtatás a középpontig"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 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:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Szabványos"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Mindkettő"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -472,154 +472,195 @@ msgstr "Mindkettő"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Fekete"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Fotó"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Nincs"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 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:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Szabványos"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Nagy pontosság"
@@ -653,7 +694,7 @@ msgid "Pre-Dithered"
 msgstr "Előszórt"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Szürkeárnyalatos"
 
@@ -669,11 +710,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -775,8 +816,8 @@ msgid "Gamma value assumed by application"
 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:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -828,178 +869,178 @@ msgstr "Az alkalmazás által feltételezett gamma érték"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Ciánkék"
 
@@ -1008,8 +1049,8 @@ msgid "Adjust the cyan gamma"
 msgstr "A ciánkék gamma értékének beállítása"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1061,178 +1102,178 @@ msgstr "A ciánkék gamma értékének beállítása"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Bíborvörös"
 
@@ -1241,8 +1282,8 @@ msgid "Adjust the magenta gamma"
 msgstr "A bíborvörös gamma értékének beállítása"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1294,178 +1335,178 @@ msgstr "A bíborvörös gamma értékének beállítása"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Sárga"
 
@@ -1474,18 +1515,18 @@ msgid "Adjust the yellow gamma"
 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:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Vörös"
 
@@ -1502,14 +1543,14 @@ msgid "Adjust the green gamma"
 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:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Kék"
 
@@ -1521,7 +1562,7 @@ msgstr "A kék gamma értékének beállítása"
 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:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Ciánkékegyensúly"
 
@@ -1529,7 +1570,7 @@ msgstr "Ciánkékegyensú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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Bíborvörös-egyensúly"
 
@@ -1537,7 +1578,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Sárgaegyensúly"
 
@@ -1822,10 +1863,6 @@ msgstr "Kiterjesztett fényesség"
 msgid "Add gloss enhancement"
 msgstr "Fényességkiterjesztés hozzáadása"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Tintakészlet"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Nyomtatás iránya"
@@ -1834,14 +1871,6 @@ msgstr "Nyomtatás iránya"
 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:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Szegély nélküli"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Nyomtatás szegélyek nélkül"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Kihagyási módszer"
@@ -1851,7 +1880,7 @@ msgid "Interleave pattern to use"
 msgstr "A használandó kihagyásminta"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Kimeneti sorrend"
 
@@ -2187,136 +2216,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Hextone Gray 1 (legvilágosabb) sűrűségaránya"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Oldalankénti száradási idő"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Oldalankénti száradási idő beállítása"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Beolvasásonkénti száradási idő"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Beolvasásonkénti száradási idő beállítása"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Beolvasásonkénti minimális száradási idő"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Beolvasásonkénti minimális száradási idő beállítása"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Minőség javítása"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Nyomtatási minőség javítása további lépések hozzáadásával"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Papírvastagság"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Nyomtató papírvastagságának beállítása"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Vákuum intenzitása"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Vákuumintenzitás beállítása (nyomtatóspecifikus)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Adagolósorrend"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Papíradagoló-sorrend beállítása (nyomtatóspecifikus)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Nyomtatási mód"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Nyomtatási mód beállítása (nyomtatóspecifikus)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Laphézag"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Laphézag beállítása (nyomtatóspecifikus)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Adagoló hangolása"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, fuzzy, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Papíradagoló hangolásának beállítása (0.01% egységek)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Teljesen kézi vezérlés"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Automatikus beállításvezérlés"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Kétirányú"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Egyirányú"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Alternatív kitöltés"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Növekvő kitöltés"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Csökkenő kitöltés"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Növekvő dupla"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Legközelebbi szomszéd elkerülése"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Rövidebbik él (tükrözés)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: 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"
@@ -2370,104 +2407,104 @@ msgid "test print"
 msgstr "próbanyomtatás"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Ötszínes fénykép (kompozit)"
 
@@ -2786,24 +2823,17 @@ msgstr "Kézzel szünetek nélkül"
 msgid "Coated"
 msgstr "Bevont"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Nincs"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Fényes"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Textúra"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Matt"
 
@@ -2811,32 +2841,32 @@ msgstr "Matt"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Laminált minta"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Kimeneti szint igazítása"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "A ciánkék-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "A bíborvörös-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "A sárgaegyensúly beállítása"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Feketeegyensúly"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "A feketeegyensúly beállítása"
 
@@ -2868,7 +2898,7 @@ msgstr "Gyorsan száradó fénykép"
 msgid "Quick-dry Transparency"
 msgstr "Gyorsan száradó fólia"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Kézi"
 
@@ -2958,26 +2988,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Piszkozat"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Magas"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Fotó"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Színes + fekete patron"
@@ -3006,15 +3029,15 @@ msgstr "PPD fájl típusneve"
 msgid "None; please provide a PPD file"
 msgstr "Nincs, adjon meg egy PPD fájlt"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Egyéni"
 
@@ -3022,7 +3045,7 @@ 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/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Végzetes hiba"
 
@@ -3031,33 +3054,36 @@ msgid ""
 "Please report the above information to gimp-print-devel@lists.sourceforge.net"
 msgstr "Jelentse a fentieket a gimp-print-devel@lists.sourceforge.net címen"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Gyors, gazdaságos"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Gazdaságos"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Szuper fotó"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra fotó"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Legjobb"
 
@@ -3744,113 +3770,113 @@ msgstr "Nyomtató"
 msgid "(Default Printer)"
 msgstr "(Alapértelmezett nyomtató)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Nyomtató szolgáltatásai"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Kimenetvezérlés"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Közös"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "1. extra"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "2. extra"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "3. extra"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "4. extra"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "5. extra"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Hungarian"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Médiaméret"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Színmodell"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Fordított szürkeárnyalatos"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB színek"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY színek"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Színpontosság"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Igen"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Nem"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Érték"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Finomhangolás"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Fordított"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 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:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Zsugorítás (teljes oldal nyomtatása)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Levágás (méretek megőrzése)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Nagyítás (teljes oldalterület használata)"
 
@@ -4047,28 +4073,28 @@ msgstr "Az olvasás a nyomtatóról túllépte az időkorlátot\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Nem lehet olvasni a következőről: %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Adjon meg egy nyers eszközt\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "A(z) %s nem nyitható meg írásra/olvasásra: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Ismeretlen nyomtató: %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "A(z) %s nem írható: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4077,7 +4103,7 @@ msgstr ""
 "\n"
 "A(z) %s nem írható: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4088,7 +4114,7 @@ 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:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4130,22 +4156,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Fotófekete"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4167,83 +4193,83 @@ msgstr "Ismeretlen"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Világos ciánkék"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4265,114 +4291,114 @@ msgstr "Világos ciánkék"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Világos bíborvörös"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Világos fekete"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4414,154 +4440,154 @@ msgstr "Világos fekete"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Matt fekete"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Fényességoptimalizáló"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Világosszürke"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Narancs"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "�llapot: Hiba\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "�llapot: Önálló nyomtatás\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "�llapot: Foglalt\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "�llapot: Várakozás\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "�llapot: Tétlen\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "�llapot: Szünetel\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "�llapot: Tisztítás\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "�llapot: Gyári szállítás\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "�llapot: Leállítás\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "�llapot: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Hiba: Végzetes hiba\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Hiba: Másik csatoló van kiválasztva\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Hiba: A fedél nyitva\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Hiba: A papír elakadt\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Hiba: Elfogyott a tinta\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Hiba: Elfogyott a papír\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Hiba: Egyéb papírhiba\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Hiba: A karbantartási kazetta túlcsordult\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Hiba: Várakozás visszatérésre a letépési pozícióból\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Hiba: Dupla lapadagoló hiba\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4570,181 +4596,181 @@ msgstr ""
 "Hiba: A festékkazetta kallantyúja felengedve\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Hiba: Helyreállíthatatlan vágóhiba\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Hiba: Helyreállítható vágóelakadás\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Hiba: Nem található karbantartási kazetta\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Hiba: A hátsó fedél nyitva\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Hiba: A CD tálca kint\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Hiba: Kártyabetöltési hiba\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Hiba: A tálcafedél nyitva\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Hiba: A karbantartási kazetta fedele nyitva\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Hiba: Az első fedél nyitva\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Hiba: Karbantartási kérés\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Hiba: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Figyelmeztetés: %s tintája kevés\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Figyelmeztetés: A(z) %d. csatornában kevés a tinta\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Figyelmeztetés: %s tisztítása letiltva\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Figyelmeztetés: %d. csatorna tisztítása\n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Figyelmeztetés: A karbantartási kazetta közel tele van\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Figyelmeztetés: Karbantartási kérés függőben\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Figyelmeztetés: Ismeretlen (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Fúvóka-önteszt nyomtatása\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Nyomtató neve: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Tintaszintek:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Tinta színe"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Hátralevő százalék"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Feladat neve: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "tintaszintek"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "állapot"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "A(z) %s lekérése nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "A kiterjesztett tintaadatok lekérése nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Tintapatron"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Rész száma"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Dátum"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "A nyomtatóazonosítás nyers eszközt igényel.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "A nyomtatótípus nem azonosítható.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Fejek tisztítása…\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Fúvókateszt futtatása, győződjön meg róla, hogy van papír a nyomtatóban.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4783,7 +4809,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4819,17 +4845,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nem lehet elküldeni a parancsot a nyomtatóra, kilépés.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Kilépés\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4848,20 +4874,20 @@ msgstr ""
 "Ezután a program a válasz megerősítését fogja kérni.\n"
 "Mit szeretne tenni (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "A „q� betű lenyomásával erősítse meg hogy mentés nélkül kíván kilépni:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -4871,7 +4897,7 @@ msgstr ""
 "Ha menteni kívánja az igazítást, akkor meg kell ismételnie ezt a "
 "folyamatot.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -4880,12 +4906,12 @@ msgstr ""
 "Az „r� betű lenyomásával erősítse meg, hogy meg kívánja ismételni az "
 "igazítási folyamatot:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Az igazítási folyamat megismétlése.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4895,17 +4921,17 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "A beállítások mentése…"
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "meghiúsult!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -4913,27 +4939,27 @@ msgid ""
 msgstr ""
 "A beállítások mentése meghiúsult. Ismételje meg az igazítási folyamatot.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "sikerült!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Az igazítási beállítások mentése a nyomtatóra sikeres.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Azonosítatlan parancs.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Az utolsó parancsot nem erősítette meg.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -4944,12 +4970,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Üssön Entert a folytatáshoz > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4961,42 +4987,42 @@ msgstr ""
 "Adjon meg egy párszámot, a ?-et segítségért vagy az r-et a folyamat "
 "megismétléséhez.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "#%d. menet"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Helyezzen be egy üres lapot.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "A szám kívül esik a tartományon!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nem értelmezhető, amit írt!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "A legjobb sorpár száma 1 és %d között kell legyen.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Kísérlet az igazítás beállítására…"
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "sikeres.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5005,11 +5031,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Hiba a bemenetben\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Nyomtatás szegélyek nélkül"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Nyomtatás…"
@@ -5278,21 +5313,21 @@ msgstr "Nyomtatás…"
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "Epson szabvány tinták"
 
@@ -5320,7 +5355,7 @@ msgstr "Világos fehér papír"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Levelezőlap"
 
@@ -5606,29 +5641,29 @@ msgstr "Kiváló minőségű Luster fotópapír 250 wt"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -5988,8 +6023,8 @@ msgstr "Vízfesték papír - Ragyogó fehér"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome fotó fekete"
 
@@ -6064,8 +6099,8 @@ msgstr "UltraChrome fotó fekete"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome matt fekete"
 
@@ -6078,10 +6113,10 @@ msgstr "UltraChrome matt fekete"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr "Hextone"
 
@@ -6222,6 +6257,7 @@ msgstr "360 dpi Jó minőségű"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6282,6 +6318,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6342,6 +6379,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6467,7 +6505,8 @@ msgstr "720 DPI Jó minőségű"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6545,6 +6584,7 @@ msgstr "2880 x 720 DPI Legjobb minőségű"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6581,12 +6621,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Sötétsárga"
 
@@ -6608,6 +6649,7 @@ msgstr "Sötétsárga"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6681,7821 +6723,8471 @@ msgstr "Élénk világos bíborvörös"
 msgid "Vivid Magenta"
 msgstr "Élénk bíborvörös"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Fő tálca"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Fotótálca"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Nyomtatás CD-re"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Hátsó tálca"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Első tálca"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Kézi adagolás"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Tekercses adagoló (levágás minden lap után)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Tekercses adagoló (levágás nélkül)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Tekercses adagoló"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Kézi lapvezérlő"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Kézi adagolás (elöl)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 #, fuzzy
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Tekercses adagoló (levágás nélkül)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 #, fuzzy
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Tekercses adagoló (levágás nélkül)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Fotókarton"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Vágólap, 1. tálca"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Vágólap, 2. tálca"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Vágólap, automatikus tálcaválasztás"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Kézi kijelölés"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Egyszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Háromszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Négyszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Ötszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Hatszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "3. szürke"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "2. szürke"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "1. szürke"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr "MIS Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr "MIS hat árnyalat"
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "1. szürke"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "4. szürke"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Háromszínű nyers fényes"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Négyszínű nyers fényes"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Hatszínes továbbfejlesztett, fényes nyers"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Hétszínes továbbfejlesztett, fényes nyers"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "Matt fekete"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Alapértelmezett fekete"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Hétszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Hatszínes (továbbfejlesztett, kompozit)"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Hétszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Kétszintű szürkeárnyalatos"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Kétszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Nyolcszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Nyolcszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Négyszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Kihagyás"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Teljes átfedés"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Négymenetes"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Teljes átfedés 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Kihagyás 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Nyolclépéses"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Be"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson L fotópapír (letéphető szegélyek)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Mérnöki C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL fekvő"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "C5 fekvő"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA felcserélt"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB felcserélt"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC felcserélt"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD felcserélt"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE felcserélt"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Amerikai írólap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Európai írólap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Nagy Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Nagy Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Kis paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin, kis paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin, nagy paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki kártya"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku kártya"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japán hosszú boríték #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japán fekvő hosszú boríték #3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japán hosszú boríték #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japán fekvő hosszú boríték #4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japán hosszú boríték #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japán fekvő hosszú boríték #4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japán hosszú boríték #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japán fekvő hosszú boríték #3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japán Kaku boríték #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japán fekvő Kaku boríték #4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Kereskedelmi 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Fekvő kereskedelmi 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 meghívó"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarch boríték"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Fekvő Monarch boríték"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Kártya"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Széles levelezőlap"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilei Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilei dupla levél"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilei dupla Office"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89mm-es papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm-es papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "1. szintű PostScript"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "2. szintű PostScript"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "�ltalános PCL 4 LF nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "�ltalános PCL 5 LF nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "�ltalános PCL 5c LF nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "�ltalános PCL 5e LF nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "�ltalános PCL 6/PCL XL LF nyomtató"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P PCL5 támogatással"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P PS támogatással"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 #, fuzzy
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 #, fuzzy
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 #, fuzzy
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "NYERS ADAT 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "NYERS ADAT 8 bit"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Alap képigazítás"
 
diff --git a/po/it.gmo b/po/it.gmo
index e7d2f5a..a0db469 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 2c8aacb..5b04d23 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint-20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2011-03-20 19:51+0100\n"
 "Last-Translator: Marco Poletti <poletti.marco@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Predefinito"
 
@@ -151,284 +151,284 @@ msgstr "Modulo conversione colore"
 msgid "Dither algorithm"
 msgstr "Algoritmo di retinatura"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Dimensione pagina"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Tipo di supporto"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Tipo di supporto (carta normale, carta fotografica, ecc.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Ingresso dei supporti"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Ingresso (vassoio) dei supporti"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Dimensione del porta CD"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Stampa solo fino al margine interno del CD o fino al buco"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "Dimensione CD (personalizzata)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Regolazione variabile per il diametro esterno del CD"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "Dimensione del porta CD (personalizzata)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Regolazione variabile per il diametro interno del CD"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Regolazione fine orizzontale CD"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Regolazione fine della posizione orizzontale per la stampa di CD"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "Regolazione fine verticale CD"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Risoluzione e qualità della stampa"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo d'inchiostro"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo d'inchiostro nella stampante"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Canali inchiostro"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Modalità di stampa"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Modalità di output per la stampa"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Tipo d'inchiostri"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tipo d'inchiostro nella stampante"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Senza bordi"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Stampa senza bordi"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Stampa doppia facciata"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Impostazione fronte retro/ribaltamento verticale"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Qualità di stampa"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Densità ciano"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Regola la densità del ciano"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Densità magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Regola la densità del magenta"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Densità giallo"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Regola la densità del giallo"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Densità nero"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Regola la densità del nero"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Transizione ciano chiaro"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Transizione magenta chiaro"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Transizione giallo chiaro"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Disattivato"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Lato lungo (standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Lato corto (girato)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 pollici"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 pollici"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - Personalizzato"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normale"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Stampa su porta CD"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Controllo manuale"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Entrambi"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -477,154 +477,195 @@ msgstr "Entrambi"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Nero"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Nessuna"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Controllo manuale"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Alta precisione"
@@ -658,7 +699,7 @@ msgid "Pre-Dithered"
 msgstr "Pre-retinato"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Toni di grigio"
 
@@ -674,11 +715,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -791,8 +832,8 @@ msgid "Gamma value assumed by application"
 msgstr "Valori gamma ipotizzati dall'applicazione"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -844,178 +885,178 @@ msgstr "Valori gamma ipotizzati dall'applicazione"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -1024,8 +1065,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Regola il gamma del ciano"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1077,178 +1118,178 @@ msgstr "Regola il gamma del ciano"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1257,8 +1298,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Regola il gamma del magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1310,178 +1351,178 @@ msgstr "Regola il gamma del magenta"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Giallo"
 
@@ -1490,18 +1531,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Regola il gamma del giallo"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Rosso"
 
@@ -1518,14 +1559,14 @@ msgid "Adjust the green gamma"
 msgstr "Regola il gamma del verde"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Blu"
 
@@ -1537,7 +1578,7 @@ msgstr "Regola il gamma del blu"
 msgid "Adjust the black gamma"
 msgstr "Regola il gamma del nero"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Bilanciamento del ciano"
 
@@ -1545,7 +1586,7 @@ msgstr "Bilanciamento del ciano"
 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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Bilanciamento del magenta"
 
@@ -1553,7 +1594,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Bilanciamento del giallo"
 
@@ -1840,10 +1881,6 @@ msgstr "Miglioramento della lucidità"
 msgid "Add gloss enhancement"
 msgstr "Aggiunge un miglioramento alla lucidità"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Tipo d'inchiostri"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Direzione di stampa"
@@ -1853,14 +1890,6 @@ msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 "Direzione di stampa (monodirezionale ha una qualità maggiore, ma è più lenta)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Senza bordi"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Stampa senza bordi"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Metodo d'interfoliazione"
@@ -1870,7 +1899,7 @@ msgid "Interleave pattern to use"
 msgstr "Modello d'interfoliazione da usare"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Ordine d'uscita"
 
@@ -2205,137 +2234,145 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Scala di densità del grigio Hextone 1 (il più chiaro)"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Tempo di asciugatura per pagina"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Imposta il tempo di asciugatura per ogni pagina"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Tempo di asciugatura per passata"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Imposta il tempo di asciugatura per ogni passata"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Tempo minimo di asciugatura per passata"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Imposta il tempo minimo di asciugatura per ogni passata"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Miglioramento della qualità"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Migliora la qualità di stampa con passate aggiuntive"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Spessore della carta"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Imposta lo spessore della carta della stampante"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Intensità di aspirazione"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Imposta l'intensità di aspirazione (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Sequenza d'avanzamento carta"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 "Imposta la sequenza d'avanzamento della carta (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Metodo di stampa"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Imposta la modalità di stampa (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Distanza testina-carta"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Imposta il platen gap (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Avanzamento carta"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Imposta l'avanzamento carta (a passi dello 0.01%)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Controllo manuale completo"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Controllo automatico delle impostazioni"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Bidirezionale"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Monodirezionale"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Riempimento alternato"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Riempimento ascendente"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Riempimento discendente"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Ascendente doppio"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Algoritmo nearest neighbor avoidance"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Lato corto (girato)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Opzioni di stampa non verificate, impossibile stampare.\n"
@@ -2389,104 +2426,104 @@ msgid "test print"
 msgstr "stampa di prova"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Foto composita a cinque colori"
 
@@ -2805,24 +2842,17 @@ msgstr "Manuale senza pausa"
 msgid "Coated"
 msgstr "Rivestito"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Nessuna"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Lucida"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Motivo"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Opaca"
 
@@ -2836,32 +2866,32 @@ msgstr "Opaca"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Tipo di laminazione"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Regolazione livello uscita"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Regola il bilanciamento del ciano"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Regola il bilanciamento del magenta"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Regola il bilanciamento del giallo"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Bilanciamento del nero"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Regola il bilanciamento del nero"
 
@@ -2893,7 +2923,7 @@ msgstr "Fotografica ad asciugatura rapida"
 msgid "Quick-dry Transparency"
 msgstr "Trasparenza ad asciugatura rapida"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuale"
 
@@ -2982,26 +3012,19 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Bozza"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Alta"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Foto"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Cartucce colore + nero"
@@ -3030,15 +3053,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:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Lettera"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -3047,7 +3070,7 @@ msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Le dimensioni dell'immagine devono corrispondere alle dimensioni della carta"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Errore irrecuperabile."
 
@@ -3057,33 +3080,36 @@ msgid ""
 msgstr ""
 "Inviare le informazioni precedenti a gimp-print-devel@lists.sourceforge.net"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Economica veloce"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Economica"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Foto super"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Foto ultra"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Migliore"
 
@@ -3790,64 +3816,64 @@ msgstr "Stampante"
 msgid "(Default Printer)"
 msgstr "(Stampante predefinita)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Funzioni stampante"
 
 # (ndt) Vedi sopra per le convenzioni
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Controlli di stampa"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Comuni"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Italian"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Dimensioni del supporto"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Modello colore"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Scala di grigio invertita"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "Colore RGB"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Colore CMY"
 
@@ -3860,53 +3886,53 @@ msgstr "Colore CMY"
 #   Desaturated
 #   Threshold
 #   Density
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Precisione del colore"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Sì"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Valore"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Regolazione fine"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Inversa"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "Stampa fronte/retro"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Riduci la dimensione della pagina se necessario per rimanere nei bordi"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Riduce la dimensione (stampa tutta la pagina)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Ritaglia (mantiene le dimensioni)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Espande (usa la massima area possibile nella pagina)"
 
@@ -4202,28 +4228,28 @@ msgstr "Tempo esaurito per la lettura dalla stampante\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Impossibile leggere da %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Specificare un device raw\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Impossibile aprire %s in lettura/scrittura: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Stampante %s sconosciuta.\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Impossibile scrivere su %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4232,7 +4258,7 @@ msgstr ""
 "\n"
 "Impossibile scrivere su %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4243,7 +4269,7 @@ msgstr ""
 "Impossibile rilevare il tipo di stampante.\n"
 "Usare -m per specificare il modello di stampante.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4285,22 +4311,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Nero fotografico"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4322,83 +4348,83 @@ msgstr "Sconosciuto"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Chiaro chiaro"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4420,114 +4446,114 @@ msgstr "Chiaro chiaro"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Magenta chiaro"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Nero chiaro"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4569,154 +4595,154 @@ msgstr "Nero chiaro"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Nero opaco"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Lucido"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Nero chiarissimo"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Arancione"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Stato: errore\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Stato: stampa\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Stato: occupata\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Stato: in attesa\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Stato: inattiva\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Stato: in pausa\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Stato: pulizia\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Stato: impostazioni di fabbrica\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Stato: in spegnimento\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Stato: sconosciuto (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Errore: errore irrecuperabile\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Errore: è selezionata un'altra interfaccia\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Errore: coperchio aperto\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Errore: carta inceppata\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Errore: inchiostro terminato\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Errore: carta terminata\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Errore: errore generico della carta\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Errore: trabocco della tanica di manutenzione\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Errore: attendere il ritorno dalla posizione di tear-off\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Errore: doppio errore di ingresso carta\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4725,148 +4751,148 @@ msgstr ""
 "Errore: la leva delle cartucce d'inchiostro è rilasciata\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Errore: errore irrecuperabile alla taglierina\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Errore: inceppatura recuperabile alla taglierina\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Errore: non è presente la tanica di manutenzione\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Errore: sportello posteriore aperto\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Errore: nessun porta CD presente\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Errore: errore di caricamento della tessera\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Errore: sportello del vassoio aperto\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Errore: sportello della tanica di manutenzione aperto\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Errore: sportello anteriore aperto\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Errore: richiesta manutenzione\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Errore: sconosciuto (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Attenzione: livello inchiostro %s basso\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Attenzione: livello inchiostro del canale %d basso\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Attenzione: pulitura di %s disabilitata\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Attenzione: pulizia in corso del canale %d\n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Attenzione: tanica di manutenzione quasi piena\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Attenzione: richiesta di manutenzione in corso\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Attenzione: sconosciuto (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Stampa del motivo di verifica degli ugelli in corso\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Nome stampante: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Livelli inchiostro:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Colore inchiostro"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Percentuale rimanente"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Nome lavoro: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "i livelli dell'inchiostro"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "lo stato"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Per ottenere %s è richiesto l'uso di un device raw.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Per ottenere le informazioni estese sull'inchiostro è necessario usare un "
 "device raw.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Cartuccia inchiostro"
 
@@ -4876,39 +4902,39 @@ msgstr "Cartuccia inchiostro"
 #         Ink colour       Percent remaining    Part number      Date
 #               Cyan                      96    T0452            2005-11
 #            Magenta                      96    T0453            2005-07
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Codice"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Data"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Per identificare la stampante è richiesto l'uso di un device raw.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Impossibile identificare il modello di stampante.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Pulizia testine...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Verifica degli ugelli in corso, assicurarsi che ci sia carta nella "
 "stampante.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4986,7 +5012,7 @@ msgstr ""
 "durante la procedura.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5056,18 +5082,18 @@ msgstr ""
 "i risultati. È essenziale non spegnere la stampante durante la procedura.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 "Impossibile inviare il comando alla stampante, il programma si chiuderà.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Uscita in corso\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5086,20 +5112,20 @@ msgstr ""
 "Verrà poi chiesto di confermare la propria scelta.\n"
 "Cosa fare (s/q/r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Confermare l'uscita senza salvare premendo nuovamente il tasto \"q\":\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5108,7 +5134,7 @@ msgstr ""
 "La stampante è ora allineata, ma l'allineamento non è stato salvato.\n"
 "Per salvare l'allineamento è necessario ripetere l'operazione.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5117,12 +5143,12 @@ msgstr ""
 "Confermare la ripetizione della procedura d'allineamento premendo\n"
 "nuovamente il tasto \"r\":\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Ripetizione della procedura d'allineamento in corso.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5136,17 +5162,17 @@ msgstr ""
 "e potrebbe danneggiare la stampante. Procedere?\n"
 "Confermare il salvataggio delle impostazioni con \"s\":\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Salvataggio impostazioni..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "non riuscito.\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5155,27 +5181,27 @@ msgstr ""
 "Le impostazioni non sono state salvate con successo. È necessario ripetere\n"
 "l'operazione d'allineamento.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "riuscito.\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Le impostazioni d'allineamento sono state salvate nella stampante.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando non riconosciuto.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "L'ultimo comando non è stato confermato.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5192,12 +5218,12 @@ msgstr ""
 "Mettere un foglio nella stampante per iniziare la procedura di\n"
 "allineamento delle testine.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Premere Invio per continuare > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5209,43 +5235,43 @@ msgstr ""
 "Digitare \"?\" per l'aiuto, \"r\" per ripetere la procedura o un numero di "
 "coppia\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Passo n° %d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Inserire un nuovo foglio di carta.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numero fuori dall'intervallo.\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Impossibile comprendere ciò che è stato digitato.\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 "La coppia di linee migliore dovrebbe avere un numero compreso tra 1 e %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentativo di impostazione dell'allineamento..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "riuscito.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5258,11 +5284,20 @@ msgstr ""
 "sia il %d°. Altrimenti è necessario ripetere il processo per ottenere\n"
 "la migliore qualità di stampa possibile.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Errore nell'input\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Stampa senza bordi"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 # questo appare nella barra di avanzamento nella parte inferiore della
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
@@ -5532,21 +5567,21 @@ msgstr "In stampa..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "Inchiostri standard EPSON"
 
@@ -5574,7 +5609,7 @@ msgstr "Carta bianco brillante"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Cartolina"
 
@@ -5860,29 +5895,29 @@ msgstr "Carta fotografica premium luster 250 g/m²"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6242,8 +6277,8 @@ msgstr "Carta telata - Radiant White"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "Nero fotografico UltraChrome"
 
@@ -6318,8 +6353,8 @@ msgstr "Nero fotografico UltraChrome"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "Nero opaco UltraChrome"
 
@@ -6332,10 +6367,10 @@ msgstr "Nero opaco UltraChrome"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr "Hextone"
 
@@ -6476,6 +6511,7 @@ msgstr "360 DPI alta qualità"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6536,6 +6572,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
@@ -6596,6 +6633,7 @@ msgstr "720 × 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6721,7 +6759,8 @@ msgstr "720 DPI alta qualità"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
@@ -6799,6 +6838,7 @@ msgstr "2880 × 720 DPI massima qualità"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
@@ -6835,12 +6875,13 @@ msgstr "1440 × 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Giallo scuro"
 
@@ -6862,6 +6903,7 @@ msgstr "Giallo scuro"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
@@ -6935,7631 +6977,8282 @@ msgstr "Magenta chiaro vivido"
 msgid "Vivid Magenta"
 msgstr "Magenta vivido"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Vassoio principale"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Vassoio delle fotografie"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Stampa su CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Vassoio posteriore"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Vassoio anteriore"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Inserimento manuale"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Rullo di alimentazione (taglio di ogni pagina)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Rullo di alimentazione (senza taglio)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rullo di alimentazione"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Guida manuale foglio"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Alimentazione manuale (fronte)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Rullo di alimentazione (senza bordo, con un solo taglio)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Rullo di alimentazione (senza bordo, con due tagli)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Cartoncino fotografico"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Scomparto taglio carta 1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Scomparto taglio carta 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Autoselezione taglio carta"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Selezione manuale"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Raw monocromatico"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Raw a tre colori"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Raw a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Raw a cinque colori"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Raw a sei colori"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "Grigio 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "Grigio 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "Grigio 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr "Quadtone MIS"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr "Six Tone MIS"
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "Grigio 5"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "Grigio 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Raw lucido migliorato a un colore"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Raw lucido a tre colori"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Raw lucido a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Raw lucido migliorato a sei colori"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Raw lucido migliorato a sette colori"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "Nero opaco"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Nero predefinito"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Foto a sette colori"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Foto composita a sei colori migliorata"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Raw a sette colori"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Toni di grigio a due livelli"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Raw a due colori"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Foto a otto colori"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Raw a otto colori"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Foto a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Interfoliazione"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Sovrapposizione totale"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Quattro passaggi"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Sovrapposizione totale 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Interfoliazione 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Otto passaggi"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Attivo"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 ×5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 msgid "L"
 msgstr "L"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr "KG"
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Carta fotografica Epson 4×6 (a bordi fustellati)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Carta fotografica Epson L (a bordi fustellati)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 msgid "4x8"
 msgstr "4×8"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr "2L"
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr "Rokukire"
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17×22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr "YonKire"
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr "HanKire"
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "ISO 4B"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "ISO 2B"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "ISO B0"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "ISO B1"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "ISO B2"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "ISO B4"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "ISO B5"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "ISO B6"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "ISO B7"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "ISO B8"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "ISO B9"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "ISO B10"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super JIS B0"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "JIS B0"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "JIS B1"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "JIS B2"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "JIS B3"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "JIS B4"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "JIS B5"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "JIS B6"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "JIS B7"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "JIS B8"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "JIS B9"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "JIS B10"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
 msgstr "EA5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
 msgstr "EA5 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA girato"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB girato"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC girato"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD girato"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE girato"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Formato protocollo americano"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Formato protocollo europeo"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto grande"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo grande"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Tascabile piccolo"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Tascabile Penguin piccolo"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Tascabile Penguin grande"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm × 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Biglietto Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Biglietto Ofuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Busta giapponese lunga #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Busta giapponese lunga #3 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Busta giapponese lunga #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Busta giapponese lunga #4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Busta giapponese lunga #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Busta giapponese lunga #4 orizzontale"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Busta giapponese lunga #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Busta giapponese lunga #3 orizzontale"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Busta giapponese Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Busta giapponese Kaku #4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "Invito A2"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Busta Monarch"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Busta Monarch orizzontale"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4×5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4×7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr "101.6x180.6 largo"
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Tessera"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Cartolina larga"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 msgid "A3+"
 msgstr "A3+"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "Carta in rotolo da 89 mm"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "Carta in rotolo da 4 pollici"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "Carta in rotolo da 5 pollici"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "Carta in rotolo da 210 mm"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "Carta in rotolo da 13 pollici"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "Carta in rotolo da 17 pollici"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "Carta in rotolo da 22 pollici"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "Carta in rotolo da 24 pollici"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "Carta in rotolo da 36 pollici"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "Carta in rotolo da 44 pollici"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "Carta in rotolo da 60 pollici"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "Carta in rotolo da 64 pollici"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
-msgstr "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S830D"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S900"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S9000"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1500"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP1900"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr "Canon PIXMA iP1900"
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6866
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2200"
-msgstr "Canon PIXMA iP2000"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP2700"
-
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4700"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP250"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP270"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP280"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP370"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP390"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP450"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP460"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP480"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP510"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP540"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP550"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP960"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP970"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MG5100"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MG5200"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MG6100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MG8100"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MX330"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MX350"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MX700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MX860"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MX870"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MX7600"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 50"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 710"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 810"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Epson B-310"
 msgstr "Epson B-310"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Epson B-310N"
 msgstr "Epson B-310N"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Epson B-510DN"
 msgstr "Epson B-510DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B1100"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T1100"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T1110"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290s"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo P50"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R3000"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX710W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX810FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 3800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 3880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 3885"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 4000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 4800/4880 retro-compatibile"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 4800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 4880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7700"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7890"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9700"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9890"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11800/11880 retro-compatibile"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11800"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX115"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX215"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX415"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX515"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo PX650"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo PX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo PX710W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo PX810FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S21"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus S50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX110"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX115"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX210"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX215"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX410"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX415"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX510W"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX615"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus SX650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T21"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T26"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T30"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus T40W"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus T59"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus T60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX110"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX210"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus TX300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX410"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX510FN"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus TX550W"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX610FW"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX659"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 310"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 315"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 610"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 615"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 1100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
 msgstr "Epson EP 302"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
 msgstr "Epson EP 702A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
 msgstr "Epson ME 320"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 600F"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 620F"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 1100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
 msgstr "Epson PX 1001"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr "Brother HL-2030"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr "Brother HL-2035"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-3360"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
 msgstr "Epson AL-C2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AL-C2000 PS3"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
 msgstr "Epson AL-C8500"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
 msgstr "Epson AL-C8500PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
 msgstr "Epson AL-C8600"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson AL-C8600 PS3"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900 PS3"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100 PS3"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500 PS3"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Stampante PCL 4 generica"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Stampante PCL 4 LF generica"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Stampante PCL 5 generica"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Stampante PCL 5 LF generica"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Stampante PCL 5c generica"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Stampante PCL 5c LF generica"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Stampante PCL 5e generica"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Stampante PCL 5e LF generica"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Stampante PCL 6/PCL XL generica"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Stampante PCL 6/PCL XL LF generica"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DeskJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HO DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr "Kyocera CS-1815"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-920"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1018MFP"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-1020D"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-1030D"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1118MFP"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1714M"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1920"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-2000D"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-3718M"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3820N"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3830N"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-3900DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-4000DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-6020"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-6026"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-6300"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-6750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-6900"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-6950DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-7028M"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9130DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9530DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1510"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1815"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1820"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3050"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4050"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-4230/5230"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5050"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-6030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-8030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr "Oki B4350"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr "Tektronix Phaser 750DP"
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr "Tektronix Phaser 750DX"
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr "Tektronix Phaser 750N"
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr "Tektronix Phaser 750P"
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr "Xerox Phaser 2135"
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Phaser 4400B"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr "Xerox Phaser 4400DT"
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr "Xerox Phaser 4400DX"
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Phaser 4400N"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox Phaser 4500B"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox Phaser 4500DT"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox Phaser 4500DX"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox Phaser 4500N"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox Phaser 4510B"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox Phaser 4510DT"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox Phaser 4510DX"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox Phaser 4510N"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr "Xerox Phaser 5500B"
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr "Xerox Phaser 5500DN"
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr "Xerox Phaser 5500DT"
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr "Xerox Phaser 5500DX"
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr "Xerox Phaser 5500N"
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Phaser 6130N"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr "Xerox Phaser 6180DN"
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr "Xerox Phaser 6180MFP-D"
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr "Xerox Phaser 6200B"
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr "Xerox Phaser 6200DP"
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr "Xerox Phaser 6200DX"
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr "Xerox Phaser 6200N"
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr "Xerox Phaser 6250B"
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr "Xerox Phaser 6250DP"
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr "Xerox Phaser 6250DT"
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr "Xerox Phaser 6250DX"
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr "Xerox Phaser 6250N"
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr "Xerox Phaser 6300DN"
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr "Xerox Phaser 6300N"
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr "Xerox Phaser 6350DP"
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr "Xerox Phaser 6350DT"
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr "Xerox Phaser 6350DX"
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr "Xerox Phaser 6360DN"
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr "Xerox Phaser 6360DX"
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr "Xerox Phaser 7300B"
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr "Xerox Phaser 7300DN"
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr "Xerox Phaser 7300DT"
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr "Xerox Phaser 7300DX"
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr "Xerox Phaser 7300N"
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr "Xerox Phaser 7400DN"
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr "Xerox Phaser 7400DT"
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr "Xerox Phaser 7400DX"
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr "Xerox Phaser 7400DXF"
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Phaser 7400N"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr "Xerox Phaser 7700DN"
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr "Xerox Phaser 7700DX"
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr "Xerox Phaser 7700GX"
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr "Xerox Phaser 7750B"
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr "Xerox Phaser 7750DN"
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr "Xerox Phaser 7750DXF"
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr "Xerox Phaser 7750GX"
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr "Xerox Phaser 7760DN"
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr "Xerox Phaser 7760DX"
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr "Xerox Phaser 7760GX"
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Phaser 8400B"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr "Xerox Phaser 8400BD"
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr "Xerox Phaser 8400DP"
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr "Xerox Phaser 8400DX"
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Phaser 8400N"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr "Xerox Phaser 8500DN"
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr "Xerox Phaser 8500N"
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr "Xerox Phaser 8550DP"
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr "Xerox Phaser 8550DT"
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr "Xerox Phaser 8550DX"
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr "Xerox Phaser 8560DN"
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre 7345"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-530"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-800"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak EasyShare-G600-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr "Kodak PD-4000"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr "Kodak PD-6000"
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Photo-Printer"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Photo-Printer-500"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Printer-Dock-Plus"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Printer-Dock-Plus-S3"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "Dati RAW 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "Dati RAW 8 bit"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP1900"
+
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Regolazione base immagine"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 3c6bef8..add1d38 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index e1010b1..8ad4f7b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,54 +1,52 @@
-# gimp-print ja.po.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Japanese messages for gimp-print (gutenprint)
+# Copyright (C) 2002, 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gutenprint package.
 # Takeshi AIHANA <aihana@gnome.gr.jp>, 2002.
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp-print Version 4.2.3\n"
+"Project-Id-Version: gutenprint-20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-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"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
+"PO-Revision-Date: 2011-10-19 19:25+0900\n"
+"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
-#, fuzzy
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr ""
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:47
 msgid "EvenTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr "イベントトーン方�"
 
 #: src/main/dither-main.c:48
-#, fuzzy
 msgid "Hybrid EvenTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr ""
 
 #. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
 #. * names, not descriptive.
 #.
 #: src/main/dither-main.c:53
-#, fuzzy
 msgid "EvenBetter"
-msgstr "¥ì¥¿¡¼"
+msgstr ""
 
 #: src/main/dither-main.c:54
-#, fuzzy
 msgid "Hybrid EvenBetter"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr ""
 
 #: src/main/dither-main.c:60
-#, fuzzy
 msgid "UniTone"
-msgstr "¥¤¥Ù¥ó¥È¥È¡¼¥óÊý¼°"
+msgstr ""
 
 #: src/main/dither-main.c:61
 msgid "Hybrid UniTone"
@@ -56,28 +54,27 @@ msgstr ""
 
 #: src/main/dither-main.c:63
 msgid "Adaptive Hybrid"
-msgstr "¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°"
+msgstr "アダプティブ・�イブリッド方�"
 
 #: src/main/dither-main.c:64
 msgid "Ordered"
-msgstr "Ŭ±þ½ç½øÊý¼°"
+msgstr "�応順�方�"
 
 #: src/main/dither-main.c:65
-#, fuzzy
 msgid "Ordered New"
-msgstr "Ŭ±þ½ç½øÊý¼°"
+msgstr ""
 
 #: src/main/dither-main.c:66
 msgid "Fast"
-msgstr "¹â®Êý¼°"
+msgstr "高速方�"
 
 #: src/main/dither-main.c:67
 msgid "Very Fast"
-msgstr "Ķ¹â®Êý¼°"
+msgstr "超高速方�"
 
 #: src/main/dither-main.c:68
 msgid "Hybrid Floyd-Steinberg"
-msgstr "¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°"
+msgstr "�イブリッド・フロイド-スタイン�ーグ方�"
 
 #: src/main/dither-main.c:69
 msgid "Predithered Input"
@@ -92,9 +89,8 @@ msgid "Drop Size Segmented New"
 msgstr ""
 
 #: src/main/dither-main.c:91 src/main/print-color.c:56
-#, fuzzy
 msgid "Density"
-msgstr "Ç»ÅÙ:"
+msgstr "濃度"
 
 #: src/main/dither-main.c:92
 msgid ""
@@ -102,13 +98,13 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"°õºþ»þ¤ÎÇ»ÅÙ (¥¤¥ó¥¯¤ÎÎÌ) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
-"ÍÑ»æ¤ËÂçÎ̤Υ¤¥ó¥¯¤¬ÉÕ¤¤¤¿¤ê±ø¤ì¤¿¤ê¤¹¤ë¾ì¹ç¤ÏÇ»ÅÙ¤òÄ㤯¤·¤Æ²¼¤µ¤¤;\n"
-"¹õ¤ÎÉôʬ¤¬¤Þ¤Ð¤é¤Ë¤Ê¤ë¾ì¹ç¤ÏÇ»ÅÙ¤ò¹â¤¯¤·¤Æ²¼¤µ¤¤¡£"
+"�刷時�濃度 (インク��) を調整���。\n"
+"用紙�大��インク�付��り汚れ�り�る場��濃度を低���下��;\n"
+"黒�部分���ら��る場��濃度を高���下��。"
 
 #: src/main/dither-main.c:100
 msgid "Dither Algorithm"
-msgstr "¥Ç¥£¥¶Êý¼°"
+msgstr "ディザリング方�"
 
 #: src/main/dither-main.c:101
 #, fuzzy
@@ -122,17 +118,17 @@ msgid ""
 "art.\n"
 "Hybrid Floyd-Steinberg generally produces inferior output."
 msgstr ""
-"»ÈÍѤ¹¤ë¥Ç¥£¥¶¥ê¥ó¥°Êý¼°¤òÁªÂò¤·¤Þ¤¹¡£\n"
-"\"¥¢¥À¥×¥Æ¥£¥Ö¡¦¥Ï¥¤¥Ö¥ê¥Ã¥ÉÊý¼°\": °ìÈÌŪ¤ËºÇŬ¤ÊÉʼÁ¤òÄ󶡤·¤Þ¤¹¡£\n"
-"\"Ŭ±þ½ç½øÊý¼°\": ¹â®¤Ç¼Ì¿¿¤Ê¤É¤Î¹âÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ¤¹¡£\n"
-"\"¹â®Êý¼°\",\"Ķ¹â®Êý¼°\": ¤«¤Ê¤ê¹â®¤Ë°õºþ¤·¡¢¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¤ËŬ¤·"
-"¤Æ¤¤¤Þ¤¹¡£\n"
-"\"¥Ï¥¤¥Ö¥ê¥Ã¥É¡¦¥Õ¥í¥¤¥É-¥¹¥¿¥¤¥ó¥Ð¡¼¥°Êý¼°\": °ìÈÌŪ¤ËÄãÉʼÁ¤Ê½ÐÎϤòÄ󶡤·¤Þ"
-"¤¹¡£"
+"使用�るディザリング方�を�択���。\n"
+"\"アダプティブ・�イブリッド方�\": 一般的�最���質を�供���。\n"
+"\"�応順�方�\": 高速�写真���高�質�出力を�供���。\n"
+"\"高速方�\",\"超高速方�\": ��り高速��刷��テキストやラインアート���"
+"����。\n"
+"\"�イブリッド・フロイド-スタイン�ーグ方�\": 一般的�低�質�出力を�供��"
+"�。"
 
 #: src/main/module.c:52
 msgid "Miscellaneous (unclassified)"
-msgstr ""
+msgstr "��他 (未分類)"
 
 #: src/main/module.c:53
 msgid "Family driver"
@@ -140,145 +136,162 @@ msgstr ""
 
 #: src/main/module.c:54
 msgid "Color conversion module"
-msgstr ""
+msgstr "色変�モジュール"
 
 #: src/main/module.c:55
-#, fuzzy
 msgid "Dither algorithm"
-msgstr "¥Ç¥£¥¶Êý¼°"
+msgstr "ディザリング方�"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
-#, fuzzy
 msgid "Page Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr ""
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
-#, fuzzy
 msgid "Size of the paper being printed to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
+msgstr "�刷�る用紙サイズ"
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
-msgstr "ÍÑ»æ¤Î¼ïÎà"
+msgstr "用紙�種類"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr ""
+msgstr "メディア�種類 (普通紙�写真用紙���他)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
-msgstr "µë»æÊýË¡"
+msgstr "給紙方法"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
-msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
+msgstr "�刷時�給紙方���。"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
-msgstr ""
+msgstr "CD�中心�サイズ"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
+msgstr "CD�中心�外�����る��中心�穴以外����刷�る"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
-msgstr ""
+msgstr "CD サイズ（カスタム）"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
-msgstr ""
+msgstr "CD�外径を�変的�調整"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
-msgstr ""
+msgstr "CD�中心�サイズ (カスタム)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
-msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+msgstr "用紙サイズを 100 ���場��比率��。"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
-msgstr ""
+msgstr "CD �横方�を微調整"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
-msgstr ""
+msgstr "CDを�刷�る���水平�置を微調整���"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
-msgstr ""
+msgstr "CD �縦方�を微調整"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
-msgstr "²òÁüÅÙ"
+msgstr "解�度"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
-msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
+msgstr "�刷時�解�度��質��。"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
+msgstr "インク�種類"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+msgstr "�刷時�インク�種類��。"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+msgstr "プリンタ�型�:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
-msgstr ""
+msgstr "�刷出力モード"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "インク�種類"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "�刷時�インク�種類��。"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "枠��"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "フ����刷"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
-msgstr ""
+msgstr "両��刷"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -286,166 +299,138 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 DPI Highest Quality"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
-#, fuzzy
 msgid "Cyan Density"
-msgstr "Ç»ÅÙ:"
+msgstr "シアン濃度"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
-#, fuzzy
 msgid "Adjust the cyan density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "シアン濃度を調整"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
-#, fuzzy
 msgid "Magenta Density"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ濃度"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
-#, fuzzy
 msgid "Adjust the magenta density"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "マゼンタ濃度を調整"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
-#, fuzzy
 msgid "Yellow Density"
-msgstr "Ç»ÅÙ:"
+msgstr "イエロー濃度"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
-#, fuzzy
 msgid "Adjust the yellow density"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "イエロー�濃度�調整"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
-#, fuzzy
 msgid "Black Density"
-msgstr "Ç»ÅÙ:"
+msgstr "黒�濃度"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
-#, fuzzy
 msgid "Adjust the black density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "黒�濃度�調整"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 #, fuzzy
 msgid "Light Cyan Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 #, fuzzy
 msgid "Light Magenta Transition"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "明る�マゼンタ"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
-msgstr ""
+msgstr "長辺 (標準)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
-msgstr ""
+msgstr "短辺 (�転)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
-msgstr "¥«¥¹¥¿¥à"
+msgstr "カスタム"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
-
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+msgstr "ファイル��刷����？"
+
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
-msgstr "¥«¥é¡¼"
+msgstr "カラー"
 
-#: src/main/print-canon.c:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒�白"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "½ÐÎϤμïÎà:"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "ɸ½à"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
-msgstr "ξü"
+msgstr "両端"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -494,218 +479,261 @@ msgstr "ξü"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
-msgstr "¹õ¿§"
+msgstr "黒色"
+
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "写真"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "出力�種類:"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "標準"
 
 #: src/main/print-color.c:50
 msgid "High Accuracy"
-msgstr ""
+msgstr "高精度"
 
 #: src/main/print-color.c:51
 #, fuzzy
 msgid "Bright Colors"
-msgstr "°õºþ¥«¥é¡¼Ä´À°"
+msgstr "�刷カラー調整"
 
 #: src/main/print-color.c:52
 msgid "Correct Hue Only"
-msgstr ""
+msgstr "色相��修正"
 
 #: src/main/print-color.c:53
 msgid "Uncorrected"
-msgstr ""
+msgstr "未修正"
 
 #: src/main/print-color.c:54
 msgid "Desaturated"
-msgstr ""
+msgstr "彩度を減ら�"
 
 #: src/main/print-color.c:55
 msgid "Threshold"
-msgstr ""
+msgstr "閾値"
 
 #: src/main/print-color.c:57 src/main/print-color.c:133
 msgid "Raw"
-msgstr ""
+msgstr "Raw"
 
 #: src/main/print-color.c:58
 #, fuzzy
 msgid "Pre-Dithered"
-msgstr "°õºþ"
+msgstr "�刷"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレースケール"
 
 #: src/main/print-color.c:123
 #, fuzzy
 msgid "Whitescale"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:125
 msgid "RGB"
-msgstr ""
+msgstr "RGB"
 
 #: src/main/print-color.c:127
 msgid "CMY"
-msgstr ""
+msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
-msgstr ""
+msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
-msgstr ""
+msgstr "KCMY"
 
 #: src/main/print-color.c:165 src/main/print-color.c:454
 #, fuzzy
 msgid "Channel "
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/main/print-color.c:166
 msgid "Gamma for raw channel "
@@ -713,76 +741,71 @@ msgstr ""
 
 #: src/main/print-color.c:176
 msgid "Color Correction"
-msgstr ""
+msgstr "色補正"
 
 #: src/main/print-color.c:177
 msgid "Color correction to be applied"
-msgstr ""
+msgstr "�用�る色補正"
 
 #: src/main/print-color.c:184
 msgid "Channel Bit Depth"
-msgstr ""
+msgstr "�ャン�ルビット深度"
 
 #: src/main/print-color.c:185
 msgid "Bit depth per channel"
-msgstr ""
+msgstr "�ャン�ル���ビット深度"
 
 #: src/main/print-color.c:192
-#, fuzzy
 msgid "Input Image Type"
-msgstr "²èÁü¤Î¼ïÎà"
+msgstr "入力画��種類"
 
 #: src/main/print-color.c:193
-#, fuzzy
 msgid "Input image type"
-msgstr "²èÁü¤Î¼ïÎà"
+msgstr "入力画��種類"
 
 #: src/main/print-color.c:200
-#, fuzzy
 msgid "Output Image Type"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力画��種類"
 
 #: src/main/print-color.c:201
-#, fuzzy
 msgid "Output image type"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力画��種類"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:347
 msgid "Raw Channels"
-msgstr ""
+msgstr "Raw�ャン�ル"
 
 #: src/main/print-color.c:216
 #, fuzzy
 msgid "SimpleGamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "スクリーンガンマ補正を���"
 
 #: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
-msgstr "ÌÀ¤ë¤µ:"
+msgstr "明る�:"
 
 #: src/main/print-color.c:225
-#, fuzzy
 msgid "Brightness of the print"
-msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�明る�"
 
 #: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
-msgstr "¥³¥ó¥È¥é¥¹¥È:"
+msgstr "コントラスト:"
 
 #: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
-msgstr ""
+msgstr "�刷�コントラスト (0�)"
 
 #: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
-msgstr ""
+msgstr "線形コントラスト調整"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -798,22 +821,22 @@ msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
-"°õºþ»þ¤Î¥¬¥ó¥ÞÃͤòÄ´À°¤·¤Þ¤¹¡£\n"
-"ÃͤòÂ礭¤¯¤¹¤ë¤È°ìÈÌŪ¤ËÌÀ¤ë¤¤°õºþ¤Ë¤Ê¤ê¡¢¾®¤µ¤¯¤¹¤ë¤È°Å¤¤°õºþ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"ÌÀ¤ë¤µ¤ÎÄ´À°¤È¤Ï°Û¤Ê¤ê¡¢¹õ¿§¤ÈÇò¿§¤ÏƱ¤¸¤Þ¤Þ¤Ç¤¹¡£"
+"�刷時�ガンマ値を調整���。\n"
+"値を大���る�一般的�明る��刷��り�����る�暗��刷��り��。\n"
+"明る��調整��異�り�黒色�白色�������。"
 
 #: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
-msgstr ""
+msgstr "アプリケーション�推定��ガンマ値"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -865,189 +888,188 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
-msgstr "¥·¥¢¥ó (C)"
+msgstr "シアン (C)"
 
 #: src/main/print-color.c:267
-#, fuzzy
 msgid "Adjust the cyan gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "シアン�ガンマ値を調整"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1099,189 +1121,188 @@ msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-color.c:275
-#, fuzzy
 msgid "Adjust the magenta gamma"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "マゼンタ�ガンマ値を調整"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1333,288 +1354,277 @@ msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-color.c:283
-#, fuzzy
 msgid "Adjust the yellow gamma"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "イエロー�ガンマ値を調整"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
-msgstr ""
+msgstr "赤"
 
 #: src/main/print-color.c:291
-#, fuzzy
 msgid "Adjust the red gamma"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "赤�ガンマ値を調整"
 
 #: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
-msgstr ""
+msgstr "ç·‘"
 
 #: src/main/print-color.c:299
-#, fuzzy
 msgid "Adjust the green gamma"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "緑�ガンマ値を調整"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
-msgstr ""
+msgstr "�"
 
 #: src/main/print-color.c:307
-#, fuzzy
 msgid "Adjust the blue gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "��ガンマ値を調整"
 
 #: src/main/print-color.c:315
-#, fuzzy
 msgid "Adjust the black gamma"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "黒�ガンマ値を調整"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
-msgstr ""
+msgstr "シアン�ランス"
 
 #: src/main/print-color.c:323
-#, fuzzy
 msgid "Adjust the cyan gray balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "シアン�グレー�ランスを調整"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
-#, fuzzy
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ��ランス"
 
 #: src/main/print-color.c:331
-#, fuzzy
 msgid "Adjust the magenta gray balance"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "マゼンタ�グレー�ランスを調整"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
-#, fuzzy
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "イエロー��ランス"
 
 #: src/main/print-color.c:339
-#, fuzzy
 msgid "Adjust the yellow gray balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "イエロー�グレー�ランスを調整"
 
 #: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
-msgstr "ºÌÅÙ:"
+msgstr "彩度:"
 
 #: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
-"°õºþ»þ¤ÎºÌÅÙ (¥«¥é¡¼¡¦¥Ð¥é¥ó¥¹) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
-"¥«¥é¡¼¤È¹õ¤ÎξÊý¤Î¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¥¹¥±¡¼¥ë½ÐÎϤ¹¤ë¾ì¹ç¤Ï 0 ¤Ë¤·¤Æ²¼¤µ¤¤¡£"
+"�刷時�彩度 (カラー・�ランス) を調整���。\n"
+"カラー�黒�両方�インクを使��グレースケール出力�る場�� 0 ���下��。"
 
 #: src/main/print-color.c:357
-#, fuzzy
 msgid "Ink Limit"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
+msgstr "インク制�"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
-msgstr ""
+msgstr "ページを�刷�る際�インク�を制��る"
 
 #: src/main/print-color.c:365 src/main/print-escp2.c:878
 msgid "GCR Transition"
@@ -1647,7 +1657,7 @@ msgstr ""
 #: src/main/print-color.c:421
 #, fuzzy
 msgid "Advanced Output Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-color.c:422
 msgid "Dump file for LUT for external color adjustment"
@@ -1659,107 +1669,92 @@ msgstr ""
 
 #: src/main/print-color.c:466
 msgid "Cyan Curve"
-msgstr ""
+msgstr "シアンカーブ"
 
 #: src/main/print-color.c:467
-#, fuzzy
 msgid "Cyan curve"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "シアンカーブ"
 
 #: src/main/print-color.c:474
-#, fuzzy
 msgid "Magenta Curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタカーブ"
 
 #: src/main/print-color.c:475
-#, fuzzy
 msgid "Magenta curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタカーブ"
 
 #: src/main/print-color.c:482
-#, fuzzy
 msgid "Yellow Curve"
-msgstr "²«¿§ (Y)"
+msgstr "イエローカーブ"
 
 #: src/main/print-color.c:483
-#, fuzzy
 msgid "Yellow curve"
-msgstr "²«¿§ (Y)"
+msgstr "イエローカーブ"
 
 #: src/main/print-color.c:490
-#, fuzzy
 msgid "Black Curve"
-msgstr "¹õ¿§"
+msgstr "黒色�カーブ"
 
 #: src/main/print-color.c:491
-#, fuzzy
 msgid "Black curve"
-msgstr "¹õ¿§"
+msgstr "黒色�カーブ"
 
 #: src/main/print-color.c:498
-#, fuzzy
 msgid "Red Curve"
-msgstr "²«¿§ (Y)"
+msgstr "赤色�カーブ"
 
 #: src/main/print-color.c:499
-#, fuzzy
 msgid "Red curve"
-msgstr "²«¿§ (Y)"
+msgstr "赤色�カーブ"
 
 #: src/main/print-color.c:506
-#, fuzzy
 msgid "Green Curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "緑色�カーブ"
 
 #: src/main/print-color.c:507
-#, fuzzy
 msgid "Green curve"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "緑色�カーブ"
 
 #: src/main/print-color.c:514
-#, fuzzy
 msgid "Blue Curve"
-msgstr "¹õ¿§"
+msgstr "�色�カーブ"
 
 #: src/main/print-color.c:515
-#, fuzzy
 msgid "Blue curve"
-msgstr "¹õ¿§"
+msgstr "�色�カーブ"
 
 #: src/main/print-color.c:522
-#, fuzzy
 msgid "White Curve"
-msgstr "²«¿§ (Y)"
+msgstr "白色�カーブ"
 
 #: src/main/print-color.c:523
-#, fuzzy
 msgid "White curve"
-msgstr "²«¿§ (Y)"
+msgstr "白色�カーブ"
 
 #: src/main/print-color.c:530
 msgid "Hue Map"
-msgstr ""
+msgstr "色相図"
 
 #: src/main/print-color.c:531
 msgid "Hue adjustment curve"
-msgstr ""
+msgstr "色相調整カーブ"
 
 #: src/main/print-color.c:538
 #, fuzzy
 msgid "Saturation Map"
-msgstr "ºÌÅÙ:"
+msgstr "彩度:"
 
 #: src/main/print-color.c:539
 msgid "Saturation adjustment curve"
-msgstr ""
+msgstr "彩度調整カーブ"
 
 #: src/main/print-color.c:546
 msgid "Luminosity Map"
-msgstr ""
+msgstr "明度図"
 
 #: src/main/print-color.c:547
 msgid "Luminosity adjustment curve"
-msgstr ""
+msgstr "明度調整カーブ"
 
 #: src/main/print-color.c:554
 msgid "Gray Component Reduction"
@@ -1776,22 +1771,22 @@ msgstr ""
 #: src/main/printers.c:597
 #, c-format
 msgid "Value must be set for %s\n"
-msgstr ""
+msgstr "%s �値を設定�る必���り��\n"
 
 #: src/main/printers.c:610 src/main/printers.c:615
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid %s\n"
-msgstr "%s ¤Ï¼ïÎà %s ¤ËÂФ¹¤ëŬÀڤʥѥé¥á¡¼¥¿¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "'%s' �正�� %s ���り��ん\n"
 
 #: src/main/printers.c:634
 #, c-format
 msgid "%s must be between %f and %f (is %f)\n"
-msgstr ""
+msgstr "%s�%f ～ %f�間��る必���り��（%f��）\n"
 
 #: src/main/printers.c:656 src/main/printers.c:680
 #, c-format
 msgid "%s must be between %d and %d (is %d)\n"
-msgstr ""
+msgstr "%s�%d ～ %d�間��る必���り��（%d��）\n"
 
 #: src/main/printers.c:711
 #, c-format
@@ -1801,11 +1796,11 @@ msgstr ""
 #: src/main/printers.c:719
 #, c-format
 msgid "%s wrap mode must be %s\n"
-msgstr ""
+msgstr "%s 折り返�モード� %s ���れ�����ん\n"
 
 #: src/main/printers.c:723
 msgid "no wrap"
-msgstr ""
+msgstr "折り返���"
 
 #: src/main/printers.c:723
 msgid "wrap around"
@@ -1814,37 +1809,34 @@ msgstr ""
 #: src/main/printers.c:767
 #, fuzzy, c-format
 msgid "Unknown type parameter %s (%d)\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
+msgstr "プリンタ %s ��明��\n"
 
 #: src/main/printers.c:780 src/main/printers.c:791
 #, c-format
 msgid "%s out of range (value %d, min %d, max %d)\n"
-msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %d, ºÇ¾® %d, ºÇÂç %d)\n"
+msgstr "%s �範囲を越���� (�在�値 %d, 最� %d, 最大 %d)\n"
 
 #: src/main/printers.c:851
-#, fuzzy
 msgid "Page size is not valid\n"
-msgstr "²èÁü¥µ¥¤¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó\n"
+msgstr "ページサイズ�正���り��ん\n"
 
 #: src/main/printers.c:872
-#, fuzzy, c-format
+#, c-format
 msgid "Top margin must not be less than %d\n"
-msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "上マージン� %d より�����������\n"
 
 #: src/main/printers.c:878
-#, fuzzy, c-format
+#, c-format
 msgid "Left margin must not be less than %d\n"
-msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "左マージン� %d より�����������\n"
 
 #: src/main/printers.c:884
-#, fuzzy
 msgid "Height must be greater than zero\n"
-msgstr "º¸¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "高�� 0 より大����れ�����ん\n"
 
 #: src/main/printers.c:890
-#, fuzzy
 msgid "Width must be greater than zero\n"
-msgstr "¾å¥Þ¡¼¥¸¥ó¤Ï 0 ¤è¤ê¾®¤µ¤¯¤·¤Ê¤¤¤Ç²¼¤µ¤¤\n"
+msgstr "幅�0より大��必���り��\n"
 
 #: src/main/printers.c:896
 #, c-format
@@ -1862,24 +1854,23 @@ msgstr ""
 
 #: src/main/print-escp2.c:150
 msgid "Automatic Printing Mode"
-msgstr ""
+msgstr "自動�刷モード"
 
 #: src/main/print-escp2.c:151
 msgid "Automatic printing mode"
-msgstr ""
+msgstr "自動�刷モード"
 
 #: src/main/print-escp2.c:222
 msgid "CD Allow Other Media Sizes"
-msgstr ""
+msgstr "CD�他�メディアサイズを許��る"
 
 #: src/main/print-escp2.c:223
 msgid "Allow non-CD media sizes when printing to CD"
-msgstr ""
+msgstr "CD��刷時�CD以外�メディアサイズを許��る"
 
 #: src/main/print-escp2.c:229 src/main/print-pcl.c:1371
-#, fuzzy
 msgid "Resolution of the print"
-msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
+msgstr "�刷時�解�度"
 
 #: src/main/print-escp2.c:245
 msgid "Enhanced Gloss"
@@ -1889,26 +1880,13 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
-msgstr ""
+msgstr "�刷方�"
 
 #: src/main/print-escp2.c:258
 msgid "Printing direction (unidirectional is higher quality, but slower)"
-msgstr ""
-
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
+msgstr "�刷方� (��性�高画質�������り��)"
 
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
@@ -1919,10 +1897,10 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/main/print-escp2.c:281 src/main/print-escp2.c:282
 msgid "Alignment Passes"
@@ -1935,7 +1913,7 @@ msgstr ""
 #: src/main/print-escp2.c:293 src/main/print-escp2.c:294
 #, fuzzy
 msgid "Ink change command"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+msgstr "�識����コマンド��。\n"
 
 #: src/main/print-escp2.c:299 src/main/print-escp2.c:300
 msgid "Alternate Alignment Passes"
@@ -1944,11 +1922,11 @@ msgstr ""
 #: src/main/print-escp2.c:305 src/main/print-escp2.c:306
 #, fuzzy
 msgid "Alternate Alignment Choices"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+msgstr "間隔補正�設定を繰り返���。\n"
 
 #: src/main/print-escp2.c:311
 msgid "Supports Packet Mode"
-msgstr ""
+msgstr "パケットモード�サ�ート"
 
 #: src/main/print-escp2.c:312
 msgid "Supports D4 Packet Mode"
@@ -1956,21 +1934,21 @@ msgstr ""
 
 #: src/main/print-escp2.c:317
 msgid "Has Interchangeable Ink Cartridges"
-msgstr ""
+msgstr "交��能�インクカートリッジ��り��"
 
 #: src/main/print-escp2.c:318
 msgid "Has multiple choices of ink cartridges"
-msgstr ""
+msgstr "インクカートリッジを複数�択����"
 
 #: src/main/print-escp2.c:329 src/main/print-escp2.c:330
 #, fuzzy
 msgid "Raw Channel Names"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/main/print-escp2.c:335 src/main/print-escp2.c:336
 #, fuzzy
 msgid "Channel Names"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
@@ -1979,52 +1957,51 @@ msgstr ""
 #: src/main/print-escp2.c:353
 #, fuzzy
 msgid "Cyan Map"
-msgstr "¥·¥¢¥ó (C)"
+msgstr "シアン (C)"
 
 #: src/main/print-escp2.c:354
 #, fuzzy
 msgid "Adjust the cyan map"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
 #: src/main/print-escp2.c:359
 #, fuzzy
 msgid "Magenta Map"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr "マゼンタ (M)"
 
 #: src/main/print-escp2.c:360
 #, fuzzy
 msgid "Adjust the magenta map"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�マゼンタ色��ランスを調整���。"
 
 #: src/main/print-escp2.c:365
 #, fuzzy
 msgid "Yellow Map"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-escp2.c:366
 #, fuzzy
 msgid "Adjust the yellow map"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
 #: src/main/print-escp2.c:371
 #, fuzzy
 msgid "Blue Map"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒�白"
 
 #: src/main/print-escp2.c:372
 #, fuzzy
 msgid "Adjust the blue map"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�シアン色��ランスを調整���。"
 
 #: src/main/print-escp2.c:377
-#, fuzzy
 msgid "Orange Map"
-msgstr "¥·¥¢¥ó (C)"
+msgstr ""
 
 #: src/main/print-escp2.c:378
 #, fuzzy
 msgid "Adjust the orange map"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
 #: src/main/print-escp2.c:383
 msgid "Red Map"
@@ -2033,47 +2010,39 @@ msgstr ""
 #: src/main/print-escp2.c:384
 #, fuzzy
 msgid "Adjust the red map"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "�刷時�黄色��ランスを調整���。"
 
 #: src/main/print-escp2.c:486
-#, fuzzy
 msgid "Red Density"
-msgstr "Ç»ÅÙ:"
+msgstr "赤�濃度"
 
 #: src/main/print-escp2.c:487
-#, fuzzy
 msgid "Adjust the red density"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "赤�濃度を調整"
 
 #: src/main/print-escp2.c:494
-#, fuzzy
 msgid "Blue Density"
-msgstr "Ç»ÅÙ:"
+msgstr "��濃度"
 
 #: src/main/print-escp2.c:495
-#, fuzzy
 msgid "Adjust the blue density"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "��濃度を調整"
 
 #: src/main/print-escp2.c:502
-#, fuzzy
 msgid "Orange Density"
-msgstr "Ç»ÅÙ:"
+msgstr "オレンジ�濃度"
 
 #: src/main/print-escp2.c:503
-#, fuzzy
 msgid "Adjust the orange density"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "オレンジ�濃度を調整"
 
 #: src/main/print-escp2.c:510
-#, fuzzy
 msgid "Gloss Level"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢レベル"
 
 #: src/main/print-escp2.c:511
-#, fuzzy
 msgid "Adjust the gloss level"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "光沢レベル�調整"
 
 #: src/main/print-escp2.c:518
 msgid "Drop Size Small"
@@ -2100,29 +2069,26 @@ msgid "Drop Size 3 (large)"
 msgstr ""
 
 #: src/main/print-escp2.c:542 src/main/print-escp2.c:543
-#, fuzzy
 msgid "Light Cyan Value"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "ライトシアン値"
 
 #: src/main/print-escp2.c:558 src/main/print-escp2.c:559
 #, fuzzy
 msgid "Light Cyan Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:566 src/main/print-escp2.c:567
-#, fuzzy
 msgid "Light Magenta Value"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "ライトマゼンタ値"
 
 #: src/main/print-escp2.c:574 src/main/print-escp2.c:575
 #, fuzzy
 msgid "Light Magenta Density Scale"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "明る�マゼンタ"
 
 #: src/main/print-escp2.c:590 src/main/print-escp2.c:591
-#, fuzzy
 msgid "Dark Yellow Value"
-msgstr "²«¿§ (Y)"
+msgstr "濃�黄色�値"
 
 #: src/main/print-escp2.c:598 src/main/print-escp2.c:599
 msgid "Dark Yellow Transition"
@@ -2131,13 +2097,12 @@ msgstr ""
 #: src/main/print-escp2.c:606 src/main/print-escp2.c:607
 #, fuzzy
 msgid "Dark Yellow Density Scale"
-msgstr "²«¿§ (Y)"
+msgstr "黄色 (Y)"
 
 #: src/main/print-escp2.c:614 src/main/print-escp2.c:615
 #: src/main/print-escp2.c:638 src/main/print-escp2.c:639
-#, fuzzy
 msgid "Gray Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレー値"
 
 #: src/main/print-escp2.c:622 src/main/print-escp2.c:623
 #: src/main/print-escp2.c:646 src/main/print-escp2.c:647
@@ -2148,75 +2113,70 @@ msgstr ""
 #: src/main/print-escp2.c:654 src/main/print-escp2.c:655
 #, fuzzy
 msgid "Gray Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレースケール"
 
 #: src/main/print-escp2.c:662 src/main/print-escp2.c:663
 #: src/main/print-escp2.c:734 src/main/print-escp2.c:735
-#, fuzzy
 msgid "Light Gray Value"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "ライトグレー値"
 
 #: src/main/print-escp2.c:670 src/main/print-escp2.c:671
 #: src/main/print-escp2.c:742 src/main/print-escp2.c:743
 #, fuzzy
 msgid "Light Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:678 src/main/print-escp2.c:679
 #: src/main/print-escp2.c:750 src/main/print-escp2.c:751
 #, fuzzy
 msgid "Light Gray Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:686 src/main/print-escp2.c:687
-#, fuzzy
 msgid "Dark Gray Value"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "濃�グレー値"
 
 #: src/main/print-escp2.c:694 src/main/print-escp2.c:695
 #, fuzzy
 msgid "Dark Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:702 src/main/print-escp2.c:703
 #, fuzzy
 msgid "Dark Gray Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:710
-#, fuzzy
 msgid "Mid Gray Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "中間グレー値"
 
 #: src/main/print-escp2.c:711
-#, fuzzy
 msgid "Medium Gray Value"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "中間グレー値"
 
 #: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Mid Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:719
 #, fuzzy
 msgid "Medium Gray Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:726
 #, fuzzy
 msgid "Mid Gray Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:727
 #, fuzzy
 msgid "Medium Gray Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:758
-#, fuzzy
 msgid "Hextone Gray 5 Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:759
 msgid "Hextone Gray 5 (Darkest) Value"
@@ -2225,72 +2185,63 @@ msgstr ""
 #: src/main/print-escp2.c:766
 #, fuzzy
 msgid "Hextone Gray 5 Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:767
 #, fuzzy
 msgid "Hextone Gray 5 (Darkest) Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:774
-#, fuzzy
 msgid "Hextone Gray 5 Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:775
-#, fuzzy
 msgid "Hextone Gray 5 (Darkest) Density Scale"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr ""
 
 #: src/main/print-escp2.c:782 src/main/print-escp2.c:783
-#, fuzzy
 msgid "Hextone Gray 4 Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:790 src/main/print-escp2.c:791
 #, fuzzy
 msgid "Hextone Gray 4 Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:798 src/main/print-escp2.c:799
-#, fuzzy
 msgid "Hextone Gray 4 Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:806 src/main/print-escp2.c:807
-#, fuzzy
 msgid "Hextone Gray 3 Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:814 src/main/print-escp2.c:815
 #, fuzzy
 msgid "Hextone Gray 3 Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:822 src/main/print-escp2.c:823
-#, fuzzy
 msgid "Hextone Gray 3 Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:830 src/main/print-escp2.c:831
-#, fuzzy
 msgid "Hextone Gray 2 Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:838 src/main/print-escp2.c:839
 #, fuzzy
 msgid "Hextone Gray 2 Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:846 src/main/print-escp2.c:847
-#, fuzzy
 msgid "Hextone Gray 2 Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:854
-#, fuzzy
 msgid "Hextone Gray 1 Value"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:855
 msgid "Hextone Gray 1 (Lightest) Value"
@@ -2299,166 +2250,168 @@ msgstr ""
 #: src/main/print-escp2.c:862
 #, fuzzy
 msgid "Hextone Gray 1 Transition"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
 #: src/main/print-escp2.c:863
 #, fuzzy
 msgid "Hextone Gray 1 (Lightest) Transition"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "明る�マゼンタ"
 
 #: src/main/print-escp2.c:870
-#, fuzzy
 msgid "Hextone Gray 1 Density Scale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr ""
 
 #: src/main/print-escp2.c:871
-#, fuzzy
 msgid "Hextone Gray 1 (Lightest) Density Scale"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr ""
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/main/print-escp2.c:943
-#, fuzzy
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "プリンター�用紙�厚�を設定"
 
-#: src/main/print-escp2.c:950
-#, fuzzy
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
-msgstr "Ç»ÅÙ:"
+msgstr ""
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
-#, fuzzy
+#: src/main/print-escp2.c:974
 msgid "Print Method"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+msgstr "�刷方�"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
-#, fuzzy
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
-msgstr "Ä̾ï¤ÎÍÑ»æ"
+msgstr ""
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
-msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+msgstr "プリンター�カラー�刷をサ�ート�����ん\n"
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
-msgstr ""
+msgstr "�刷オプション�確��������刷����ん。\n"
 
 #: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
 msgid "300 DPI x 600 DPI"
@@ -2470,7 +2423,7 @@ msgstr "600 DPI"
 
 #: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
 msgid "600 DPI high quality"
-msgstr "600 DPI ¹âÉʼÁ"
+msgstr "600 DPI 高�質"
 
 #: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
 msgid "600 DPI Unidirectional"
@@ -2482,11 +2435,11 @@ msgstr "1200 DPI"
 
 #: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
 msgid "1200 DPI high quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
 msgid "1200 DPI highest quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
 msgid "1200 DPI  Unidirectional"
@@ -2498,115 +2451,115 @@ msgstr "2400 DPI x 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ"
+msgstr "2400 DPI x 1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI ¹âÉʼÁ"
+msgstr "2400 DPI x 1200 DPI 高�質"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
-msgstr "¥Æ¥¹¥È°õºþ"
+msgstr "テスト�刷"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
@@ -2631,7 +2584,7 @@ msgstr "Five Color Photo Composite"
 #: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2512
 #: src/xml/xmli18n-tmp.h:2546
 msgid "Plain Paper"
-msgstr "Ä̾ï¤ÎÍÑ»æ"
+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
@@ -2654,7 +2607,7 @@ msgstr "Ä̾ï¤ÎÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2516
 #: src/xml/xmli18n-tmp.h:2552
 msgid "Glossy Film"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+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
@@ -2677,7 +2630,7 @@ msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 #: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2461
 #: src/xml/xmli18n-tmp.h:2518 src/xml/xmli18n-tmp.h:2554
 msgid "Transparencies"
-msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
+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
@@ -2700,7 +2653,7 @@ msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2464
 #: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2556
 msgid "Envelopes"
-msgstr "ÉõÅû"
+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
@@ -2723,7 +2676,7 @@ msgstr "ÉõÅû"
 #: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2470
 #: src/xml/xmli18n-tmp.h:2524 src/xml/xmli18n-tmp.h:2560
 msgid "Matte Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+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
@@ -2746,7 +2699,7 @@ msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2476
 #: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2564
 msgid "Inkjet Paper"
-msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
+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
@@ -2769,7 +2722,7 @@ msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2479
 #: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2566
 msgid "Photo Quality Inkjet Paper"
-msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
+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
@@ -2792,7 +2745,7 @@ msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 #: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2482
 #: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2568
 msgid "Photo Paper"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
+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
@@ -2816,7 +2769,7 @@ msgstr "¥Õ¥©¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2485
 #: src/xml/xmli18n-tmp.h:2534 src/xml/xmli18n-tmp.h:2570
 msgid "Premium Glossy Photo Paper"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+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
@@ -2839,7 +2792,7 @@ msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2491
 #: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2574
 msgid "Premium Luster Photo Paper"
-msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
+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
@@ -2862,7 +2815,7 @@ msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2433 src/xml/xmli18n-tmp.h:2500
 #: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2576
 msgid "Photo Quality Glossy Paper"
-msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
+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
@@ -2907,88 +2860,76 @@ msgstr "Ilford Heavy Paper"
 #: src/xml/xmli18n-tmp.h:2445 src/xml/xmli18n-tmp.h:2509
 #: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2582
 msgid "Other"
-msgstr "¤½¤Î¾"
+msgstr "��他"
 
 #: src/main/print-lexmark.c:1113
 msgid "Auto Sheet Feeder"
-msgstr "¼«Æ°µë»æ"
+msgstr "自動給紙"
 
 #: src/main/print-lexmark.c:1114
 msgid "Manual with Pause"
-msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
+msgstr "�ーズ付�手動給紙"
 
 #: src/main/print-lexmark.c:1115
 msgid "Manual without Pause"
-msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
+msgstr "�ーズ��手動給紙"
 
 #: src/main/print-olympus.c:280
 msgid "Coated"
-msgstr ""
+msgstr "コート紙"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢付�フイルム"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
 #. TRANSLATORS: Some dye sublimation printers are able to 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
-msgstr ""
+msgstr "出力レベル調整"
 
-#: src/main/print-olympus.c:1933
-#, fuzzy
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "シアン��ランスを調整"
 
-#: src/main/print-olympus.c:1941
-#, fuzzy
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
-msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "マゼンタ��ランスを調整"
 
-#: src/main/print-olympus.c:1949
-#, fuzzy
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
-msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "黄色��ランスを調整"
 
-#: src/main/print-olympus.c:1956
-#, fuzzy
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
-msgstr "¹õ¤ÈÇò"
+msgstr "黒色��ランス"
 
-#: src/main/print-olympus.c:1957
-#, fuzzy
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
-msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+msgstr "黒色��ランスを調整"
 
 #: src/main/print-pcl.c:184
 msgid "Plain"
-msgstr "Ä̾ï"
+msgstr "通常"
 
 #: src/main/print-pcl.c:185
 msgid "Bond"
@@ -2996,32 +2937,31 @@ msgstr "Bond"
 
 #: src/main/print-pcl.c:186
 msgid "Premium"
-msgstr "¹âµé"
+msgstr "高級"
 
 #: src/main/print-pcl.c:187
 msgid "Glossy Photo"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È"
+msgstr "光沢付�フォト"
 
 #: src/main/print-pcl.c:188
 msgid "Transparency"
-msgstr "¥¹¥é¥¤¥É"
+msgstr "スライド"
 
 #: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
-msgstr "¨´¥¥Õ¥©¥È"
+msgstr "�乾フォト"
 
 #: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
-msgstr "¨´¥¥¹¥é¥¤¥É"
+msgstr "�乾スライド"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
-msgstr "¼êÆ°"
+msgstr "手動"
 
 #: src/main/print-pcl.c:239
-#, fuzzy
 msgid "Manual - Movable Guides"
-msgstr "¼êÆ°"
+msgstr ""
 
 #: src/main/print-pcl.c:241
 msgid "Tray 1 - Movable Guides"
@@ -3029,7 +2969,7 @@ msgstr ""
 
 #: src/main/print-pcl.c:242
 msgid "Tray 1"
-msgstr "¥È¥ì¥¤£±"
+msgstr "トレイ１"
 
 #: src/main/print-pcl.c:243
 msgid "Tray 2 - Movable Guides"
@@ -3037,7 +2977,7 @@ msgstr ""
 
 #: src/main/print-pcl.c:244 src/main/print-pcl.c:252
 msgid "Tray 2"
-msgstr "¥È¥ì¥¤£²"
+msgstr "トレイ２"
 
 #: src/main/print-pcl.c:245
 msgid "Tray 3 - Movable Guides"
@@ -3045,7 +2985,7 @@ msgstr ""
 
 #: src/main/print-pcl.c:246
 msgid "Tray 3"
-msgstr "¥È¥ì¥¤£³"
+msgstr "トレイ３"
 
 #: src/main/print-pcl.c:247
 msgid "Tray 4 - Movable Guides"
@@ -3053,27 +2993,27 @@ msgstr ""
 
 #: src/main/print-pcl.c:248
 msgid "Tray 4"
-msgstr "¥È¥ì¥¤£´"
+msgstr "トレイ４"
 
 #: src/main/print-pcl.c:249
 msgid "Portable Sheet Feeder"
-msgstr "·ÈÂÓ¼°µë»æ"
+msgstr "�帯�給紙"
 
 #: src/main/print-pcl.c:250
 msgid "Desktop Sheet Feeder"
-msgstr "¥Ç¥¹¥¯¥È¥Ã¥×µë»æ"
+msgstr "デスクトップ給紙"
 
 #: src/main/print-pcl.c:251
 msgid "Tray"
-msgstr "¥È¥ì¥¤"
+msgstr "トレイ"
 
 #: src/main/print-pcl.c:253
 msgid "Optional Source"
-msgstr "¥ª¥×¥·¥ç¥ó"
+msgstr "オプション"
 
 #: src/main/print-pcl.c:254
 msgid "Autoselect"
-msgstr "¼«Æ°ÁªÂò"
+msgstr "自動�択"
 
 #: src/main/print-pcl.c:268
 msgid "150x150 DPI"
@@ -3089,7 +3029,7 @@ msgstr "600x300 DPI"
 
 #: src/main/print-pcl.c:271
 msgid "600x600 DPI monochrome"
-msgstr "600x600 DPI ¥â¥Î¥¯¥í"
+msgstr "600x600 DPI モノクロ"
 
 #: src/main/print-pcl.c:272
 msgid "600x600 DPI"
@@ -3104,50 +3044,42 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
-msgstr "¹â¤µ:"
-
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "¼Ì¿¿"
+msgstr "高�:"
 
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
-msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
+msgstr "カラー + 黒カートリッジ"
 
 #: src/main/print-pcl.c:1672
 msgid "Color + Photo Cartridges"
-msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
+msgstr "カラー + フォト・カートリッジ"
 
 #: src/main/print-ps.c:68
 #, fuzzy
 msgid "PPDFile"
-msgstr "PPD ¥Õ¥¡¥¤¥ë:"
+msgstr "PPD ファイル:"
 
 #: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
 #, fuzzy
 msgid "PPD File"
-msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
+msgstr "PPD ファイル���？"
 
 #: src/main/print-ps.c:80
 #, fuzzy
 msgid "Model Name"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/main/print-ps.c:81
 msgid "PPD File Model Name"
@@ -3157,106 +3089,107 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
-msgstr "¥ì¥¿¡¼"
+msgstr "レター"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
-msgstr "A4ÈÇ"
+msgstr "A4版"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
-msgstr "¥«¥¹¥¿¥à"
+msgstr "カスタム"
 
 #: src/main/print-raw.c:225
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
-msgstr ""
+msgstr "致命的�エラー���"
 
 #: src/main/print-weave.c:1528
 msgid ""
 "Please report the above information to gimp-print-devel@lists.sourceforge.net"
-msgstr ""
+msgstr "上記�情報を gimp-print-devel@lists.sourceforge.net �報告������"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
-msgstr ""
+msgstr "高速エコノミー"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
-msgstr ""
+msgstr "エコノミー"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
-#, fuzzy
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
-msgstr "Stylus Photo"
+msgstr "スーパーフォト"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
-#, fuzzy
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
-msgstr "Six Color Photo"
+msgstr "ウルトラフォト"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
-msgstr ""
+msgstr "最良"
 
 #: src/main/generic-options.c:46
 msgid "Text"
-msgstr ""
+msgstr "テキスト"
 
 #: src/main/generic-options.c:47
 msgid "Graphics"
-msgstr ""
+msgstr "画�"
 
 #: src/main/generic-options.c:48
 msgid "Mixed Text and Graphics"
-msgstr ""
+msgstr "テキスト�グラフィック�混在"
 
 #: src/main/generic-options.c:49
 #, fuzzy
 msgid "Photograph"
-msgstr "¼Ì¿¿"
+msgstr "写真"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "¥é¥¤¥ó¡¦¥¢¡¼¥È"
+msgstr "ライン・アート"
 
 #: src/main/generic-options.c:55
 #, fuzzy
 msgid "Page"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/main/generic-options.c:56
 msgid "Job"
-msgstr ""
+msgstr "ジョブ"
 
 #: src/main/generic-options.c:68
 #, fuzzy
 msgid "Image Type"
-msgstr "²èÁü¤Î¼ïÎà:"
+msgstr "画��種類:"
 
 #: src/main/generic-options.c:69
 #, fuzzy
 msgid "Type of image being printed"
-msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
+msgstr "�刷時�インク�種類��。"
 
 #: src/main/generic-options.c:74
 msgid "Job Mode"
-msgstr ""
+msgstr "ジョブモード"
 
 #: src/main/generic-options.c:75
 msgid "Job vs. page mode"
@@ -3265,21 +3198,21 @@ msgstr ""
 #: src/main/generic-options.c:80
 #, fuzzy
 msgid "Page Number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/main/generic-options.c:81
 #, fuzzy
 msgid "Page number"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/gutenprintui2/curve.c:130
 #, fuzzy
 msgid "Curve type"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
 #: src/gutenprintui2/curve.c:131
 msgid "Is this curve linear, spline interpolated, or free-form"
-msgstr ""
+msgstr "曲線��補間スプライン曲線��フリー形�����を指定"
 
 #: src/gutenprintui2/curve.c:139
 msgid "Minimum X"
@@ -3316,37 +3249,37 @@ msgstr ""
 #: src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
-msgstr "¥¬¥ó¥Þ:"
+msgstr "ガンマ:"
 
 #: src/gutenprintui2/gammacurve.c:418
 msgid "_Gamma value"
-msgstr ""
+msgstr "ガンマ曲線(_G)"
 
 #: src/gutenprintui2/panel.c:276
 msgid "Inch"
-msgstr "¥¤¥ó¥Á"
+msgstr "イン�"
 
 #: src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to inches"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
 #: src/gutenprintui2/panel.c:278
 msgid "cm"
-msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë"
+msgstr "セン�メートル"
 
 #: src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to centimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をセン�メートル����。"
 
 #: src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Points"
-msgstr "°õºþ"
+msgstr "�刷"
 
 #: src/gutenprintui2/panel.c:280
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
 #: src/gutenprintui2/panel.c:282
 msgid "mm"
@@ -3355,7 +3288,7 @@ msgstr ""
 #: src/gutenprintui2/panel.c:282
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
-msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をセン�メートル����。"
 
 #: src/gutenprintui2/panel.c:284
 msgid "Pica"
@@ -3364,56 +3297,54 @@ msgstr ""
 #: src/gutenprintui2/panel.c:284
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
-msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
+msgstr "基本��をイン�����。"
 
 #: src/gutenprintui2/panel.c:291
 msgid "Color output"
-msgstr "¥«¥é¡¼¤Ç°õºþ¤·¤Þ¤¹¡£"
+msgstr "カラー��刷���。"
 
 #: src/gutenprintui2/panel.c:293
 msgid "Print in shades of gray using black ink"
-msgstr "¹õ¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¤Î±Æ¤òÉÕ¤±¤Æ°õºþ¤·¤Þ¤¹¡£"
+msgstr "黒インクを使��グレー�影を付���刷���。"
 
 #: src/gutenprintui2/panel.c:305
-#, fuzzy
 msgid "Standard Command"
-msgstr "ɸ½à"
+msgstr "標準コマンド"
 
 #: src/gutenprintui2/panel.c:305
 msgid "Use standard print command"
-msgstr ""
+msgstr "標準�刷コマンドを使用"
 
 #: src/gutenprintui2/panel.c:306
 #, fuzzy
 msgid "Custom Command"
-msgstr "¥³¥Þ¥ó¥É:"
+msgstr "コマンド:"
 
 #: src/gutenprintui2/panel.c:306
 msgid "Use custom print command"
-msgstr ""
+msgstr "カスタム�刷コマンドを使用"
 
 #: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
 #: src/gutenprintui2/plist.c:793
 msgid "File"
-msgstr "¥Õ¥¡¥¤¥ë"
+msgstr "ファイル"
 
 #: src/gutenprintui2/panel.c:307
-#, fuzzy
 msgid "Print to a file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgstr "ファイル�出力"
 
 #: src/gutenprintui2/panel.c:523
 msgid "Edit Curve..."
-msgstr ""
+msgstr "曲線を編集..."
 
 #: src/gutenprintui2/panel.c:534
 #, fuzzy
 msgid "Set Default"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "�期値�戻�"
 
 #: src/gutenprintui2/panel.c:536
 msgid "Restore Previous"
-msgstr ""
+msgstr "��戻�"
 
 #: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
 #: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
@@ -3423,12 +3354,11 @@ msgstr "OK"
 #: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
 #: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
 msgid "Cancel"
-msgstr "¼è¤ê¾Ã¤·"
+msgstr "�り消�"
 
 #: src/gutenprintui2/panel.c:642
-#, fuzzy
 msgid "Select File..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+msgstr ""
 
 #: src/gutenprintui2/panel.c:1028
 msgid "Reset"
@@ -3437,35 +3367,35 @@ msgstr ""
 #: src/gutenprintui2/panel.c:1383
 #, c-format
 msgid "%s -- Print v%s"
-msgstr "%s -- °õºþ v%s"
+msgstr "%s -- �刷 v%s"
 
 #: src/gutenprintui2/panel.c:1392
 msgid "About"
-msgstr "¾ðÊó"
+msgstr "情報"
 
 #: src/gutenprintui2/panel.c:1394
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
-"°õºþ¤È\n"
-"ÀßÄê¤ÎÊݸ"
+"�刷�\n"
+"設定��存"
 
 #: src/gutenprintui2/panel.c:1396
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
-"ÀßÄê¤Î\n"
-"Êݸ"
+"設定�\n"
+"�存"
 
 #: src/gutenprintui2/panel.c:1398
 msgid "Print"
-msgstr "°õºþ"
+msgstr "�刷"
 
 #: src/gutenprintui2/panel.c:1450
 msgid "Preview"
-msgstr "¥×¥ì¥Ó¥å¡¼"
+msgstr "プレビュー"
 
 #: src/gutenprintui2/panel.c:1475
 msgid ""
@@ -3480,49 +3410,49 @@ msgid ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 msgstr ""
-"°õºþ»þ¤Î²èÁü¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Îº¸¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤·¤¿¾ì½ê¤Ë²èÁü¤¬ÇÛÃÖ¤µ¤ì¤Þ¤¹¡£\n"
-"¥Þ¥¦¥¹¤Î±¦¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢ºÙ¤«¤¤¥ì¥Ù¥ë¤Ç²èÁü¤ò°ÜÆ°¤·¤Þ¤¹; Ìó 1/72 ¥¤"
-"¥ó¥Áñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥Þ¥¦¥¹¤ÎÃæ¥Ü¥¿¥ó¤Ç¥É¥é¥Ã¥°¤¹¤ë¤È¡¢²èÁü¤ÎÂ礭¤µ¤Îñ°Ì¤Ç°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç"
-"¤¹¡£\n"
-"[SHIFT] ¥­¡¼¤ò²¡¤·¤Ê¤¬¤é¥Þ¥¦¥¹¤ò¥É¥é¥Ã¥°¤¹¤ë¤È¡¢¿åÊ¿¤Þ¤¿¤Ï¿âľÊý¸þ¤Ë¤Î¤ß²èÁü"
-"¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
-"¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
+"�刷時�画���置を設定���。\n"
+"マウス�左ボタン�ドラッグ��場所�画���置�れ��。\n"
+"マウス��ボタン�ドラッグ�る��細��レベル�画�を移動���; 約 1/72 イ"
+"ン����移動�る����能��。\n"
+"マウス�中ボタン�ドラッグ�る��画��大������移動�る����能�"
+"�。\n"
+"[SHIFT] キーを押���らマウスをドラッグ�る��水平���垂直方����画�"
+"を移動�る����能��。\n"
+"ドラッグ中�別�ボタンをクリック�る��画��元�場所�戻り��。"
 
 #: src/gutenprintui2/panel.c:1522
 #, fuzzy
 msgid "Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/gutenprintui2/panel.c:1545
 msgid "Show All Paper Sizes"
-msgstr ""
+msgstr "����用紙サイズを見る"
 
 #: src/gutenprintui2/panel.c:1561
 msgid "Dimensions:"
-msgstr "À£Ë¡:"
+msgstr "寸法:"
 
 #: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
 msgid "Width:"
-msgstr "Éý:"
+msgstr "å¹…:"
 
 #: src/gutenprintui2/panel.c:1567
 msgid "Width of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
+msgstr "�刷�る用紙�幅��。"
 
 #: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
 msgid "Height:"
-msgstr "¹â¤µ:"
+msgstr "高�:"
 
 #: src/gutenprintui2/panel.c:1572
 msgid "Height of the paper that you wish to print to"
-msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£"
+msgstr "�刷�る用紙�高���。"
 
 #: src/gutenprintui2/panel.c:1577
 #, fuzzy
 msgid "Automatic Paper Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/gutenprintui2/panel.c:1594
 msgid "Number of Copies"
@@ -3530,166 +3460,162 @@ msgstr ""
 
 #: src/gutenprintui2/panel.c:1606
 msgid "Select the number of copies to print; a value between 1 and 100"
-msgstr ""
+msgstr "�刷�部数を�択������。値�1～100�間��。"
 
 #: src/gutenprintui2/panel.c:1638
 #, fuzzy
 msgid "Image Position"
-msgstr "°ÌÃÖ"
+msgstr "�置"
 
 #: src/gutenprintui2/panel.c:1655
 msgid "Auto"
-msgstr "¼«Æ°"
+msgstr "自動"
 
 #: src/gutenprintui2/panel.c:1657
 msgid "Portrait"
-msgstr "½ÄÃÖ¤­"
+msgstr "縦��"
 
 #: src/gutenprintui2/panel.c:1659
 msgid "Landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "横��"
 
 #: src/gutenprintui2/panel.c:1661
 msgid "Upside down"
-msgstr "¾å²¼"
+msgstr "上下"
 
 #: src/gutenprintui2/panel.c:1663
 msgid "Seascape"
-msgstr "²£Ä¹"
+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 "ÍÑ»æ¤Î¸þ¤­:"
+msgstr "用紙���:"
 
 #: src/gutenprintui2/panel.c:1680
 msgid "Left:"
-msgstr "º¸Â¦:"
+msgstr "左�:"
 
 #: src/gutenprintui2/panel.c:1681
 msgid "Distance from the left of the paper to the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�左端�ら画�����離��。"
 
 #: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
 msgid "Right:"
-msgstr "±¦Â¦:"
+msgstr "��:"
 
 #: src/gutenprintui2/panel.c:1685
 msgid "Distance from the left of the paper to the right of the image"
-msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�左端�ら画���端����離��。"
 
 #: src/gutenprintui2/panel.c:1689
 msgid "Distance from the right of the paper to the image"
-msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙��端�ら画�����離��。"
 
 #: src/gutenprintui2/panel.c:1691
 msgid "Top:"
-msgstr "¾å¦:"
+msgstr "上�:"
 
 #: src/gutenprintui2/panel.c:1692
 msgid "Distance from the top of the paper to the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�上端�ら画�����離��。"
 
 #: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
 msgid "Bottom:"
-msgstr "²¼Â¦:"
+msgstr "下�:"
 
 #: src/gutenprintui2/panel.c:1696
-#, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
-msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�上端�ら画��下端����離��。"
 
 #: src/gutenprintui2/panel.c:1700
 msgid "Distance from the bottom of the paper to the image"
-msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
+msgstr "用紙�下端�ら画�����離��。"
 
 #: src/gutenprintui2/panel.c:1710
 msgid "Center:"
-msgstr "Ãæ¿´:"
+msgstr "中心:"
 
 #: src/gutenprintui2/panel.c:1713
 #, fuzzy
 msgid "Horizontal"
-msgstr "¿åÊ¿"
+msgstr "æ°´å¹³"
 
 #: src/gutenprintui2/panel.c:1714
 msgid "Center the image horizontally on the paper"
-msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�水平方��中心����。"
 
 #: src/gutenprintui2/panel.c:1717
 msgid "Center the image on the paper"
-msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�中心����。"
 
 #: src/gutenprintui2/panel.c:1719
 #, fuzzy
 msgid "Vertical"
-msgstr "¿âľ"
+msgstr "åž‚ç›´"
 
 #: src/gutenprintui2/panel.c:1720
 msgid "Center the image vertically on the paper"
-msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
+msgstr "用紙�垂直方��中心����。"
 
 #: src/gutenprintui2/panel.c:1733
 msgid "Setup Printer"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr "プリンター��択"
 
 #: src/gutenprintui2/panel.c:1757
 #, fuzzy
 msgid "Printer Make:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンター�:"
 
 #: src/gutenprintui2/panel.c:1768
 #, fuzzy
 msgid "Select the make of your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンターを�択���。"
 
 #: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
 #: src/gutenprintui2/panel.c:2092
 msgid "Printer Model:"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
+msgstr "プリンター�型�:"
 
 #: src/gutenprintui2/panel.c:1797
 msgid "Select your printer model"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンターを�択���。"
 
 #: src/gutenprintui2/panel.c:1845
 msgid "PPD File:"
-msgstr "PPD ¥Õ¥¡¥¤¥ë:"
+msgstr "PPD ファイル:"
 
 #: src/gutenprintui2/panel.c:1861
 msgid "Enter the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+msgstr "�使��プリンター用� PPD ファイル�を入力���。"
 
 #: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
 msgid "Browse"
-msgstr "»²¾È"
+msgstr "�照"
 
 #: src/gutenprintui2/panel.c:1870
 msgid "Choose the correct PPD filename for your printer"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンター用� PPD ファイルを�択���。"
 
 #: src/gutenprintui2/panel.c:1912
-#, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr ""
 
 #: src/gutenprintui2/panel.c:1914
-#, fuzzy
 msgid "Printer Queue:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンターキュー:"
 
 #: src/gutenprintui2/panel.c:1930
-#, fuzzy
 msgid "Enter the correct command to print to your printer. "
-msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
+msgstr ""
 
 #: src/gutenprintui2/panel.c:1941
 msgid "Enter the file to print to. "
@@ -3698,88 +3624,86 @@ msgstr ""
 #: src/gutenprintui2/panel.c:1949
 #, fuzzy
 msgid "File to print to"
-msgstr "¥Æ¥¹¥È°õºþ"
+msgstr "テスト�刷"
 
 #: src/gutenprintui2/panel.c:1957
 #, fuzzy
 msgid "Print To File"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgstr "ファイル��刷����？"
 
 #: src/gutenprintui2/panel.c:1987
 msgid "Define New Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr "新��プリンター�定義"
 
 #: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
 msgid "Printer Name:"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンター�:"
 
 #: src/gutenprintui2/panel.c:2009
 msgid "Enter the name you wish to give this logical printer"
-msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£"
+msgstr "利用�る論�プリンター�を指定���。"
 
 #: src/gutenprintui2/panel.c:2019
-#, fuzzy
 msgid "About Gutenprint "
-msgstr "Gimp-Print"
+msgstr "Gutenprint���� "
 
 #: src/gutenprintui2/panel.c:2026
 #, fuzzy
 msgid "Gutenprint Version "
-msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
+msgstr "Gimp-Print �ージョン "
 
 #: src/gutenprintui2/panel.c:2074
 msgid "Printer Settings"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+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 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�使��プリンター (プリンター�型����り��ん) �を�択���。"
 
 #: src/gutenprintui2/panel.c:2104
 msgid "Setup Printer..."
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
+msgstr "プリンター��択..."
 
 #: src/gutenprintui2/panel.c:2106
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "プリンター�型�� PPD ファイル��刷コマンドを�択���。"
 
 #: src/gutenprintui2/panel.c:2119
 msgid "New Printer..."
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
+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
-#, fuzzy
 msgid "Set Printer Option Defaults"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "プリンターオプションをデフォルト�設定"
 
 #: src/gutenprintui2/panel.c:2151
 msgid "Set all printer options to their defaults"
-msgstr ""
+msgstr "����プリンターオプションをデフォルト�設定"
 
 #: src/gutenprintui2/panel.c:2174
 #, fuzzy
 msgid "Image Size"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr "画��サイズ"
 
 #: src/gutenprintui2/panel.c:2199
 msgid "Scaling:"
-msgstr "³ÈÂç½Ì¾®:"
+msgstr "拡大縮�:"
 
 #: src/gutenprintui2/panel.c:2203
 msgid "Set the scale (size) of the image"
-msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
+msgstr "画�サイズ�拡大縮�を行���。"
 
 #: src/gutenprintui2/panel.c:2225
 msgid "Scale by:"
@@ -3790,16 +3714,16 @@ 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 "ÈæΨ"
+msgstr "比率"
 
 #: src/gutenprintui2/panel.c:2238
 msgid "Scale the print to the size of the page"
-msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+msgstr "用紙サイズを 100 ���場��比率��。"
 
 #: src/gutenprintui2/panel.c:2242
 msgid "PPI"
@@ -3807,43 +3731,43 @@ msgstr "PPI"
 
 #: src/gutenprintui2/panel.c:2247
 msgid "Scale the print to the number of dots per inch"
-msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
+msgstr "画��ドット数/イン���。"
 
 #: src/gutenprintui2/panel.c:2265
 msgid "Set the width of the print"
-msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�幅をセット���。"
 
 #: src/gutenprintui2/panel.c:2267
 msgid "Set the height of the print"
-msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+msgstr "�刷時�高�をセット���。"
 
 #: src/gutenprintui2/panel.c:2273
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
-"¥ª¥ê¥¸¥Ê¥ë¤Î\n"
-"¥µ¥¤¥º¤ÎÍøÍÑ"
+"オリジナル�\n"
+"サイズ�利用"
 
 #: src/gutenprintui2/panel.c:2279
 msgid "Set the print size to the size of the image"
-msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
+msgstr "画��オリジナル・サイズを�刷サイズ����。"
 
 #: src/gutenprintui2/panel.c:2303
 msgid "Print Color Adjust"
-msgstr "°õºþ¥«¥é¡¼Ä´À°"
+msgstr "�刷カラー調整"
 
 #: src/gutenprintui2/panel.c:2306
 msgid "Set Defaults"
-msgstr "½é´üÃͤËÌ᤹"
+msgstr "�期値�戻�"
 
 #: src/gutenprintui2/panel.c:2308
 msgid "Close"
-msgstr "ÊĤ¸¤ë"
+msgstr "閉�る"
 
 #: src/gutenprintui2/panel.c:2337
 msgid "Image preview"
-msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
+msgstr "画��プレビュー"
 
 #: src/gutenprintui2/panel.c:2351
 msgid "View Output Channels:"
@@ -3852,206 +3776,196 @@ msgstr ""
 #: src/gutenprintui2/panel.c:2442
 #, fuzzy
 msgid "Output"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/gutenprintui2/panel.c:2470
 msgid "Output Type:"
-msgstr "½ÐÎϤμïÎà:"
+msgstr "出力�種類:"
 
 #: src/gutenprintui2/panel.c:2474
 msgid "Select the desired output type"
-msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "出力�る形態を�択���。"
 
 #: src/gutenprintui2/panel.c:2495
 msgid "Adjust Output..."
-msgstr "½ÐÎϤÎÄ´À°..."
+msgstr "出力�調整..."
 
 #: src/gutenprintui2/panel.c:2504
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
+"カラー�ランス�明る��コントラスト�彩度�ディザリング方�を調整���。"
 
 #: src/gutenprintui2/panel.c:2523
 #, fuzzy
 msgid "Size Units:"
-msgstr "ñ°Ì:"
+msgstr "��:"
 
 #: src/gutenprintui2/panel.c:2526
-#, fuzzy
 msgid " "
-msgstr "> "
+msgstr ""
 
 #: src/gutenprintui2/panel.c:2550
 msgid "Units:"
-msgstr "ñ°Ì:"
+msgstr "��:"
 
 #: src/gutenprintui2/panel.c:2555
 msgid "Select the base unit of measurement for printing"
-msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
+msgstr "�刷時�基本��を�択���。"
 
 #: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
 msgid "System V lp"
-msgstr ""
+msgstr "System V lp"
 
 #: src/gutenprintui2/plist.c:98
 msgid "CUPS"
-msgstr ""
+msgstr "CUPS"
 
 #: src/gutenprintui2/plist.c:104
 msgid "Berkeley lpd (/etc/lpc)"
-msgstr ""
+msgstr "�ークレー lpd (/etc/lpc)"
 
 #: src/gutenprintui2/plist.c:107
 msgid "Berkeley lpd (/usr/bsd/lpc)"
-msgstr ""
+msgstr "�ークレー lpd (/usr/bsd/lpc)"
 
 #: src/gutenprintui2/plist.c:110
 msgid "Berkeley lpd (/usr/etc/lpc"
-msgstr ""
+msgstr "�ークレー lpd (/usr/etc/lpc"
 
 #: src/gutenprintui2/plist.c:113
 msgid "Berkeley lpd (/usr/libexec/lpc)"
-msgstr ""
+msgstr "�ークレー lpd (/usr/libexec/lpc)"
 
 #: src/gutenprintui2/plist.c:116
 msgid "Berkeley lpd (/usr/sbin/lpc)"
-msgstr ""
+msgstr "�ークレー lpd (/usr/sbin/lpc)"
 
 #: src/gutenprintui2/plist.c:1060
-#, fuzzy
 msgid "Printer"
-msgstr "°õºþ"
+msgstr ""
 
 #: src/gutenprintui2/plist.c:1253
-#, fuzzy
 msgid "(Default Printer)"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr "(デフォルト�プリンター)"
 
-#: src/cups/genppd.c:152
-#, fuzzy
+#: src/cups/genppd.c:154
 msgid "Printer Features"
-msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
+msgstr ""
 
-#: src/cups/genppd.c:153
-#, fuzzy
+#: src/cups/genppd.c:155
 msgid "Output Control"
-msgstr "½ÐÎϤμïÎà:"
+msgstr ""
 
-#: src/cups/genppd.c:158
-#, fuzzy
+#: src/cups/genppd.c:160
 msgid "Common"
-msgstr "¥³¥Þ¥ó¥É:"
+msgstr ""
 
-#: src/cups/genppd.c:159
-#, fuzzy
+#: src/cups/genppd.c:161
 msgid "Extra 1"
-msgstr "¥È¥ì¥¤£±"
+msgstr ""
 
-#: src/cups/genppd.c:160
-#, fuzzy
+#: src/cups/genppd.c:162
 msgid "Extra 2"
-msgstr "¥È¥ì¥¤£²"
+msgstr ""
 
-#: src/cups/genppd.c:161
-#, fuzzy
+#: src/cups/genppd.c:163
 msgid "Extra 3"
-msgstr "¥È¥ì¥¤£³"
+msgstr ""
 
-#: src/cups/genppd.c:162
-#, fuzzy
+#: src/cups/genppd.c:164
 msgid "Extra 4"
-msgstr "¥È¥ì¥¤£´"
+msgstr ""
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Japanese"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
-msgstr "Íѻ極¥¤¥º:"
+msgstr "用紙サイズ:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
-msgstr "¥«¥é¡¼"
+msgstr "カラー"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
-msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+msgstr "グレースケール"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
-msgstr "¥«¥é¡¼"
+msgstr "カラー"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
-msgstr "CMY ¿§"
+msgstr "CMY 色"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
-msgstr ""
+msgstr "��"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
-msgstr ""
+msgstr "���"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
-msgstr ""
+msgstr "微調整"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
-msgstr ""
+msgstr "必��場��枠���よ�ページを縮��る"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
-msgstr ""
+msgstr "縮� (����ページを�刷)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
-msgstr ""
+msgstr "切り出�(大��を��)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
-msgstr ""
+msgstr "拡大(ページ領域を最大��利用)"
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
-msgstr "Escputil ¥Ð¡¼¥¸¥ç¥ó "
+msgstr "Escputil �ージョン "
 
 #: src/escputil/escputil.c:76
 #, fuzzy
@@ -4072,20 +3986,21 @@ msgid ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
-"Copyright 2000 Robert Krawitz (rlk@alum.mit.edu)\n"
+"Copyright 2000-2006 Robert Krawitz (rlk@alum.mit.edu)\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
-"GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ¤¬\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"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
-"´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
-"¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\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"
-"µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
-"¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
-"Free Software Foundation, Inc., 56 Temple Place - \n"
-"Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 #: src/escputil/escputil.c:119
 #, fuzzy
@@ -4133,48 +4048,48 @@ msgid ""
 "    -C|--choices       Specify the number of pattern choices for alignment\n"
 "    -p|--patterns      Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n"
-"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n"
-"ÍÑÎã: escputil --clean-head --printer stpex-on-third-floor\n"
+"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P プリンタ | -r デ�イス�] [-u] [-q] [-m 型�]\n"
+"EPSON Stylus (R) プリンタ�管�を行�ツール��。\n"
+"用例: escputil --clean-head --printer stpex-on-third-floor\n"
 "          escputil --ink-level --new --raw-device /dev/lp0\n"
 "\n"
-"  ¥³¥Þ¥ó¥É:\n"
-"    -c|--clean-head    ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n"
-"    -n|--nozzle-check  ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n"
-"                       ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ"
-"¤ì¤Þ¤¹¡£\n"
-"                       ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n"
-"    -a|--align-head    ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n"
-"                      ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"                       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê"
-"¤ê¤Þ¤¹¡£\n"
-"    -o|--align-color   ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È "
-"580 ¤Î¤ß)¡£\n"
-"                      ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"                       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê"
-"¤ê¤Þ¤¹¡£\n"
-"    -s|--status        ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n"
-"    -i|--ink-level     ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n"
-"                       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"                       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -d|--identify      ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n"
-"                       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"                       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -l|--license       ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n"
-"    -M|--list-models   ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n"
-"    -h|--help          ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n"
-"  ¥ª¥×¥·¥ç¥ó:\n"
-"    -P|--printer-name  ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄê"
-"¤¹¤ë¡£\n"
-"                       ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n"
-"    -r|--raw-device    ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò"
-"»ØÄꤹ¤ë¡£\n"
-"    -u|--new           ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿"
-"¤Ï¤½¤ì°Ê¹ß)¡£\n"
-"    -q|--quiet         ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n"
-"    -m|--model         ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄê"
-"¤¹¤ë¡£\n"
+"  コマンド:\n"
+"    -c|--clean-head    プリンタ�ヘッドを清掃�る。\n"
+"    -n|--nozzle-check  ノズル�テストパターンを�刷�る。\n"
+"                       ノズル�汚���り�詰����る�パターン���表示�"
+"れ��。\n"
+"                       ���刷�れ�ら�プリンタ�ヘッドを清掃��下��。\n"
+"    -a|--align-head    プリンタ�ヘッドを一列�並�る。\n"
+"                      �警告】: ��コマンドを乱用�る��\n"
+"                       �刷��質�低下�る���る��プリンタ故障�原因��"
+"り��。\n"
+"    -o|--align-color   カラー�刷�ヘッドを一列�並�る (Stylus Color 480 � "
+"580 ��)。\n"
+"                      �警告】: ��コマンドを乱用�る��\n"
+"                       �刷��質�低下�る���る��プリンタ故障�原因��"
+"り��。\n"
+"    -s|--status        プリンタ�状態を�得�る。\n"
+"    -i|--ink-level     インク�レベルをプリンタ�ら�得�る。\n"
+"                       �れ�プリンタ�低レベル・デ�イス��\n"
+"                       アクセス権 (読�書�) �必���。\n"
+"    -d|--identify      プリンタ情報 (型���) を�����る。\n"
+"                       �れ�プリンタ�低レベル・デ�イス��\n"
+"                       アクセス権 (読�書�) �必���。\n"
+"    -l|--license       ��プログラム�ライセンス/注�書�を表示�る。\n"
+"    -M|--list-models   利用�能�プリンタ�型�を一覧表示�る。\n"
+"    -h|--help          ��メッセージを表示�る。\n"
+"  オプション:\n"
+"    -P|--printer-name  プリンタを�作�る����プリンタ・キュー���を指定"
+"�る。\n"
+"                       �期値��デフォルト�システム・プリンタ���。\n"
+"    -r|--raw-device    プリンタ・キュー経由�����直接書�込むデ�イス�を"
+"指定�る。\n"
+"    -u|--new           新��プリンタ�場��指定�る (Stylus Color 740 ��"
+"��れ以�)。\n"
+"    -q|--quiet         �ナーを表示���。\n"
+"    -m|--model         ヘッドを一列�並�る����正確�プリンタ�型�を指定"
+"�る。\n"
 
 #: src/escputil/escputil.c:162
 #, fuzzy
@@ -4220,51 +4135,51 @@ msgid ""
 "    -C Specify the number of pattern choices for alignment\n"
 "    -p Specify the number of sets of patterns for alignment\n"
 msgstr ""
-"ÍÑË¡: escputil [¥ª¥×¥·¥ç¥ó] [¥³¥Þ¥ó¥É]\n"
-"ÍÑË¡: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
-"                [-P ¥×¥ê¥ó¥¿ | -r ¥Ç¥Ð¥¤¥¹Ì¾] [-u] [-q] [-m ·¿¼°]\n"
-"EPSON Stylus (R) ¥×¥ê¥ó¥¿¤Î´ÉÍý¤ò¹Ô¤¦¥Ä¡¼¥ë¤Ç¤¹¡£\n"
-"ÍÑÎã: escputil -c -P stpex-on-third-floor\n"
+"用法: escputil [オプション] [コマンド]\n"
+"用法: escputil [-c | -n | -a | -i | -o | -s | -d | -l | -M]\n"
+"                [-P プリンタ | -r デ�イス�] [-u] [-q] [-m 型�]\n"
+"EPSON Stylus (R) プリンタ�管�を行�ツール��。\n"
+"用例: escputil -c -P stpex-on-third-floor\n"
 "          escputil -i -u -r /dev/lp0\n"
 "\n"
-"  ¥³¥Þ¥ó¥É:\n"
-"    -c ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ¹¤ë¡£\n"
-"    -n ¥Î¥º¥ë¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤¹¤ë¡£\n"
-"       ¥Î¥º¥ë¤¬±ø¤«¤Ã¤¿¤ê¡¢µÍ¤Þ¤Ã¤Æ¤¤¤ë¤È¥Ñ¥¿¡¼¥ó¤Ë¹Â¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n"
-"       ¹Â¤¬°õºþ¤µ¤ì¤¿¤é¡¢¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤òÀ¶Áݤ·¤Æ²¼¤µ¤¤¡£\n"
-"    -a ¥×¥ê¥ó¥¿¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤롣\n"
-"       ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"       °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹\n"
-"    -o ¥«¥é¡¼°õºþ¤Î¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤ë (Stylus Color 480 ¤È 580 ¤Î¤ß)¡£\n"
-"       ¡Ú·Ù¹ð¡Û: ¤³¤Î¥³¥Þ¥ó¥É¤òÍðÍѤ¹¤ë¤È¡¢\n"
-"        °õºþ¤ÎÉʼÁ¤¬Äã²¼¤¹¤ë¤«¡¢¤¢¤ë¤¤¤Ï¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"    -s ¥×¥ê¥ó¥¿¤Î¾õÂÖ¤ò¼èÆÀ¤¹¤ë¡£\n"
-"    -i ¥¤¥ó¥¯¤Î¥ì¥Ù¥ë¤ò¥×¥ê¥ó¥¿¤«¤é¼èÆÀ¤¹¤ë¡£\n"
-"       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפÇ"
-"¤¹¡£\n"
-"    -d ¥×¥ê¥ó¥¿¾ðÊó (·¿¼°¤Ê¤É) ¤òÌ䤤¹ç¤ï¤»¤ë¡£\n"
-"       ¤³¤ì¤Ï¥×¥ê¥ó¥¿¤ÎÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤Ø¤Î\n"
-"       ¥¢¥¯¥»¥¹¸¢ (Æɤ߽ñ¤­) ¤¬É¬ÍפǤ¹¡£\n"
-"    -l ¤³¤Î¥×¥í¥°¥é¥à¤Î¥é¥¤¥»¥ó¥¹/Ãí°Õ½ñ¤­¤òɽ¼¨¤¹¤ë¡£\n"
-"    -M ÍøÍѲÄǽ¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ìÍ÷ɽ¼¨¤¹¤ë¡£\n"
-"    -h ¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë¡£\n"
-"  ¥ª¥×¥·¥ç¥ó:\n"
-"    -P ¥×¥ê¥ó¥¿¤òÁàºî¤¹¤ë¤¿¤á¤Ë¡¢¥×¥ê¥ó¥¿¡¦¥­¥å¡¼¤Î̾Á°¤ò»ØÄꤹ¤ë¡£\n"
-"       ½é´üÃͤϡ¢¥Ç¥Õ¥©¥ë¥È¤Î¥·¥¹¥Æ¥à¡¦¥×¥ê¥ó¥¿Ì¾¤Ç¤¹¡£\n"
-"    -r ¥×¥ê¥ó¥¿¡¦¥­¥å¡¼·Ðͳ¤Ç¤Ï¤Ê¤¯¡¢Ä¾Àܽñ¤­¹þ¤à¥Ç¥Ð¥¤¥¹Ì¾¤ò»ØÄꤹ¤ë¡£\n"
-"    -u ¿·¤·¤¤¥×¥ê¥ó¥¿¤Î¾ì¹ç¤Ë»ØÄꤹ¤ë (Stylus Color 740 ¤Þ¤¿¤Ï¤½¤ì°Ê¹ß)¡£\n"
-"    -q ¥Ð¥Ê¡¼¤òɽ¼¨¤·¤Ê¤¤¡£\n"
-"    -m ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤뤿¤á¤Ë¡¢Àµ³Î¤Ê¥×¥ê¥ó¥¿¤Î·¿¼°¤ò»ØÄꤹ¤ë¡£\n"
+"  コマンド:\n"
+"    -c プリンタ�ヘッドを清掃�る。\n"
+"    -n ノズル�テストパターンを�刷�る。\n"
+"       ノズル�汚���り�詰����る�パターン���表示�れ��。\n"
+"       ���刷�れ�ら�プリンタ�ヘッドを清掃��下��。\n"
+"    -a プリンタ�ヘッドを一列�並�る。\n"
+"       �警告】: ��コマンドを乱用�る��\n"
+"       �刷��質�低下�る���る��プリンタ故障�原因��り��\n"
+"    -o カラー�刷�ヘッドを一列�並�る (Stylus Color 480 � 580 ��)。\n"
+"       �警告】: ��コマンドを乱用�る��\n"
+"        �刷��質�低下�る���る��プリンタ故障�原因��り��。\n"
+"    -s プリンタ�状態を�得�る。\n"
+"    -i インク�レベルをプリンタ�ら�得�る。\n"
+"       �れ�プリンタ�低レベル・デ�イス��アクセス権 (読�書�) �必��"
+"�。\n"
+"    -d プリンタ情報 (型���) を�����る。\n"
+"       �れ�プリンタ�低レベル・デ�イス��\n"
+"       アクセス権 (読�書�) �必���。\n"
+"    -l ��プログラム�ライセンス/注�書�を表示�る。\n"
+"    -M 利用�能�プリンタ�型�を一覧表示�る。\n"
+"    -h ��メッセージを表示�る。\n"
+"  オプション:\n"
+"    -P プリンタを�作�る����プリンタ・キュー���を指定�る。\n"
+"       �期値��デフォルト�システム・プリンタ���。\n"
+"    -r プリンタ・キュー経由�����直接書�込むデ�イス�を指定�る。\n"
+"    -u 新��プリンタ�場��指定�る (Stylus Color 740 ����れ以�)。\n"
+"    -q �ナーを表示���。\n"
+"    -m ヘッドを一列�並�る����正確�プリンタ�型�を指定�る。\n"
 
 #: src/escputil/escputil.c:341 src/escputil/escputil.c:349
 #, c-format
 msgid "You may only specify one printer or raw device."
-msgstr "¥×¥ê¥ó¥¿¤Þ¤¿¤ÏÄã¥ì¥Ù¥ë¤Î¥Ç¥Ð¥¤¥¹¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンター���低レベル�デ�イスを一�指定�る����能��。"
 
 #: src/escputil/escputil.c:357
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンター�型�を一�指定�る����能��。"
 
 #: src/escputil/escputil.c:381
 #, c-format
@@ -4279,79 +4194,79 @@ msgstr ""
 #: src/escputil/escputil.c:395
 #, c-format
 msgid "Unknown option %c\n"
-msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %c\n"
+msgstr "�明�オプション %c\n"
 
 #: src/escputil/escputil.c:403
 #, c-format
 msgid "Usage: %s [OPTIONS] command\n"
-msgstr ""
+msgstr "使用法: %s [OPTIONS] command\n"
 
 #: src/escputil/escputil.c:405
 #, c-format
 msgid "Type `%s --help' for more information.\n"
-msgstr ""
+msgstr "詳細�情報� `%s --help` を入力������。\n"
 
 #: src/escputil/escputil.c:407
 #, c-format
 msgid "Type `%s -h' for more information.\n"
-msgstr ""
+msgstr "詳細�情報を知る�� `%s -h'  を入力������。\n"
 
 #: src/escputil/escputil.c:473
 #, c-format
 msgid "Cannot open device %s: %s\n"
-msgstr "¥Ç¥Ð¥¤¥¹ %s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "デ�イス %s を開���ん: %s\n"
 
 #: src/escputil/escputil.c:496
 #, c-format
 msgid "Cannot print to printer %s with %s\n"
-msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンター %s � %s を使���刷�る�������ん\n"
 
 #: src/escputil/escputil.c:512 src/escputil/escputil.c:522
 #, c-format
 msgid "Unable to send command to printer\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó\n"
+msgstr "プリンター�コマンドを�信����ん\n"
 
 #: src/escputil/escputil.c:582
 #, c-format
 msgid "Read from printer timed out\n"
-msgstr ""
+msgstr "プリンター�ら�読��り�タイムアウト\n"
 
 #: src/escputil/escputil.c:587
 #, c-format
 msgid "Cannot read from %s: %s\n"
-msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+msgstr "%s �ら読�込���ん: %s\n"
 
-#: src/escputil/escputil.c:767
-#, fuzzy, c-format
+#: src/escputil/escputil.c:769
+#, c-format
 msgid "Please specify a raw device\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¤Î¾õÂÖ¤¬É¬ÍפǤ¹¡£\n"
+msgstr "低レベルデ�イスを指定������。\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
-msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+msgstr "%s を読�書�モード�開���ん: %s\n"
 
-#: src/escputil/escputil.c:821
-#, fuzzy, c-format
+#: src/escputil/escputil.c:823
+#, c-format
 msgid "Unknown printer %s!\n"
-msgstr "ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó %s ¤Ç¤¹\n"
+msgstr "%s ��明�プリンター���\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
-msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
+msgstr "%s �書�込���ん; %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 "\n"
-"%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
+"%s �書�込���ん: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4359,10 +4274,10 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 "\n"
-"¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
+"プリンター�型�を検出����ん���。\n"
+"�使��プリンターを特定�る��� '-m' オプションを使用��下��。\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4404,23 +4319,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
+msgstr "フォト用紙"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
-msgstr ""
+msgstr "�明�"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4442,84 +4357,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
-msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+msgstr "明る�シアン"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4541,116 +4456,116 @@ msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr "明る�マゼンタ"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4692,341 +4607,340 @@ msgstr "¹õ¿§"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
+msgstr "光沢付�フイルム"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
-msgstr "¹õ¿§"
+msgstr "黒色"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
-#, fuzzy
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
-msgstr "²èÁü¤Î¥µ¥¤¥º"
+msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
-msgstr ""
+msgstr "状態: エラー\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
-msgstr ""
+msgstr "状態: セルフ�刷\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
-msgstr ""
+msgstr "状態: ビジー\n"
 
-#: src/escputil/escputil.c:1080
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1096
+#, c-format
 msgid "Status: Waiting\n"
-msgstr "ºÌÅÙ:"
+msgstr "状態: 待機中\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
-msgstr ""
+msgstr "状態: アイドル\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
-msgstr ""
+msgstr "状態: 一時�止\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
-msgstr ""
+msgstr "状態: クリーニング\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "状態: 工場出�状態\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
-msgstr ""
+msgstr "状態: シャットダウン\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
-msgstr ""
+msgstr "状態: �明 (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
-msgstr ""
+msgstr "エラー: 致命的�エラー\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
-msgstr ""
+msgstr "エラー: 他�インタフェース��択�れ���\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
-msgstr ""
+msgstr "エラー: カ�ー�開�����\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
-msgstr ""
+msgstr "エラ: 紙��り\n"
 
-#: src/escputil/escputil.c:1121
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1137
+#, c-format
 msgid "Error: Ink out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "エラー: インク切れ\n"
 
-#: src/escputil/escputil.c:1124
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1140
+#, c-format
 msgid "Error: Paper out\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "エラー: 用紙切れ\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
-msgstr ""
+msgstr "エラー: �特定�用紙エラー\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
-msgstr ""
+msgstr "エラー: 二�フィードエラー\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1167
+#, c-format
 msgid "Error: Rear cover open\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "エラー: 背��カ�ー�開�����\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
-msgstr ""
+msgstr "エラー: CD�トレイ�開������\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
-msgstr ""
+msgstr "エラー: トレイカ�ー�開�����\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
-msgstr ""
+msgstr "エラー: メンテナンスカートリッジ�カ�ー�開�����\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
-msgstr ""
+msgstr "エラー: フロントカ�ー�開�����\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
-msgstr ""
+msgstr "エラー: メンテナンス�必���\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
-msgstr ""
+msgstr "エラー: �明 (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
-msgstr ""
+msgstr "警告: %s インク�少��������\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
-msgstr ""
+msgstr "警告: メンテナンスカートリッジ���満���\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
-msgstr ""
+msgstr "警告: �明 (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
-msgstr ""
+msgstr "�刷ノズル�セルフテスト\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
-#, fuzzy, c-format
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
+#, c-format
 msgid "Printer Name: %s\n"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンター�: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
-msgstr ""
+msgstr "インクレベル:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
-msgstr "¥¤¥ó¥¯¤Î¿§"
+msgstr "インク�色"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
-msgstr "»Ä¤ê¤Î³ä¹ç"
+msgstr "残り�割�"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
-msgstr ""
+msgstr "ジョブ�: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���必��インク・レベルを�得���。\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���必��インク・レベルを�得���。\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
-msgstr ""
+msgstr "インクカートリッジ"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
-msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
+msgstr "低レベル・デ�イスを利用�る���プリンター識別��必���。\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
-msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
+msgstr "プリンタ�型�を一�指定�る����能��。"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
+msgstr "ヘッド�清掃中...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
-"¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
-"²¼¤µ¤¤¡£\n"
+"ノズルを�ェック���。プリンター�中�用紙�確実�存在���る��を確��"
+"�下��。\n"
 
-#: src/escputil/escputil.c:1822
-#, c-format
+#: src/escputil/escputil.c:1844
+#, fuzzy, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
 "\n"
@@ -5063,46 +4977,87 @@ msgid ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+"#-#-#-#-#  gutenprint.ja.po (gimp-print Version 4.2.3)  #-#-#-#-#\n"
+"�利用��次�説明を注�深��読�下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n"
-"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£³Æ¥Ñ¥¿¡¼¥ó¤Ï¤È¤Æ¤â\n"
-"¥·¥ó¥×¥ë¤Ç¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿\n"
-"¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò°õºþ¤·¤Þ¤¹¡£\n"
-"³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n"
+"��ツール� %d 個�テストパターンを�刷���。�パターン���も\n"
+"シンプル��。��ツール�垂直ラインを����ら�刷��\n"
+"ペア�ら構��れるテストパターンを�刷���。\n"
+"�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り��。\n"
 "\n"
-"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n"
-"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
 "\n"
-"¤Þ¤¿¥Æ¥¹¥ÈÍѤ˹âÉʼÁ¤ÊÍÑ»æ¤ò¤ª»È¤¤¤¹¤ë¤³¤È¤â¤ª¾©¤á¤·¤Þ¤¹¡£¹âÉʼÁ¤ÊÍÑ»æ¤ò\n"
-"ÍøÍѤ¹¤ë¤È¡¢Ê£¿ô¤Î¥é¥¤¥ó¤¬¤­¤Ã¤Á¤ê¤È°õºþ¤µ¤ì¤Æ¤Ë¤¸¤ß¤¬¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£\n"
-"ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤ÎÈÖ¹æ¤ò¹µ¤¨¤¿¸å¤Ç¡¢¤½¤ÎÍÑ»æ¤òµë»æ¥È¥ì¥¤¤ËÌᤷ¤Æ²¼¤µ¤¤¡£\n"
+"��テスト用�高�質�用紙を�使��る��も�奨����。高�質�用紙を\n"
+"利用�る��複数�ライン����り��刷�れ��������り��。\n"
+"最��ライン�ペア�番�を控��後����用紙を給紙トレイ�戻��下��。\n"
 "\n"
-"³Æ¥Ñ¥¿¡¼¥ó¤Ï»÷Ä̤äƤ¤¤Þ¤¹¤¬¡¢¼ê»æ¤Î¥Ñ¥¿¡¼¥ó¤Ï¤è¤êÈùºÙ¤ÊÇÛÃÖ¤ò¹Ô¤¦¤¿¤á¤Ë\n"
-"ºÙ¤«¤¤¥É¥Ã¥È¤òÍøÍѤ·¤Æ¤¤¤Þ¤¹¡£\n"
-"Àµ¤·¤¤Ê¤Ӥ¬°õºþ¤µ¤ì¤ë¤è¤¦¡¢Á´¤Æ¤Î¥é¥¤¥ó¤ò¥Æ¥¹¥È¤·¤Æ²¼¤µ¤¤¡£\n"
-"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤¹¤ë¤È¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n"
-"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n"
-"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
+"�パターン�似通�������手紙�パターン�より微細��置を行����\n"
+"細��ドットを利用�����。\n"
+"正��並���刷�れるよ��全��ラインをテスト��下��。\n"
+"全��ラインを�刷�る��ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
 "\n"
-"¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n"
-"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n"
-"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n"
-"¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
-"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
-
-#: src/escputil/escputil.c:1857
-#, c-format
+"パターン��刷�完了��ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。終了��場���\n"
+"�����設定を�存���場���も�一度��手順を行��下��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
+"\n"
+"#-#-#-#-#  gutenprint-20110308.ja.bak.po (gimp-print Version 4.2.3)  #-#-#-#-"
+"#\n"
+"�利用��次�説明を注�深��読�下��。\n"
+"\n"
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
+"\n"
+"��ツール� %d 個�テストパターンを�刷���。�パターン���も\n"
+"シンプル��。��ツール�垂直ラインを����ら�刷��\n"
+"ペア�ら構��れるテストパターンを�刷���。\n"
+"�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り��。\n"
+"\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
+"\n"
+"��テスト用�高�質�用紙を�使��る��も�奨����。高�質�用紙を\n"
+"利用�る��複数�ライン����り��刷�れ��������り��。\n"
+"最��ライン�ペア�番�を控��後����用紙を給紙トレイ�戻��下��。\n"
+"\n"
+"�パターン�似通�������手紙�パターン�より微細��置を行����\n"
+"細��ドットを利用�����。\n"
+"正��並���刷�れるよ��全��ラインをテスト��下��。\n"
+"全��ラインを�刷�る��ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
+"\n"
+"パターン��刷�完了��ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。終了��場���\n"
+"�����設定を�存���場���も�一度��手順を行��下��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
+
+#: src/escputil/escputil.c:1879
+#, fuzzy, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
 "\n"
@@ -5136,48 +5091,82 @@ msgid ""
 "this procedure.\n"
 "\n"
 msgstr ""
-"¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+"#-#-#-#-#  gutenprint.ja.po (gimp-print Version 4.2.3)  #-#-#-#-#\n"
+"�利用��次�説明を注�深��読�下��。\n"
+"\n"
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
+"\n"
+"��ツール�垂直ラインを����ら�刷��ペア�ら構��れるテストパターン"
+"ã‚’\n"
+"�刷���。�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り�"
+"�。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-"°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢\n"
-"°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢Á´¤¯ÌµÊݾڤǤ¹¡£\n"
-"¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
 "\n"
-"¤³¤Î¥Ä¡¼¥ë¤Ï¿âľ¥é¥¤¥ó¤ò½Å¤Í¤Ê¤¬¤é°õºþ¤·¤¿¥Ú¥¢¤«¤é¹½À®¤µ¤ì¤ë¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó"
-"¤ò\n"
-"°õºþ¤·¤Þ¤¹¡£³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ"
-"¤¹¡£\n"
+"全��ラインを�刷��ら�ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
+"�れ�ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。\n"
+"終了��場��������設定を�存���場���も�一度��手順を行��下"
+"��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
 "\n"
-"ÆóËܤΥ饤¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢¤½¤Î¥é¥¤¥ó¤Î¥Ú¥¢¤¬Åù¤·¤¤´Ö³Ö¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤ò\n"
-"³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤Ä¤Þ¤ê¡¢°ìËܤΥ饤¥ó¤¬ºÇŬ¤Ê·Á¾õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"¤½¤·¤Æ¡¢¤½¤ì¤È¥Ú¥¢¤Ë¤Ê¤ë¥é¥¤¥ó¤¬Ê¿¹Õ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ"
-"¤¤¡£\n"
-"Ãî¥á¥¬¥Í¤ä³ÈÂç¶À¤ò»È¤Ã¤ÆºÙ¤«¤¤Éôʬ¤Î³Îǧ¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
+"#-#-#-#-#  gutenprint-20110308.ja.bak.po (gimp-print Version 4.2.3)  #-#-#-#-"
+"#\n"
+"�利用��次�説明を注�深��読�下��。\n"
 "\n"
-"Á´¤Æ¤Î¥é¥¤¥ó¤ò°õºþ¤·¤¿¤é¡¢¥é¥¤¥ó¡¦¥Ñ¥¿¡¼¥ó¤ò¤â¤¦°ìÅÙ°õºþ¤·¤Þ¤¹¡£\n"
-"Ãæ´Ö¤Ë¤¢¤ë¥é¥¤¥ó¤Î¥Ú¥¢ (#%d / %d ÈÖÌÜ) ¤¬Á´¤Æ¤Î´Ö³Ö¤ËÂФ·¤Æ\n"
-"ºÇŬ¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤½¤ì¤«¤é¡¢¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢\n"
-"¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë (r) ¤«¡¢Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»¤ó¤¬¡¢\n"
-"¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£\n"
-"½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼"
-"¤µ¤¤¡£\n"
-"¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
-
-#: src/escputil/escputil.c:1901
+"��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+"�刷ヘッドを一列�並���れ��。��ツールを使���る��\n"
+"�刷��質を低下��プリンタ�故障�原因を引�起���能性��り��。\n"
+"��ツール� SEIKO EPSON 社�テスト�����������全�無�証��。\n"
+"��ツール��使用���自身�責任下�行��下��。\n"
+"\n"
+"��ツール�垂直ラインを����ら�刷��ペア�ら構��れるテストパターン"
+"ã‚’\n"
+"�刷���。�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り�"
+"�。\n"
+"\n"
+"二本�ラインを観察�る場�����ライン�ペア�等��間隔�����る�を\n"
+"確���下��。��り�一本�ライン�最��形状�����る�確���下�"
+"�。\n"
+"�����れ�ペア��るライン�平衡�����る�を注�深�確���下�"
+"�。\n"
+"虫メガ�や拡大�を使��細��部分�確�を�奨����。\n"
+"\n"
+"全��ラインを�刷��ら�ライン・パターンをも�一度�刷���。\n"
+"中間��るライン�ペア (#%d / %d 番目) �全��間隔�対��\n"
+"最���る��を確���下��。\n"
+"�れ�ら���プリンタ用���設定を�存 (s) �る��\n"
+"テストパターンを��実行�る (r) ���存����終了 (q) �る�\n"
+"�択��下��。終了��も以��設定�戻り��ん��\n"
+"プリンタ�電�を OFF �����り戻�����能��。\n"
+"終了��場��������設定を�存���場���も�一度��手順を行��下"
+"��。\n"
+"��作業を行���る最中�電�を OFF �����下��。\n"
+
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
-msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
+msgstr "プリンター�コマンドを�信����ん。終了���。\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
-msgstr ""
+msgstr "終了�����\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5188,49 +5177,49 @@ msgid ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 msgstr ""
-"ºÇ½ª½ÐÎϤǥץê¥ó¥¿¤¬Àµ¤·¤¤´Ö³Ö¤Ç°õºþ¤·¤Æ¤¤¤ë¤«¤òÃí°Õ¿¼¤¯³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"³Îǧ¸å¡¢¼¡¤ÎÃ椫¤éÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
-"  (s) ¥×¥ê¥ó¥¿¤ÎÃæ¤Ë¤³¤ÎÀßÄê¤òÊݸ¤¹¤ë\n"
-"  (q) ¤³¤ÎÀßÄê¤òÊݸ¤·¤Ê¤¤¤Ç½ªÎ»¤¹¤ë\n"
-"  (r) ºÇ½é¤ËÌá¤Ã¤ÆºÆ¤ÓÀßÄꤹ¤ë\n"
-"ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
-"ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
-
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+"最終出力�プリンター�正��間隔��刷���る�を注�深�確���下��。\n"
+"確�後�次�中�ら�択��下��:\n"
+"  (s) プリンター�中���設定を�存�る\n"
+"  (q) ��設定を�存����終了�る\n"
+"  (r) 最��戻����設定�る\n"
+"�択後�最後�確���り��。\n"
+"�択��下�� (s, q, r)。\n"
+
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
-msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+msgstr "本当�設定を破棄��終了�る場����度 'q' を入力��下��:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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 ""
-"¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-"¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+"�使��プリンター�補正�れ���。但���間隔����存�れ����ん。\n"
+"��間隔を�存�る場�����手順を繰り返��下��。\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
-msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+msgstr "本当�間隔補正�設定をやり直�場����度 'r' を入力��下��:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
+msgstr "間隔補正�設定を繰り返���。\n"
 
-#: src/escputil/escputil.c:1961
-#, c-format
+#: src/escputil/escputil.c:1983
+#, fuzzy, 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"
@@ -5238,53 +5227,61 @@ msgid ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ÎÀßÄê¤òÊѹ¹¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
-"¡Ú·Ù¹ð¡Û: ¤³¤ÎÁàºî¤Ï SEIKO EPSON ¤Î¾µÇ§¤òÆÀ¤¿¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
-"          ¤Þ¤¿¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤Ë»³²¤òÍ¿¤¨¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£\n"
-"ËÜÅö¤Ëµ¹¤·¤¤¤Ç¤¹¤«¡©\n"
-"¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
+"#-#-#-#-#  gutenprint.ja.po (gimp-print Version 4.2.3)  #-#-#-#-#\n"
+"���作���使��プリンタ�設定を変更�る����り��。\n"
+"�警告】: ���作� SEIKO EPSON �承�を得�も����り��ん。\n"
+"          ����使��プリンタ��害を与�る�も�れ��ん。\n"
+"本当�宜�����？\n"
+"��設定を�使��プリンタ��存�る場����度 's' を入力��下��:\n"
+"#-#-#-#-#  gutenprint-20110308.ja.bak.po (gimp-print Version 4.2.3)  #-#-#-#-"
+"#\n"
+"���作���使��プリンタ�設定を変更�る����り��。\n"
+"�警告】: ���作� SEIKO EPSON �承�を得�も����り��ん。\n"
+"          ����使��プリンタ��害を与�る�も�れ��ん。\n"
+"本当�宜�����？\n"
+"��設定を�使��プリンタ��存�る場����度 's' を入力��下��:\n"
 "\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
-msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
+msgstr "設定��存�る������..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
-msgstr "¼ºÇԤǤ¹¡ª\n"
+msgstr "失敗���\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
-"¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
-"ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+"����設定��存�失敗����。\n"
+"�度�間隔補正�設定を行��下��。\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
+msgstr "完了�����\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
+msgstr "間隔補正�設定�プリンター��存�れ���。\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
-msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
+msgstr "�識����コマンド��。\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
-msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+msgstr "最後�コマンド�確��れ����ん。\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5294,65 +5291,65 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"¤³¤ÎÁàºî¤Ï¡¢¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ EPSON %s ¤Ç¤¢¤ë¤ÈÁÛÄꤷ¤¿¤â¤Î¤Ç¤¹¡£\n"
-"¤â¤·¥×¥ê¥ó¥¿¤Î·¿¼°¤¬°Û¤Ê¤ë¾ì¹ç¤Ï¡¢[CTRL]+C ¤òÆþÎϤ·¤ÆÃæÃǤ·¡¢\n"
-"Àµ¤·¤¤¥×¥ê¥ó¥¿¤Î·¿¼°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
+"���作���使��プリンタ� EPSON %s ��る�想定��も���。\n"
+"も�プリンタ�型��異�る場���[CTRL]+C を入力��中断��\n"
+"正��プリンタ�型�を�択��下��。\n"
 "\n"
-"°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
-"ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+"�刷ヘッド間隔補正を開始�る場���プリンタ�トレイ�\n"
+"用紙を入れ�下��。\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
-msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
+msgstr "何�キーを入力�る�続行��� > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, 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 ""
-"°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
-"¤¹¡£\n"
+"�刷�果を確�����パターン�最��ライン�ペアを�択��下��。\n"
+"��ペア�番�を入力��'r' ���設定を�り�����'?' �ヘルプを表示��"
+"�。\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
-msgstr "¥Ñ¥¹ #%d"
+msgstr "パス #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
-msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
+msgstr "新��用紙をトレイ�入れ�下��。\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+msgstr "範囲外�ペア番����\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
-msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
+msgstr "入力��も��無効���\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
-msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+msgstr "最��ライン�ペア� 1 � %d �間�番����下��。\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
-msgstr "´Ö³ÖÊäÀµÃæ..."
+msgstr "間隔補正中..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
-msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
+msgstr "完了����。\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5360,19 +5357,29 @@ msgid ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 msgstr ""
-"´Ö³ÖÊäÀµ¤¬Àµ¤·¤¤¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£ºÆÅ٥ƥ¹¥È¥Ñ¥¿¡¼¥ó¤Î°õºþ¤¬´°Î»¤·¤¿¸å¤Ë\n"
-"³Æ¥é¥¤¥ó¤ÎºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤¬¥Ñ¥¿¡¼¥ó %d ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
-"¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
-"ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+"間隔補正�正���確���下��。�度テストパターン��刷�完了��後�\n"
+"�ライン�最��パターン�パターン %d �����る�確���下��。\n"
+"も�最��パターン���場���最���刷�質を得る���\n"
+"�様��作を繰り返��下��。\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
-msgstr "ÆþÎÏ¥¨¥é¡¼\n"
+msgstr "入力エラー\n"
+
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "フ����刷"
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/File/�刷..."
 
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
-msgstr "°õºþÃæ..."
+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
@@ -5638,29 +5645,29 @@ msgstr "°õºþÃæ..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
-msgstr ""
+msgstr "EPSONスタンダードインク"
 
 #: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:364
 #: src/xml/xmli18n-tmp.h:474
 #, fuzzy
 msgid "Bright White Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+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
@@ -5681,9 +5688,9 @@ msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
-msgstr "¤Ï¤¬¤­"
+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
@@ -5705,7 +5712,7 @@ msgstr "¤Ï¤¬¤­"
 #: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2467
 #: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2558
 msgid "Back Light Film"
-msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
+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
@@ -5728,19 +5735,18 @@ msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
 #: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2562
 #, fuzzy
 msgid "Matte Paper Heavyweight"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
 #: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:404
 #: src/xml/xmli18n-tmp.h:514
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
-msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級�や出�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:429
 #: src/xml/xmli18n-tmp.h:539
-#, fuzzy
 msgid "Ultra Glossy Photo Paper"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+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
@@ -5763,13 +5769,13 @@ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2572
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:444
 #: src/xml/xmli18n-tmp.h:554
 #, fuzzy
 msgid "Ultra Premium Photo Paper Luster"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級�や出�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:37
 msgid "CD or DVD"
@@ -5801,27 +5807,27 @@ msgstr "ColorLife Paper"
 #: src/xml/xmli18n-tmp.h:73
 #, fuzzy
 msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:75
 #, fuzzy
 msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgstr "高級光沢付�フォト用紙"
 
 #: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
-msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
+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
@@ -5978,29 +5984,29 @@ msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6176,7 +6182,7 @@ msgstr "Quadtone"
 #: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2452
 #: src/xml/xmli18n-tmp.h:2548
 msgid "Plain Paper Fast Load"
-msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
+msgstr "通常用紙�高速読込�"
 
 #: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:368
 #: src/xml/xmli18n-tmp.h:373 src/xml/xmli18n-tmp.h:378
@@ -6279,7 +6285,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2494
 #, fuzzy
 msgid "Archival Matte Paper"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
 #: src/xml/xmli18n-tmp.h:662 src/xml/xmli18n-tmp.h:722
 #: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1073
@@ -6362,8 +6368,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
@@ -6439,8 +6445,8 @@ msgstr "Six Color Photo"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6453,10 +6459,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6541,7 +6547,7 @@ msgstr "150x150 DPI"
 #: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3183
 #, fuzzy
 msgid "360 DPI High Quality"
-msgstr "600 DPI ¹âÉʼÁ"
+msgstr "600 DPI 高�質"
 
 #: src/xml/xmli18n-tmp.h:2592 src/xml/xmli18n-tmp.h:2605
 #: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2629
@@ -6599,9 +6605,9 @@ msgstr "600 DPI ¹âÉʼÁ"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
-msgstr "600 DPI"
+msgstr "360 DPI"
 
 #: src/xml/xmli18n-tmp.h:2593 src/xml/xmli18n-tmp.h:2606
 #: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2630
@@ -6660,7 +6666,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6721,9 +6727,9 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
-msgstr "1200 DPI"
+msgstr "720 DPI"
 
 #: src/xml/xmli18n-tmp.h:2600 src/xml/xmli18n-tmp.h:2613
 #: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2777
@@ -6747,9 +6753,8 @@ msgstr "1200 DPI"
 #: src/xml/xmli18n-tmp.h:3817 src/xml/xmli18n-tmp.h:3834
 #: src/xml/xmli18n-tmp.h:3851 src/xml/xmli18n-tmp.h:3865
 #: src/xml/xmli18n-tmp.h:3965
-#, fuzzy
 msgid "360 x 120 DPI Economy"
-msgstr "600x600 DPI ¥â¥Î¥¯¥í"
+msgstr "360 x 120 DPI エコノミー"
 
 #: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
 #: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2778
@@ -6771,9 +6776,8 @@ msgstr "600x600 DPI ¥â¥Î¥¯¥í"
 #: src/xml/xmli18n-tmp.h:3617 src/xml/xmli18n-tmp.h:3632
 #: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3721
 #: src/xml/xmli18n-tmp.h:3866
-#, fuzzy
 msgid "360 x 240 DPI Draft"
-msgstr "600x600 DPI"
+msgstr "360 x 240 DPI ドラフト"
 
 #: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2645
 #: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2671
@@ -6793,9 +6797,8 @@ msgstr "600x600 DPI"
 #: src/xml/xmli18n-tmp.h:3739 src/xml/xmli18n-tmp.h:3763
 #: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3840
 #: src/xml/xmli18n-tmp.h:3936 src/xml/xmli18n-tmp.h:3954
-#, fuzzy
 msgid "720 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "720 DPI 高�質"
 
 #: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2646
 #: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2672
@@ -6850,8 +6853,8 @@ msgstr "1200 DPI ¹âÉʼÁ"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6873,15 +6876,13 @@ msgstr "1440 x 720 DPI"
 #: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
 #: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3407
 #: src/xml/xmli18n-tmp.h:3637
-#, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1440 x 720 DPI 高�質"
 
 #: src/xml/xmli18n-tmp.h:2720 src/xml/xmli18n-tmp.h:2733
 #: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:3151
-#, fuzzy
 msgid "720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "720 DPI 最高�質"
 
 #: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3032
 #: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3060
@@ -6893,7 +6894,6 @@ msgstr "1200 DPI ¹âÉʼÁ"
 #: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3513
 #: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3638
 #: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3661
-#, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
@@ -6901,9 +6901,8 @@ msgstr "2880 x 720 DPI"
 #: src/xml/xmli18n-tmp.h:3046 src/xml/xmli18n-tmp.h:3061
 #: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3091
 #: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3639
-#, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "2880 x 720 DPI 高�質"
 
 #: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3212
 #: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3266
@@ -6933,7 +6932,7 @@ msgstr "1200 DPI ¹âÉʼÁ"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6970,16 +6969,15 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
-msgstr "²«¿§ (Y)"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
 #: src/xml/xmli18n-tmp.h:3440 src/xml/xmli18n-tmp.h:3484
@@ -6999,9 +6997,9 @@ msgstr "²«¿§ (Y)"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "2880 x 2880 DPI"
 
 #: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3454
 #: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3501
@@ -7018,9 +7016,8 @@ msgstr "2880 x 720 DPI"
 #: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:3940
 #: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3972
 #: src/xml/xmli18n-tmp.h:4108
-#, fuzzy
 msgid "5760 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
+msgstr "5760 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3441 src/xml/xmli18n-tmp.h:3485
 #: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3532
@@ -7032,8304 +7029,8445 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:3906 src/xml/xmli18n-tmp.h:3924
 #: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3960
 #: src/xml/xmli18n-tmp.h:3974 src/xml/xmli18n-tmp.h:4110
-#, fuzzy
 msgid "5760 x 2880 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "5760 x 2880 DPI"
 
 #: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3751
-#, fuzzy
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3692 src/xml/xmli18n-tmp.h:3737
 #: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3821
 #: src/xml/xmli18n-tmp.h:3838 src/xml/xmli18n-tmp.h:3934
 #: src/xml/xmli18n-tmp.h:3952
-#, fuzzy
 msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI"
+msgstr "720 x 360 DPI æ‹¡å¼µ"
 
 #: src/xml/xmli18n-tmp.h:3728 src/xml/xmli18n-tmp.h:3925
 #: src/xml/xmli18n-tmp.h:3943
-#, fuzzy
 msgid "Black 1"
-msgstr "¹õ¿§"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3729 src/xml/xmli18n-tmp.h:3926
 #: src/xml/xmli18n-tmp.h:3944
-#, fuzzy
 msgid "Black 2"
-msgstr "¹õ¿§"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3735 src/xml/xmli18n-tmp.h:3819
 #: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3932
 #: src/xml/xmli18n-tmp.h:3950
-#, fuzzy
 msgid "360 DPI Enhanced"
-msgstr "720 x 360 DPI"
+msgstr "360 DPI æ‹¡å¼µ"
 
 #: src/xml/xmli18n-tmp.h:3765
-#, fuzzy
 msgid "1440 x 720 DPI High Quality"
-msgstr "1200 DPI ¹âÉʼÁ"
+msgstr "1440 x 720 DPI 高��"
 
 #: src/xml/xmli18n-tmp.h:3908
-#, fuzzy
 msgid "Vivid Light Magenta"
-msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:3913
-#, fuzzy
 msgid "Vivid Magenta"
-msgstr "¥Þ¥¼¥ó¥¿ (M)"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4111
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
-msgstr "¥È¥ì¥¤"
+msgstr "メイントレイ"
 
-#: src/xml/xmli18n-tmp.h:4112
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
-msgstr "¼Ì¿¿"
+msgstr "写真トレイ"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
+msgstr "CD��刷"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
-msgstr "¥È¥ì¥¤"
+msgstr "背�トレイ"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
-msgstr ""
+msgstr "��トレイ"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
-msgstr "¼êÆ°"
+msgstr "手動"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
-msgstr ""
+msgstr "回転給紙(�ページ�切り離�)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
-msgstr ""
+msgstr "回転給紙(切り離���)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
-msgstr "¥í¡¼¥ë¼°µë»æ"
+msgstr "ロール�給紙"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
-msgstr "¼êÆ°"
+msgstr "手動"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
-msgstr "¼êÆ°"
+msgstr "手動"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
-msgstr "¥Õ¥©¥ÈÍÑ»æ"
+msgstr "フォト用紙"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
-msgstr ""
+msgstr "カットシートビン1"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
-msgstr ""
+msgstr "カットシートビン2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
-msgstr "¼«Æ°ÁªÂò"
+msgstr "自動�択"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
-#, fuzzy
+msgstr "手動�択"
+
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
-msgstr "Seven Color Photo"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
-msgstr "Three Color Composite"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
-msgstr "Four Color Standard"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
-msgstr "Seven Color Photo"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
-msgstr "Six Color Photo"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
-msgstr "¥È¥ì¥¤£³"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
-msgstr "¥È¥ì¥¤£²"
-
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
-#, fuzzy
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
-msgstr "¥È¥ì¥¤£±"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
-msgstr "Quadtone"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
-msgstr "¥È¥ì¥¤£±"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
-msgstr "¥È¥ì¥¤£´"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
-msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+msgstr "マット用紙"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
-msgstr "½é´üÃͤËÌ᤹"
-
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+msgstr "�期値�戻�"
+
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
-msgstr "ÌÀ¤ë¤µ:"
+msgstr "明る�:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
-msgstr "¥ê¡¼¥¬¥ë"
+msgstr "リーガル"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
-msgstr "¥¿¥Ö¥í¥¤¥É"
+msgstr "タブロイド"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
-msgstr "¥¨¥¯¥¼¥¯¥Æ¥£¥Ö"
+msgstr "エクゼクティブ"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
+msgstr "EPSON 4x6 フォト用紙"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
-msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
+msgstr "EPSON 4x6 フォト用紙"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
-msgstr "¥¹¡¼¥Ñ¡¼ B 13x19"
+msgstr "スーパー B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
-msgstr "20x30"
+msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
-msgstr "4AÈÇ"
+msgstr "4A版"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
-msgstr "2AÈÇ"
+msgstr "2A版"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
-msgstr "A0ÈÇ"
+msgstr "A0版"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
-msgstr "A1ÈÇ"
+msgstr "A1版"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
-msgstr "A2ÈÇ"
+msgstr "A2版"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
-msgstr "A3ÈÇ"
+msgstr "A3版"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
-msgstr "A5ÈÇ"
+msgstr "A5版"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
-msgstr "A6ÈÇ"
+msgstr "A6版"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
-msgstr "A7ÈÇ"
+msgstr "A7版"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
-msgstr "A8ÈÇ"
+msgstr "A8版"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
-msgstr "A9ÈÇ"
+msgstr "A9版"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
-msgstr "A10ÈÇ"
+msgstr "A10版"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C0 横��"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C1 横��"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C2 横��"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C3 横��"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C4 横��"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C5 横��"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "B6-C4 横��"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C6 横��"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "DL 横��"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C7-6 横��"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C7 横��"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C8 横��"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C9 横��"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "C10 横��"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
-msgstr "A5ÈÇ"
+msgstr "A5版"
 
-#: src/xml/xmli18n-tmp.h:6724
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
-msgstr "²£ÃÖ¤­"
+msgstr "EA5 横��"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
-msgstr ""
+msgstr "10cm X 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
+msgstr "�筒 長形3�"
 
-#: src/xml/xmli18n-tmp.h:6752
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
+msgstr "�筒 長形3� 横��"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
+msgstr "�筒 長形4�"
 
-#: src/xml/xmli18n-tmp.h:6754
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
-msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
+msgstr "�筒 長形4� 横��"
 
-#: src/xml/xmli18n-tmp.h:6755
-msgid "Japanese Kaku envelope #4"
-msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "�筒 長形4�"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "�筒 長形4� 横��"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "�筒 長形3�"
+
+#: src/xml/xmli18n-tmp.h:6781
 #, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "�筒 長形3� 横��"
+
+#: src/xml/xmli18n-tmp.h:6782
+msgid "Japanese Kaku envelope #4"
+msgstr "�筒 角形4�"
+
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
-msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
+msgstr "�筒 角形4� 横��"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
-msgstr "A2 Invitation"
+msgstr "A2 招待状"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
-msgstr ""
+msgstr "カード"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
-msgstr "¤Ï¤¬¤­"
+msgstr "���"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
-msgstr "A3ÈÇ"
-
-#: src/xml/xmli18n-tmp.h:6773
-msgid "89 mm Roll Paper"
-msgstr "89mm ¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6774
-msgid "4 Inch Roll Paper"
-msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6775
-msgid "5 Inch Roll Paper"
-msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6776
-msgid "210 mm Roll Paper"
-msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6777
-msgid "13 Inch Roll Paper"
-msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6778
-#, fuzzy
-msgid "17 Inch Roll Paper"
-msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6779
-msgid "22 Inch Roll Paper"
-msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6780
-msgid "24 Inch Roll Paper"
-msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6781
-msgid "36 Inch Roll Paper"
-msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6782
-msgid "44 Inch Roll Paper"
-msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6783
-#, fuzzy
-msgid "60 Inch Roll Paper"
-msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6784
-#, fuzzy
-msgid "64 Inch Roll Paper"
-msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
-
-#: src/xml/xmli18n-tmp.h:6785
-msgid "PostScript Level 1"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6786
-msgid "PostScript Level 2"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6787
-msgid "Canon BJ-30"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6788
-msgid "Canon BJC-50"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6789
-msgid "Canon BJC-55"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6790
-msgid "Canon BJC-80"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6791
-msgid "Canon BJC-85"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6792
-msgid "Canon BJC-210"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6793
-msgid "Canon BJC-240"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6794
-msgid "Canon BJC-250"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6795
-msgid "Canon BJC-1000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6796
-msgid "Canon BJC-2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6797
-msgid "Canon BJC-2010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6798
-msgid "Canon BJC-2100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6799
-msgid "Canon BJC-2110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6800
-msgid "Canon BJC-3000"
-msgstr ""
+msgstr "A3版"
 
 #: src/xml/xmli18n-tmp.h:6801
-msgid "Canon BJC-4000"
-msgstr ""
+msgid "89 mm Roll Paper"
+msgstr "89mm ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6802
-msgid "Canon BJC-4300"
-msgstr ""
+msgid "4 Inch Roll Paper"
+msgstr "4 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6803
-msgid "Canon BJC-4400"
-msgstr ""
+msgid "5 Inch Roll Paper"
+msgstr "5 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6804
-msgid "Canon BJC-5100"
-msgstr ""
+msgid "210 mm Roll Paper"
+msgstr "210mm イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6805
-msgid "Canon BJC-5500"
-msgstr ""
+msgid "13 Inch Roll Paper"
+msgstr "13 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6806
-msgid "Canon BJC-6000"
-msgstr ""
+msgid "17 Inch Roll Paper"
+msgstr "17 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6807
-msgid "Canon BJC-6100"
-msgstr ""
+msgid "22 Inch Roll Paper"
+msgstr "22 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6808
-msgid "Canon BJC-6200"
-msgstr ""
+msgid "24 Inch Roll Paper"
+msgstr "24 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6809
-msgid "Canon BJC-6500"
-msgstr ""
+msgid "36 Inch Roll Paper"
+msgstr "36 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6810
-msgid "Canon BJC-7000"
-msgstr ""
+msgid "44 Inch Roll Paper"
+msgstr "44 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6811
-msgid "Canon BJC-7100"
-msgstr ""
+msgid "60 Inch Roll Paper"
+msgstr "60 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6812
-msgid "Canon BJC-8200"
-msgstr ""
+msgid "64 Inch Roll Paper"
+msgstr "64 イン�ロール紙"
 
 #: src/xml/xmli18n-tmp.h:6813
-msgid "Canon BJC-8500"
-msgstr ""
+msgid "PostScript Level 1"
+msgstr "PostScript レベル1"
 
 #: src/xml/xmli18n-tmp.h:6814
-msgid "Canon S100"
-msgstr ""
+msgid "PostScript Level 2"
+msgstr "PostScript レベル2"
 
 #: src/xml/xmli18n-tmp.h:6815
-msgid "Canon S200"
-msgstr ""
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
 
 #: src/xml/xmli18n-tmp.h:6816
-msgid "Canon S300"
-msgstr ""
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
 
 #: src/xml/xmli18n-tmp.h:6817
-msgid "Canon S400"
-msgstr ""
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
 
 #: src/xml/xmli18n-tmp.h:6818
-msgid "Canon S450"
-msgstr ""
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
 
 #: src/xml/xmli18n-tmp.h:6819
-msgid "Canon S500"
-msgstr ""
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
 
 #: src/xml/xmli18n-tmp.h:6820
-msgid "Canon S600"
-msgstr ""
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
 
 #: src/xml/xmli18n-tmp.h:6821
-msgid "Canon S630"
-msgstr ""
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
 
 #: src/xml/xmli18n-tmp.h:6822
-msgid "Canon S800"
-msgstr ""
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
 
 #: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
-msgstr ""
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
 
 #: src/xml/xmli18n-tmp.h:6824
-#, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Stylus C60"
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
 
 #: src/xml/xmli18n-tmp.h:6825
-#, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Stylus C60"
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
 
 #: src/xml/xmli18n-tmp.h:6826
-#, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Stylus C60"
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
 
 #: src/xml/xmli18n-tmp.h:6827
-#, fuzzy
-msgid "Canon PIXMA iP1500"
-msgstr "Stylus C60"
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
 
 #: src/xml/xmli18n-tmp.h:6828
-#, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Stylus C60"
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
 
 #: src/xml/xmli18n-tmp.h:6829
-#, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Stylus C60"
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
 
 #: src/xml/xmli18n-tmp.h:6830
-#, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Stylus C60"
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
 
 #: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
 
 #: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
 
 #: src/xml/xmli18n-tmp.h:6833
-#, fuzzy
-msgid "Canon PIXMA iP2200"
-msgstr "Stylus C60"
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-5100"
 
 #: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Stylus C60"
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-5500"
 
 #: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Stylus C60"
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
 
 #: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
-msgstr ""
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
 
 #: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
-msgstr ""
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
 
 #: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr ""
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
 
 #: src/xml/xmli18n-tmp.h:6839
-msgid "Canon PIXMA iP4000"
-msgstr ""
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
 
 #: src/xml/xmli18n-tmp.h:6840
-msgid "Canon PIXMA iP4100"
-msgstr ""
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
 
 #: src/xml/xmli18n-tmp.h:6841
-msgid "Canon PIXMA iP4200"
-msgstr ""
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
 
 #: src/xml/xmli18n-tmp.h:6842
-msgid "Canon PIXMA iP4300"
-msgstr ""
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-8500"
 
 #: src/xml/xmli18n-tmp.h:6843
-msgid "Canon PIXMA iP4500"
-msgstr ""
+msgid "Canon S100"
+msgstr "Canon S100"
 
 #: src/xml/xmli18n-tmp.h:6844
-msgid "Canon PIXMA iP4600"
-msgstr ""
+msgid "Canon S200"
+msgstr "Canon S200"
 
 #: src/xml/xmli18n-tmp.h:6845
-msgid "Canon PIXMA iP4700"
-msgstr ""
+msgid "Canon S300"
+msgstr "Canon S300"
 
 #: src/xml/xmli18n-tmp.h:6846
 #, fuzzy
-msgid "Canon PIXMA iP4800"
-msgstr "Stylus C60"
+msgid "Canon S330"
+msgstr "Canon S300"
 
 #: src/xml/xmli18n-tmp.h:6847
-msgid "Canon PIXMA iP5000"
-msgstr ""
+msgid "Canon S400"
+msgstr "Canon S400"
 
 #: src/xml/xmli18n-tmp.h:6848
-msgid "Canon PIXMA iP5200"
-msgstr ""
+msgid "Canon S450"
+msgstr "Canon S450"
 
 #: src/xml/xmli18n-tmp.h:6849
-msgid "Canon PIXMA iP5300"
-msgstr ""
+msgid "Canon S500"
+msgstr "Canon S500"
 
 #: src/xml/xmli18n-tmp.h:6850
-msgid "Canon PIXMA iP6000D"
-msgstr ""
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
 
 #: src/xml/xmli18n-tmp.h:6851
 #, fuzzy
-msgid "Canon PIXMA iP6100D"
-msgstr "Stylus C60"
+msgid "Canon S530D"
+msgstr "Canon S500"
 
 #: src/xml/xmli18n-tmp.h:6852
-#, fuzzy
-msgid "Canon PIXMA iP6600D"
-msgstr "Stylus C60"
+msgid "Canon S600"
+msgstr "Canon S600"
 
 #: src/xml/xmli18n-tmp.h:6853
-msgid "Canon PIXMA iP6700"
-msgstr ""
+msgid "Canon S630"
+msgstr "Canon S630"
 
 #: src/xml/xmli18n-tmp.h:6854
-msgid "Canon PIXMA iP8500"
-msgstr ""
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
 
 #: src/xml/xmli18n-tmp.h:6855
-msgid "Canon PIXMA iX4000"
-msgstr ""
+msgid "Canon S800"
+msgstr "Canon S800"
 
 #: src/xml/xmli18n-tmp.h:6856
-msgid "Canon PIXMA iX5000"
-msgstr ""
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
 
 #: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
-msgid "Canon PIXMA iX6500"
-msgstr "Stylus C60"
+msgid "Canon S830D"
+msgstr "Canon S800"
 
 #: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iX7000"
-msgstr "Stylus C60"
+msgid "Canon S900"
+msgstr "Canon S100"
 
 #: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA Pro9000"
-msgstr "Stylus C60"
+msgid "Canon S9000"
+msgstr "Canon S100"
 
 #: src/xml/xmli18n-tmp.h:6860
-#, fuzzy
-msgid "Canon PIXMA Pro9000mk2"
-msgstr "Stylus C60"
+msgid "Canon S4500"
+msgstr "Canon S4500"
 
 #: src/xml/xmli18n-tmp.h:6861
-msgid "Canon PIXMA Pro9500"
-msgstr ""
+#, fuzzy
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY-CP-400"
 
 #: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA Pro9500mk2"
-msgstr "Stylus C60"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY-CP-400"
 
 #: src/xml/xmli18n-tmp.h:6863
-msgid "Canon PIXMA MP150"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXUS MP220"
 
 #: src/xml/xmli18n-tmp.h:6864
-msgid "Canon PIXMA MP160"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA mini320"
+msgstr "Canon PIXMA iP2000"
 
 #: src/xml/xmli18n-tmp.h:6865
-msgid "Canon PIXMA MP170"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXUS MP360"
 
 #: src/xml/xmli18n-tmp.h:6866
-msgid "Canon PIXMA MP180"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXUS MP990"
 
 #: src/xml/xmli18n-tmp.h:6867
-msgid "Canon PIXMA MP220"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXUS MP990"
 
 #: src/xml/xmli18n-tmp.h:6868
-msgid "Canon PIXMA MP250"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXUS iP3100"
 
 #: src/xml/xmli18n-tmp.h:6869
-msgid "Canon PIXMA MP270"
-msgstr ""
+msgid "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP2000"
 
 #: src/xml/xmli18n-tmp.h:6870
-msgid "Canon PIXMA MP280"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Canon PIXMA iP2000"
 
 #: src/xml/xmli18n-tmp.h:6871
-msgid "Canon PIXMA MP360"
-msgstr ""
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
 #: src/xml/xmli18n-tmp.h:6872
-msgid "Canon PIXMA MP370"
-msgstr ""
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXUS iP3100"
 
 #: src/xml/xmli18n-tmp.h:6873
-msgid "Canon PIXMA MP390"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
 #: src/xml/xmli18n-tmp.h:6874
-msgid "Canon PIXMA MP450"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
 
 #: src/xml/xmli18n-tmp.h:6875
-msgid "Canon PIXMA MP460"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
 #: src/xml/xmli18n-tmp.h:6876
-msgid "Canon PIXMA MP480"
-msgstr ""
+msgid "Canon PIXMA iP4000"
+msgstr "Canon PIXUS iP4000"
 
 #: src/xml/xmli18n-tmp.h:6877
 #, fuzzy
-msgid "Canon PIXMA MP493"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXUS iP4000"
 
 #: src/xml/xmli18n-tmp.h:6878
-msgid "Canon PIXMA MP495"
-msgstr ""
+msgid "Canon PIXMA iP4100"
+msgstr "Canon PIXUS iP4100"
 
 #: src/xml/xmli18n-tmp.h:6879
-msgid "Canon PIXMA MP500"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXUS iP4100"
 
 #: src/xml/xmli18n-tmp.h:6880
-msgid "Canon PIXMA MP510"
-msgstr ""
+msgid "Canon PIXMA iP4200"
+msgstr "Canon PIXUS iP4200"
 
 #: src/xml/xmli18n-tmp.h:6881
-msgid "Canon PIXMA MP520"
-msgstr ""
+msgid "Canon PIXMA iP4300"
+msgstr "Canon PIXUS iP4300"
 
 #: src/xml/xmli18n-tmp.h:6882
-msgid "Canon PIXMA MP540"
-msgstr ""
+msgid "Canon PIXMA iP4500"
+msgstr "Canon PIXUS iP4500"
 
 #: src/xml/xmli18n-tmp.h:6883
-msgid "Canon PIXMA MP550"
-msgstr ""
+msgid "Canon PIXMA iP4600"
+msgstr "Canon PIXUS iP4600"
 
 #: src/xml/xmli18n-tmp.h:6884
-#, fuzzy
-msgid "Canon PIXMA MP600"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP4700"
+msgstr "Canon PIXUS iP4700"
 
 #: src/xml/xmli18n-tmp.h:6885
-msgid "Canon PIXMA MP610"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP4800"
+msgstr "Canon PIXUS iP4000"
 
 #: src/xml/xmli18n-tmp.h:6886
 #, fuzzy
-msgid "Canon PIXMA MP620"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXUS iP4000"
 
 #: src/xml/xmli18n-tmp.h:6887
-#, fuzzy
-msgid "Canon PIXMA MP630"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP5000"
+msgstr "Canon PIXUS iP5000"
 
 #: src/xml/xmli18n-tmp.h:6888
-#, fuzzy
-msgid "Canon PIXMA MP640"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP5200"
+msgstr "Canon PIXUS iP5200"
 
 #: src/xml/xmli18n-tmp.h:6889
-msgid "Canon PIXMA MP700"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXUS iP5200"
 
 #: src/xml/xmli18n-tmp.h:6890
-msgid "Canon PIXMA MP710"
-msgstr ""
+msgid "Canon PIXMA iP5300"
+msgstr "Canon PIXUS iP5300"
 
 #: src/xml/xmli18n-tmp.h:6891
-msgid "Canon PIXMA MP730"
-msgstr ""
+msgid "Canon PIXMA iP6000D"
+msgstr "Canon PIXUS iP6000D"
 
 #: src/xml/xmli18n-tmp.h:6892
-msgid "Canon PIXMA MP740"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6100D"
+msgstr "Canon PIXUS iP6000D"
 
 #: src/xml/xmli18n-tmp.h:6893
-msgid "Canon PIXMA MP750"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXUS iP6000D"
 
 #: src/xml/xmli18n-tmp.h:6894
-msgid "Canon PIXMA MP760"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXUS iP6000D"
 
 #: src/xml/xmli18n-tmp.h:6895
-msgid "Canon PIXMA MP770"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXUS iP3100"
 
 #: src/xml/xmli18n-tmp.h:6896
-msgid "Canon PIXMA MP780"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXUS iP3100"
 
 #: src/xml/xmli18n-tmp.h:6897
-msgid "Canon PIXMA MP790"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP6600D"
+msgstr "Canon PIXUS iP6000D"
 
 #: src/xml/xmli18n-tmp.h:6898
-#, fuzzy
-msgid "Canon PIXMA MP800"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP6700"
+msgstr "Canon PIXUS iP6700"
 
 #: src/xml/xmli18n-tmp.h:6899
 #, fuzzy
-msgid "Canon PIXMA MP810"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXUS iP1900"
 
 #: src/xml/xmli18n-tmp.h:6900
-msgid "Canon PIXMA MP830"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXUS iP4500"
 
 #: src/xml/xmli18n-tmp.h:6901
-msgid "Canon PIXMA MP950"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXUS iP8500"
 
 #: src/xml/xmli18n-tmp.h:6902
-#, fuzzy
-msgid "Canon PIXMA MP960"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP8500"
+msgstr "Canon PIXUS iP8500"
 
 #: src/xml/xmli18n-tmp.h:6903
-msgid "Canon PIXMA MP970"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXUS iP8500"
 
 #: src/xml/xmli18n-tmp.h:6904
 #, fuzzy
-msgid "Canon PIXMA MP980"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXUS MP990"
 
 #: src/xml/xmli18n-tmp.h:6905
-msgid "Canon PIXMA MP990"
-msgstr ""
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXUS iX4000"
 
 #: src/xml/xmli18n-tmp.h:6906
-msgid "Canon PIXUS iP3100"
-msgstr ""
+msgid "Canon PIXMA iX5000"
+msgstr "Canon PIXUS iX5000"
 
 #: src/xml/xmli18n-tmp.h:6907
-msgid "Canon PIXUS iP4100"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA iX6500"
+msgstr "Canon PIXUS iX5000"
 
 #: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
-msgid "Canon PIXMA MG5100"
-msgstr "Stylus C60"
+msgid "Canon PIXMA iX7000"
+msgstr "Canon PIXUS iX4000"
 
 #: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
-msgid "Canon PIXMA MG5200"
-msgstr "Stylus C60"
+msgid "Canon PIXMA Pro9000"
+msgstr "Canon PIXUS Pro9500"
 
 #: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
-msgid "Canon PIXMA MG6100"
-msgstr "Stylus C60"
+msgid "Canon PIXMA Pro9000mk2"
+msgstr "Canon PIXUS Pro9500"
 
 #: src/xml/xmli18n-tmp.h:6911
-#, fuzzy
-msgid "Canon PIXMA MG8100"
-msgstr "Stylus C60"
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon PIXUS Pro9500"
 
 #: src/xml/xmli18n-tmp.h:6912
-msgid "Canon PIXMA MX300"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA Pro9500mk2"
+msgstr "Canon PIXUS Pro9500"
 
 #: src/xml/xmli18n-tmp.h:6913
-msgid "Canon PIXMA MX310"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXUS MP150"
 
 #: src/xml/xmli18n-tmp.h:6914
-msgid "Canon PIXMA MX330"
-msgstr ""
+msgid "Canon PIXMA MP150"
+msgstr "Canon PIXUS MP150"
 
 #: src/xml/xmli18n-tmp.h:6915
-msgid "Canon PIXMA MX340"
-msgstr ""
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXUS MP160"
 
 #: src/xml/xmli18n-tmp.h:6916
-msgid "Canon PIXMA MX350"
-msgstr ""
+msgid "Canon PIXMA MP170"
+msgstr "Canon PIXUS MP170"
 
 #: src/xml/xmli18n-tmp.h:6917
-#, fuzzy
-msgid "Canon PIXMA MX360"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP180"
+msgstr "Canon PIXUS MP180"
 
 #: src/xml/xmli18n-tmp.h:6918
 #, fuzzy
-msgid "Canon PIXMA MX410"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXUS MP150"
 
 #: src/xml/xmli18n-tmp.h:6919
 #, fuzzy
-msgid "Canon PIXMA MX420"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXUS MP220"
 
 #: src/xml/xmli18n-tmp.h:6920
-#, fuzzy
-msgid "Canon PIXMA MX700"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP220"
+msgstr "Canon PIXUS MP220"
 
 #: src/xml/xmli18n-tmp.h:6921
-msgid "Canon PIXMA MX850"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXUS MP220"
 
 #: src/xml/xmli18n-tmp.h:6922
-msgid "Canon PIXMA MX860"
-msgstr ""
+msgid "Canon PIXMA MP250"
+msgstr "Canon PIXUS MP250"
 
 #: src/xml/xmli18n-tmp.h:6923
-msgid "Canon PIXMA MX870"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXUS MP220"
 
 #: src/xml/xmli18n-tmp.h:6924
-#, fuzzy
-msgid "Canon PIXMA MX880"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP270"
+msgstr "Canon PIXUS MP270"
 
 #: src/xml/xmli18n-tmp.h:6925
-msgid "Canon PIXMA MX7600"
-msgstr ""
+msgid "Canon PIXMA MP280"
+msgstr "Canon PIXUS MP280"
 
 #: src/xml/xmli18n-tmp.h:6926
-msgid "Canon i80"
-msgstr ""
+msgid "Canon PIXMA MP360"
+msgstr "Canon PIXUS MP360"
 
 #: src/xml/xmli18n-tmp.h:6927
-msgid "Canon i560"
-msgstr ""
+msgid "Canon PIXMA MP370"
+msgstr "Canon PIXUS MP370"
 
 #: src/xml/xmli18n-tmp.h:6928
-msgid "Canon i850"
-msgstr ""
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXUS MP370"
 
 #: src/xml/xmli18n-tmp.h:6929
-msgid "Canon i860"
-msgstr ""
+msgid "Canon PIXMA MP390"
+msgstr "Canon PIXUS MP390"
 
 #: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
-msgstr ""
+msgid "Canon PIXMA MP450"
+msgstr "Canon PIXUS MP450"
 
 #: src/xml/xmli18n-tmp.h:6931
-#, fuzzy
-msgid "Epson Artisan 50"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MP460"
+msgstr "Canon PIXUS MP460"
 
 #: src/xml/xmli18n-tmp.h:6932
 #, fuzzy
-msgid "Epson Artisan 700"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXUS MP450"
 
 #: src/xml/xmli18n-tmp.h:6933
-#, fuzzy
-msgid "Epson Artisan 710"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MP480"
+msgstr "Canon PIXUS MP480"
 
 #: src/xml/xmli18n-tmp.h:6934
 #, fuzzy
-msgid "Epson Artisan 800"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXUS MP495"
 
 #: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
-msgid "Epson Artisan 810"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MP493"
+msgstr "Canon PIXUS MP495"
 
 #: src/xml/xmli18n-tmp.h:6936
-#, fuzzy
-msgid "Epson B-300"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP495"
+msgstr "Canon PIXUS MP495"
 
 #: src/xml/xmli18n-tmp.h:6937
-#, fuzzy
-msgid "Epson B-308"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP500"
+msgstr "Canon PIXUS MP500"
 
 #: src/xml/xmli18n-tmp.h:6938
-#, fuzzy
-msgid "Epson B-310"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP510"
+msgstr "Canon PIXUS MP510"
 
 #: src/xml/xmli18n-tmp.h:6939
-#, fuzzy
-msgid "Epson B-310N"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP520"
+msgstr "Canon PIXUS MP520"
 
 #: src/xml/xmli18n-tmp.h:6940
 #, fuzzy
-msgid "Epson B-500DN"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXUS MP500"
 
 #: src/xml/xmli18n-tmp.h:6941
-#, fuzzy
-msgid "Epson B-508DN"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP540"
+msgstr "Canon PIXUS MP540"
 
 #: src/xml/xmli18n-tmp.h:6942
-#, fuzzy
-msgid "Epson B-510DN"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP550"
+msgstr "Canon PIXUS MP550"
 
 #: src/xml/xmli18n-tmp.h:6943
 #, fuzzy
-msgid "Epson Stylus C20"
-msgstr "Stylus C20sx"
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXUS MP500"
 
 #: src/xml/xmli18n-tmp.h:6944
-#, fuzzy
-msgid "Epson Stylus C20SX"
-msgstr "Stylus C20ux"
+msgid "Canon PIXMA MP600"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:6945
 #, fuzzy
-msgid "Epson Stylus C20UX"
-msgstr "Stylus C20ux"
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:6946
-#, fuzzy
-msgid "Epson Stylus C40"
-msgstr "Stylus C40sx"
+msgid "Canon PIXMA MP610"
+msgstr "Canon PIXUS MP610"
 
 #: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
-msgid "Epson Stylus C40SX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP620"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
-msgid "Epson Stylus C40UX"
-msgstr "Stylus C40ux"
+msgid "Canon PIXMA MP630"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
-msgid "Epson Stylus C41"
-msgstr "Stylus C41sx"
+msgid "Canon PIXMA MP640"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:6950
-#, fuzzy
-msgid "Epson Stylus C41SX"
-msgstr "Stylus C41ux"
+msgid "Canon PIXMA MP700"
+msgstr "Canon PIXUS MP700"
 
 #: src/xml/xmli18n-tmp.h:6951
-#, fuzzy
-msgid "Epson Stylus C41UX"
-msgstr "Stylus C41ux"
+msgid "Canon PIXMA MP710"
+msgstr "Canon PIXUS MP710"
 
 #: src/xml/xmli18n-tmp.h:6952
-#, fuzzy
-msgid "Epson Stylus C42"
-msgstr "Stylus C42sx"
+msgid "Canon PIXMA MP730"
+msgstr "Canon PIXUS MP730"
 
 #: src/xml/xmli18n-tmp.h:6953
-#, fuzzy
-msgid "Epson Stylus C42SX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP740"
+msgstr "Canon PIXUS MP740"
 
 #: src/xml/xmli18n-tmp.h:6954
-#, fuzzy
-msgid "Epson Stylus C42UX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP750"
+msgstr "Canon PIXUS MP750"
 
 #: src/xml/xmli18n-tmp.h:6955
-#, fuzzy
-msgid "Epson Stylus C43"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP760"
+msgstr "Canon PIXUS MP760"
 
 #: src/xml/xmli18n-tmp.h:6956
-#, fuzzy
-msgid "Epson Stylus C43SX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP770"
+msgstr "Canon PIXUS MP770"
 
 #: src/xml/xmli18n-tmp.h:6957
-#, fuzzy
-msgid "Epson Stylus C43UX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP780"
+msgstr "Canon PIXUS MP780"
 
 #: src/xml/xmli18n-tmp.h:6958
-#, fuzzy
-msgid "Epson Stylus C44"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP790"
+msgstr "Canon PIXUS MP790"
 
 #: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
-msgid "Epson Stylus C44SX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP800"
+msgstr "Canon PIXUS MP830"
 
 #: src/xml/xmli18n-tmp.h:6960
 #, fuzzy
-msgid "Epson Stylus C44UX"
-msgstr "Stylus C42ux"
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXUS MP830"
 
 #: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
-msgid "Epson Stylus C45"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP810"
+msgstr "Canon PIXUS MP830"
 
 #: src/xml/xmli18n-tmp.h:6962
-#, fuzzy
-msgid "Epson Stylus C46"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP830"
+msgstr "Canon PIXUS MP830"
 
 #: src/xml/xmli18n-tmp.h:6963
 #, fuzzy
-msgid "Epson Stylus C48"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXUS MP950"
 
 #: src/xml/xmli18n-tmp.h:6964
-#, fuzzy
-msgid "Epson Stylus C50"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP950"
+msgstr "Canon PIXUS MP950"
 
 #: src/xml/xmli18n-tmp.h:6965
-#, fuzzy
-msgid "Epson Stylus C60"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP960"
+msgstr "Canon PIXUS MP960"
 
 #: src/xml/xmli18n-tmp.h:6966
-#, fuzzy
-msgid "Epson Stylus C61"
-msgstr "Stylus C61"
+msgid "Canon PIXMA MP970"
+msgstr "Canon PIXUS MP970"
 
 #: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
-msgid "Epson Stylus C62"
-msgstr "Stylus C62"
+msgid "Canon PIXMA MP980"
+msgstr "Canon PIXUS MP950"
 
 #: src/xml/xmli18n-tmp.h:6968
-#, fuzzy
-msgid "Epson Stylus C63"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MP990"
+msgstr "Canon PIXUS MP990"
 
 #: src/xml/xmli18n-tmp.h:6969
-#, fuzzy
-msgid "Epson Stylus C64"
-msgstr "Stylus C60"
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
 
 #: src/xml/xmli18n-tmp.h:6970
-#, fuzzy
-msgid "Epson Stylus C65"
-msgstr "Stylus C60"
+msgid "Canon PIXUS iP3100"
+msgstr "Canon PIXUS iP3100"
 
 #: src/xml/xmli18n-tmp.h:6971
-#, fuzzy
-msgid "Epson Stylus C66"
-msgstr "Stylus C60"
+msgid "Canon PIXUS iP4100"
+msgstr "Canon PIXUS iP4100"
 
 #: src/xml/xmli18n-tmp.h:6972
 #, fuzzy
-msgid "Epson Stylus C68"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXUS MG5100"
 
 #: src/xml/xmli18n-tmp.h:6973
 #, fuzzy
-msgid "Epson Stylus C70"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXUS MG5100"
 
 #: src/xml/xmli18n-tmp.h:6974
 #, fuzzy
-msgid "Epson Stylus C79"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXUS MG5100"
 
 #: src/xml/xmli18n-tmp.h:6975
-#, fuzzy
-msgid "Epson Stylus C80"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MG5100"
+msgstr "Canon PIXUS MG5100"
 
 #: src/xml/xmli18n-tmp.h:6976
-#, fuzzy
-msgid "Epson Stylus C82"
-msgstr "Stylus C82"
+msgid "Canon PIXMA MG5200"
+msgstr "Canon PIXUS MG5200"
 
 #: src/xml/xmli18n-tmp.h:6977
 #, fuzzy
-msgid "Epson Stylus C83"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXUS MG5100"
 
 #: src/xml/xmli18n-tmp.h:6978
-#, fuzzy
-msgid "Epson Stylus C84"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MG6100"
+msgstr "Canon PIXUS MG6100"
 
 #: src/xml/xmli18n-tmp.h:6979
 #, fuzzy
-msgid "Epson Stylus C85"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXUS MG6100"
 
 #: src/xml/xmli18n-tmp.h:6980
-#, fuzzy
-msgid "Epson Stylus C86"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MG8100"
+msgstr "Canon PIXUS MG8100"
 
 #: src/xml/xmli18n-tmp.h:6981
 #, fuzzy
-msgid "Epson Stylus C87"
-msgstr "Stylus C70"
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXUS MG8100"
 
 #: src/xml/xmli18n-tmp.h:6982
-#, fuzzy
-msgid "Epson Stylus C88"
-msgstr "Stylus C80"
+msgid "Canon PIXMA MX300"
+msgstr "Canon PIXUS MX300"
 
 #: src/xml/xmli18n-tmp.h:6983
-#, fuzzy
-msgid "Epson Stylus C110"
-msgstr "Stylus C60"
+msgid "Canon PIXMA MX310"
+msgstr "Canon PIXUS MX310"
 
 #: src/xml/xmli18n-tmp.h:6984
 #, fuzzy
-msgid "Epson Stylus C120"
-msgstr "Stylus C20sx"
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXUS MX300"
 
 #: src/xml/xmli18n-tmp.h:6985
-#, fuzzy
-msgid "Epson Stylus Color"
-msgstr "Stylus Color"
+msgid "Canon PIXMA MX330"
+msgstr "Canon PIXUS MX330"
 
 #: src/xml/xmli18n-tmp.h:6986
-#, fuzzy
-msgid "Epson Stylus Color I"
-msgstr "Stylus Color"
+msgid "Canon PIXMA MX340"
+msgstr "Canon PIXUS MX340"
 
 #: src/xml/xmli18n-tmp.h:6987
-#, fuzzy
-msgid "Epson Stylus Color II"
-msgstr "Stylus Color"
+msgid "Canon PIXMA MX350"
+msgstr "Canon PIXUS MX350"
 
 #: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
-msgid "Epson Stylus Color IIs"
-msgstr "Stylus Color"
+msgid "Canon PIXMA MX360"
+msgstr "Canon PIXUS MX300"
 
 #: src/xml/xmli18n-tmp.h:6989
 #, fuzzy
-msgid "Epson Stylus Color PRO"
-msgstr "Stylus Color Pro"
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXUS MX300"
 
 #: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
-msgid "Epson Stylus Pro XL"
-msgstr "Stylus Color Pro XL"
+msgid "Canon PIXMA MX410"
+msgstr "Canon PIXUS MX310"
 
 #: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
-msgid "Epson Stylus Color 400"
-msgstr "Stylus Color 400"
+msgid "Canon PIXMA MX420"
+msgstr "Canon PIXUS MX340"
 
 #: src/xml/xmli18n-tmp.h:6992
 #, fuzzy
-msgid "Epson Stylus Color 440"
-msgstr "Stylus Color 440"
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXUS MX310"
 
 #: src/xml/xmli18n-tmp.h:6993
 #, fuzzy
-msgid "Epson Stylus Color 460"
-msgstr "Stylus Color 460"
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXUS MX310"
 
 #: src/xml/xmli18n-tmp.h:6994
-#, fuzzy
-msgid "Epson Stylus Color 480"
-msgstr "Stylus Color 480"
+msgid "Canon PIXMA MX700"
+msgstr "Canon PIXUS MX700"
 
 #: src/xml/xmli18n-tmp.h:6995
 #, fuzzy
-msgid "Epson Stylus Color 500"
-msgstr "Stylus Color 500"
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXUS MX700"
 
 #: src/xml/xmli18n-tmp.h:6996
-#, fuzzy
-msgid "Epson Stylus Color 580"
-msgstr "Stylus Color 580"
+msgid "Canon PIXMA MX850"
+msgstr "Canon PIXUS MX850"
 
 #: src/xml/xmli18n-tmp.h:6997
-#, fuzzy
-msgid "Epson Stylus Color 600"
-msgstr "Stylus Color 600"
+msgid "Canon PIXMA MX860"
+msgstr "Canon PIXUS MX860"
 
 #: src/xml/xmli18n-tmp.h:6998
-#, fuzzy
-msgid "Epson Stylus Color 640"
-msgstr "Stylus Color 640"
+msgid "Canon PIXMA MX870"
+msgstr "Canon PIXUS MX870"
 
 #: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
-msgid "Epson Stylus Color 660"
-msgstr "Stylus Color 660"
+msgid "Canon PIXMA MX880"
+msgstr "Canon PIXUS MX850"
 
 #: src/xml/xmli18n-tmp.h:7000
 #, fuzzy
-msgid "Epson Stylus Color 670"
-msgstr "Stylus Color 670"
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXUS MX850"
 
 #: src/xml/xmli18n-tmp.h:7001
-#, fuzzy
-msgid "Epson Stylus Color 680"
-msgstr "Stylus Color 680"
+msgid "Canon PIXMA MX7600"
+msgstr "Canon PIXUS MX7600"
 
 #: src/xml/xmli18n-tmp.h:7002
 #, fuzzy
-msgid "Epson Stylus Color 740"
-msgstr "Stylus Color 740"
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXUS MP500"
 
 #: src/xml/xmli18n-tmp.h:7003
 #, fuzzy
-msgid "Epson Stylus Color 760"
-msgstr "Stylus Color 760"
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXUS MP600"
 
 #: src/xml/xmli18n-tmp.h:7004
 #, fuzzy
-msgid "Epson Stylus Color 777"
-msgstr "Stylus Color 777"
+msgid "Canon 50i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7005
 #, fuzzy
-msgid "Epson Stylus Color 800"
-msgstr "Stylus Color 800"
+msgid "Canon 80i"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7006
 #, fuzzy
-msgid "Epson Stylus Color 850"
-msgstr "Stylus Color 850"
+msgid "Canon 450i"
+msgstr "Canon S450"
 
 #: src/xml/xmli18n-tmp.h:7007
 #, fuzzy
-msgid "Epson Stylus Color 860"
-msgstr "Stylus Color 860"
+msgid "Canon 455i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7008
 #, fuzzy
-msgid "Epson Stylus Color 880"
-msgstr "Stylus Color 880"
+msgid "Canon 470PD"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7009
 #, fuzzy
-msgid "Epson Stylus Color 8 3"
-msgstr "Stylus Color 83"
+msgid "Canon 475PD"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7010
 #, fuzzy
-msgid "Epson Stylus Color 900"
-msgstr "Stylus Color 900"
+msgid "Canon 550i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7011
 #, fuzzy
-msgid "Epson Stylus Color 980"
-msgstr "Stylus Color 980"
+msgid "Canon 560i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7012
 #, fuzzy
-msgid "Epson Stylus Color 1160"
-msgstr "Stylus Color 1160"
+msgid "Canon 850i"
+msgstr "Canon i850"
 
 #: src/xml/xmli18n-tmp.h:7013
 #, fuzzy
-msgid "Epson Stylus Color 1500"
-msgstr "Stylus Color 1500"
+msgid "Canon 860i"
+msgstr "Canon i860"
 
 #: src/xml/xmli18n-tmp.h:7014
 #, fuzzy
-msgid "Epson Stylus Color 1520"
-msgstr "Stylus Color 1520"
+msgid "Canon 865R"
+msgstr "Canon i850"
 
 #: src/xml/xmli18n-tmp.h:7015
 #, fuzzy
-msgid "Epson Stylus Color 3000"
-msgstr "Stylus Color 3000"
+msgid "Canon 900PD"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7016
 #, fuzzy
-msgid "Epson Stylus Office B30"
-msgstr "Stylus C20sx"
+msgid "Canon 950i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7017
 #, fuzzy
-msgid "Epson Stylus Office B33"
-msgstr "Stylus C42ux"
+msgid "Canon 960i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7018
 #, fuzzy
-msgid "Epson Stylus Office B40W"
-msgstr "Stylus C40sx"
+msgid "Canon 990i"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7019
 #, fuzzy
-msgid "Epson Stylus Office B1100"
-msgstr "Stylus C20sx"
+msgid "Canon 6100i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7020
 #, fuzzy
-msgid "Epson Stylus Office T30"
-msgstr "Stylus C20sx"
+msgid "Canon 6500i"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7021
 #, fuzzy
-msgid "Epson Stylus Office T33"
-msgstr "Stylus C42ux"
+msgid "Canon 9100i"
+msgstr "Canon S100"
 
 #: src/xml/xmli18n-tmp.h:7022
 #, fuzzy
-msgid "Epson Stylus Office T40W"
-msgstr "Stylus C40sx"
+msgid "Canon 9900i"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7023
 #, fuzzy
-msgid "Epson Stylus Office T1100"
-msgstr "Stylus C20sx"
+msgid "Canon i70"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7024
-#, fuzzy
-msgid "Epson Stylus Office T1110"
-msgstr "Stylus C20sx"
+msgid "Canon i80"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7025
 #, fuzzy
-msgid "Epson Stylus Office BX300F"
-msgstr "Stylus C20sx"
+msgid "Canon i450"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7026
 #, fuzzy
-msgid "Epson Stylus Office BX600FW"
-msgstr "Stylus C20sx"
+msgid "Canon i450X"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7027
 #, fuzzy
-msgid "Epson Stylus Office SX600FW"
-msgstr "Stylus C20sx"
+msgid "Canon i455"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7028
 #, fuzzy
-msgid "Epson Stylus Office TX300F"
-msgstr "Stylus C20sx"
+msgid "Canon i455X"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7029
 #, fuzzy
-msgid "Epson Stylus Office TX600FW"
-msgstr "Stylus C20sx"
+msgid "Canon i470D"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7030
 #, fuzzy
-msgid "Epson Stylus Photo"
-msgstr "Stylus Photo"
+msgid "Canon i475D"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7031
 #, fuzzy
-msgid "Epson Stylus Photo 700"
-msgstr "Stylus Photo 700"
+msgid "Canon i550"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7032
 #, fuzzy
-msgid "Epson Stylus Photo EX"
-msgstr "Stylus Photo EX"
+msgid "Canon i550X"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7033
-#, fuzzy
-msgid "Epson Stylus Photo EX3"
-msgstr "Stylus Photo EX"
+msgid "Canon i560"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7034
 #, fuzzy
-msgid "Epson Stylus Photo 720"
-msgstr "Stylus Photo 720"
+msgid "Canon i560X"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7035
 #, fuzzy
-msgid "Epson Stylus Photo 750"
-msgstr "Stylus Photo 750"
+msgid "Canon i850old"
+msgstr "Canon i850"
 
 #: src/xml/xmli18n-tmp.h:7036
-#, fuzzy
-msgid "Epson Stylus Photo 780"
-msgstr "Stylus Photo 780"
+msgid "Canon i850"
+msgstr "Canon i850"
 
 #: src/xml/xmli18n-tmp.h:7037
 #, fuzzy
-msgid "Epson Stylus Photo 785"
-msgstr "Stylus Photo 785"
+msgid "Canon i860old"
+msgstr "Canon i860"
 
 #: src/xml/xmli18n-tmp.h:7038
-#, fuzzy
-msgid "Epson Stylus Photo 790"
-msgstr "Stylus Photo 790"
+msgid "Canon i860"
+msgstr "Canon i860"
 
 #: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
-msgid "Epson Stylus Photo 810"
-msgstr "Stylus Photo 810"
+msgid "Canon i865old"
+msgstr "Canon i865"
 
 #: src/xml/xmli18n-tmp.h:7040
 #, fuzzy
-msgid "Epson Stylus Photo 820"
-msgstr "Stylus Photo 820"
+msgid "Canon i865"
+msgstr "Canon i860"
 
 #: src/xml/xmli18n-tmp.h:7041
 #, fuzzy
-msgid "Epson Stylus Photo 825"
-msgstr "Stylus Photo 785"
+msgid "Canon i900D"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7042
 #, fuzzy
-msgid "Epson Stylus Photo 830"
-msgstr "Stylus Photo 830"
+msgid "Canon i905D"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7043
 #, fuzzy
-msgid "Epson Stylus Photo 830U"
-msgstr "Stylus Photo 830"
+msgid "Canon i950"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7044
 #, fuzzy
-msgid "Epson Stylus Photo 870"
-msgstr "Stylus Photo 870"
+msgid "Canon i960"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7045
 #, fuzzy
-msgid "Epson Stylus Photo 875"
-msgstr "Stylus Photo 875"
+msgid "Canon i965"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7046
 #, fuzzy
-msgid "Epson Stylus Photo 890"
-msgstr "Stylus Photo 890"
+msgid "Canon i990"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7047
 #, fuzzy
-msgid "Epson Stylus Photo 895"
-msgstr "Stylus Photo 895"
+msgid "Canon i6100"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7048
 #, fuzzy
-msgid "Epson Stylus Photo 900"
-msgstr "Stylus Photo 700"
+msgid "Canon i6500"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7049
 #, fuzzy
-msgid "Epson Stylus Photo 915"
-msgstr "Stylus Photo 915"
+msgid "Canon i9100"
+msgstr "Canon S100"
 
 #: src/xml/xmli18n-tmp.h:7050
 #, fuzzy
-msgid "Epson Stylus Photo 925"
-msgstr "Stylus Photo 925"
+msgid "Canon i9900"
+msgstr "Canon i80"
 
 #: src/xml/xmli18n-tmp.h:7051
 #, fuzzy
-msgid "Epson Stylus Photo 935"
-msgstr "Stylus Photo 895"
+msgid "Canon i9950"
+msgstr "Canon i560"
 
 #: src/xml/xmli18n-tmp.h:7052
-#, fuzzy
-msgid "Epson Stylus Photo 950"
-msgstr "Stylus Photo 950"
+msgid "Epson Artisan 50"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7053
-#, fuzzy
-msgid "Epson Stylus Photo 960"
-msgstr "Stylus Photo 960"
+msgid "Epson Artisan 700"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7054
-#, fuzzy
-msgid "Epson Stylus Photo 1200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Artisan 710"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7055
-#, fuzzy
-msgid "Epson Stylus Photo 1270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Artisan 800"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7056
-#, fuzzy
-msgid "Epson Stylus Photo 1280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Artisan 810"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7057
 #, fuzzy
-msgid "Epson Stylus Photo 1290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Artisan 835"
+msgstr "Stylus C20sx"
 
 #: src/xml/xmli18n-tmp.h:7058
-#, fuzzy
-msgid "Epson Stylus Photo 1290s"
-msgstr "Stylus Photo 1290"
+msgid "Epson B-300"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7059
-#, fuzzy
-msgid "Epson Stylus Photo 1400"
-msgstr "Stylus Photo 1200"
+msgid "Epson B-308"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7060
-#, fuzzy
-msgid "Epson Stylus Photo 1410"
-msgstr "Stylus Photo 810"
+msgid "Epson B-310"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7061
-#, fuzzy
-msgid "Epson Stylus Photo 2000P"
-msgstr "Stylus Photo 2000P"
+msgid "Epson B-310N"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7062
-#, fuzzy
-msgid "Epson Stylus Photo 2100"
-msgstr "Stylus Photo 2100"
+msgid "Epson B-500DN"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7063
-#, fuzzy
-msgid "Epson Stylus Photo 2200"
-msgstr "Stylus Photo 2200"
+msgid "Epson B-508DN"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7064
-#, fuzzy
-msgid "Epson Stylus Photo P50"
-msgstr "Stylus Photo 700"
+msgid "Epson B-510DN"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7065
-#, fuzzy
-msgid "Epson Stylus Photo R200"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C20"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7066
-#, fuzzy
-msgid "Epson Stylus Photo R210"
-msgstr "Stylus Photo 2100"
+msgid "Epson Stylus C20SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7067
-#, fuzzy
-msgid "Epson Stylus Photo R220"
-msgstr "Stylus Photo 2200"
+msgid "Epson Stylus C20UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7068
-#, fuzzy
-msgid "Epson Stylus Photo R230"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C40"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7069
-#, fuzzy
-msgid "Epson Stylus Photo R240"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C40SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7070
-#, fuzzy
-msgid "Epson Stylus Photo R245"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus C40UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7071
-#, fuzzy
-msgid "Epson Stylus Photo R260"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C41"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7072
-#, fuzzy
-msgid "Epson Stylus Photo R265"
-msgstr "Stylus Photo 925"
+msgid "Epson Stylus C41SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7073
-#, fuzzy
-msgid "Epson Stylus Photo R270"
-msgstr "Stylus Photo 1270"
+msgid "Epson Stylus C41UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7074
-#, fuzzy
-msgid "Epson Stylus Photo R280"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus C42"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7075
-#, fuzzy
-msgid "Epson Stylus Photo R285"
-msgstr "Stylus Photo 785"
+msgid "Epson Stylus C42SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7076
-#, fuzzy
-msgid "Epson Stylus Photo R290"
-msgstr "Stylus Photo 1290"
+msgid "Epson Stylus C42UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7077
-#, fuzzy
-msgid "Epson Stylus Photo R300"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C43"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7078
-#, fuzzy
-msgid "Epson Stylus Photo R310"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C43SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7079
-#, fuzzy
-msgid "Epson Stylus Photo R320"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C43UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7080
-#, fuzzy
-msgid "Epson Stylus Photo R340"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C44"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7081
-#, fuzzy
-msgid "Epson Stylus Photo R350"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C44SX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7082
-#, fuzzy
-msgid "Epson Stylus Photo R360"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C44UX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7083
-#, fuzzy
-msgid "Epson Stylus Photo R380"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C45"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7084
-#, fuzzy
-msgid "Epson Stylus Photo R390"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C46"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7085
-#, fuzzy
-msgid "Epson Stylus Photo R800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C48"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7086
-#, fuzzy
-msgid "Epson Stylus Photo R1800"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C50"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7087
-#, fuzzy
-msgid "Epson Stylus Photo R1900"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C60"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7088
-#, fuzzy
-msgid "Epson Stylus Photo R2400"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C61"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7089
-#, fuzzy
-msgid "Epson Stylus Photo R2880"
-msgstr "Stylus Photo 1280"
+msgid "Epson Stylus C62"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7090
-#, fuzzy
-msgid "Epson Stylus Photo R3000"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C63"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7091
-#, fuzzy
-msgid "Epson Stylus Photo RX400"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C64"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7092
-#, fuzzy
-msgid "Epson Stylus Photo RX420"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C65"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7093
-#, fuzzy
-msgid "Epson Stylus Photo RX425"
-msgstr "Stylus Photo 1200"
+msgid "Epson Stylus C66"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7094
-#, fuzzy
-msgid "Epson Stylus Photo RX430"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C68"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7095
-#, fuzzy
-msgid "Epson Stylus Photo RX500"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C70"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7096
-#, fuzzy
-msgid "Epson Stylus Photo RX510"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C79"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7097
-#, fuzzy
-msgid "Epson Stylus Photo RX560"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C80"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7098
-#, fuzzy
-msgid "Epson Stylus Photo RX580"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C82"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7099
-#, fuzzy
-msgid "Epson Stylus Photo RX585"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C83"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7100
-#, fuzzy
-msgid "Epson Stylus Photo RX590"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C84"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7101
-#, fuzzy
-msgid "Epson Stylus Photo RX595"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C85"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7102
-#, fuzzy
-msgid "Epson Stylus Photo RX600"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C86"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7103
-#, fuzzy
-msgid "Epson Stylus Photo RX610"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C87"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7104
-#, fuzzy
-msgid "Epson Stylus Photo RX620"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C88"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7105
-#, fuzzy
-msgid "Epson Stylus Photo RX630"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C110"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7106
-#, fuzzy
-msgid "Epson Stylus Photo RX640"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus C120"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7107
-#, fuzzy
-msgid "Epson Stylus Photo RX680"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7108
-#, fuzzy
-msgid "Epson Stylus Photo RX685"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color I"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7109
-#, fuzzy
-msgid "Epson Stylus Photo RX690"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color II"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7110
-#, fuzzy
-msgid "Epson Stylus Photo RX700"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color IIs"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7111
-#, fuzzy
-msgid "Epson Stylus Photo TX700W"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color PRO"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7112
-#, fuzzy
-msgid "Epson Stylus Photo TX710W"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Pro XL"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7113
-#, fuzzy
-msgid "Epson Stylus Photo TX800FW"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 400"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7114
-#, fuzzy
-msgid "Epson Stylus Photo TX810FW"
-msgstr "Stylus Photo 700"
+msgid "Epson Stylus Color 440"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7115
-#, fuzzy
-msgid "Epson Stylus Pro 3800"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 460"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7116
-#, fuzzy
-msgid "Epson Stylus Pro 3880"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 480"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7117
-#, fuzzy
-msgid "Epson Stylus Pro 3885"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 500"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7118
-#, fuzzy
-msgid "Epson Stylus Pro 4000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 580"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7119
-#, fuzzy
-msgid "Epson Stylus Pro 4800/4880 Back Compatible"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 600"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7120
-#, fuzzy
-msgid "Epson Stylus Pro 4800"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 640"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7121
-#, fuzzy
-msgid "Epson Stylus Pro 4880"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 660"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7122
-#, fuzzy
-msgid "Epson Stylus Pro 5000"
-msgstr "Stylus Pro 5000"
+msgid "Epson Stylus Color 670"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7123
-#, fuzzy
-msgid "Epson Stylus Pro 5500"
-msgstr "Stylus Pro 5500"
+msgid "Epson Stylus Color 680"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7124
-#, fuzzy
-msgid "Epson Stylus Pro 7000"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 740"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7125
-#, fuzzy
-msgid "Epson Stylus Pro 7500"
-msgstr "Stylus Pro 7500"
+msgid "Epson Stylus Color 760"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7126
-#, fuzzy
-msgid "Epson Stylus Pro 7600"
-msgstr "Stylus Pro 7600"
+msgid "Epson Stylus Color 777"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7127
-#, fuzzy
-msgid "Epson Stylus Pro 7700"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 800"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7128
-#, fuzzy
-msgid "Epson Stylus Pro 7800"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 850"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7129
-#, fuzzy
-msgid "Epson Stylus Pro 7880"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 860"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7130
-#, fuzzy
-msgid "Epson Stylus Pro 7890"
-msgstr "Stylus Pro 7000"
+msgid "Epson Stylus Color 880"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7131
-#, fuzzy
-msgid "Epson Stylus Pro 9000"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Color 8 3"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7132
-#, fuzzy
-msgid "Epson Stylus Pro 9500"
-msgstr "Stylus Pro 9500"
+msgid "Epson Stylus Color 900"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7133
-#, fuzzy
-msgid "Epson Stylus Pro 9600"
-msgstr "Stylus Pro 9600"
+msgid "Epson Stylus Color 980"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7134
-#, fuzzy
-msgid "Epson Stylus Pro 9700"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Color 1160"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7135
-#, fuzzy
-msgid "Epson Stylus Pro 9800"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Color 1500"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7136
-#, fuzzy
-msgid "Epson Stylus Pro 9880"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Color 1520"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7137
-#, fuzzy
-msgid "Epson Stylus Pro 9890"
-msgstr "Stylus Pro 9000"
+msgid "Epson Stylus Color 3000"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7138
-#, fuzzy
-msgid "Epson Stylus Pro 10000"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Office B30"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7139
-#, fuzzy
-msgid "Epson Stylus Pro 11800/11880 Back Compatible"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Office B33"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7140
-#, fuzzy
-msgid "Epson Stylus Pro 11800"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Office B40W"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7141
-#, fuzzy
-msgid "Epson Stylus Pro 11880"
-msgstr "Stylus Pro 10000"
+msgid "Epson Stylus Office B1100"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7142
-#, fuzzy
-msgid "Epson Stylus Scan 2000"
-msgstr "Stylus Scan 2000"
+msgid "Epson Stylus Office T30"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7143
-#, fuzzy
-msgid "Epson Stylus Scan 2500"
-msgstr "Stylus Scan 2500"
+msgid "Epson Stylus Office T33"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7144
-#, fuzzy
-msgid "Epson Stylus CX1500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office T40W"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7145
-#, fuzzy
-msgid "Epson Stylus CX3100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office T1100"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7146
-#, fuzzy
-msgid "Epson Stylus CX3200"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office T1110"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7147
-#, fuzzy
-msgid "Epson Stylus CX3500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office BX300F"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7148
 #, fuzzy
-msgid "Epson Stylus CX3600"
+msgid "Epson Stylus Office BX535WD"
 msgstr "Stylus C20sx"
 
 #: src/xml/xmli18n-tmp.h:7149
-#, fuzzy
-msgid "Epson Stylus CX3650"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office BX600FW"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7150
 #, fuzzy
-msgid "Epson Stylus CX3700"
+msgid "Epson Stylus Office BX630FW"
 msgstr "Stylus C20sx"
 
 #: src/xml/xmli18n-tmp.h:7151
 #, fuzzy
-msgid "Epson Stylus CX3800"
+msgid "Epson Stylus Office BX635FWD"
 msgstr "Stylus C20sx"
 
 #: src/xml/xmli18n-tmp.h:7152
-#, fuzzy
-msgid "Epson Stylus CX3805"
-msgstr "Stylus C80"
+msgid "Epson Stylus Office SX600FW"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7153
-#, fuzzy
-msgid "Epson Stylus CX3810"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office TX300F"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7154
-#, fuzzy
-msgid "Epson Stylus CX4100"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Office TX600FW"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7155
 #, fuzzy
-msgid "Epson Stylus CX4200"
+msgid "Epson Stylus Office TX620FWD"
 msgstr "Stylus C20sx"
 
 #: src/xml/xmli18n-tmp.h:7156
-#, fuzzy
-msgid "Epson Stylus CX4400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7157
-#, fuzzy
-msgid "Epson Stylus CX4500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 700"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7158
-#, fuzzy
-msgid "Epson Stylus CX4600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo EX"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7159
-#, fuzzy
-msgid "Epson Stylus CX4700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo EX3"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7160
-#, fuzzy
-msgid "Epson Stylus CX4800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 720"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7161
-#, fuzzy
-msgid "Epson Stylus CX4900"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 750"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7162
-#, fuzzy
-msgid "Epson Stylus CX5000"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 780"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7163
-#, fuzzy
-msgid "Epson Stylus CX5000F"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 785"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7164
-#, fuzzy
-msgid "Epson Stylus CX5100"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo 790"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7165
-#, fuzzy
-msgid "Epson Stylus CX5200"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo 810"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7166
-#, fuzzy
-msgid "Epson Stylus CX5300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 820"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7167
-#, fuzzy
-msgid "Epson Stylus CX5400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 825"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7168
-#, fuzzy
-msgid "Epson Stylus CX5500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 830"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7169
-#, fuzzy
-msgid "Epson Stylus CX5600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 830U"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7170
-#, fuzzy
-msgid "Epson Stylus CX5700"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 870"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7171
-#, fuzzy
-msgid "Epson Stylus CX5800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 875"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7172
-#, fuzzy
-msgid "Epson Stylus CX6000"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 890"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7173
-#, fuzzy
-msgid "Epson Stylus CX6300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 895"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7174
-#, fuzzy
-msgid "Epson Stylus CX6400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 900"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7175
-#, fuzzy
-msgid "Epson Stylus CX6500"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 915"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7176
-#, fuzzy
-msgid "Epson Stylus CX6600"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 925"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7177
-#, fuzzy
-msgid "Epson Stylus CX7000F"
-msgstr "Stylus C70"
+msgid "Epson Stylus Photo 935"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7178
-#, fuzzy
-msgid "Epson Stylus CX7400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 950"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7179
-#, fuzzy
-msgid "Epson Stylus CX7700"
-msgstr "Stylus C70"
+msgid "Epson Stylus Photo 960"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7180
-#, fuzzy
-msgid "Epson Stylus CX7800"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1200"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7181
-#, fuzzy
-msgid "Epson Stylus CX8300"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1270"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7182
-#, fuzzy
-msgid "Epson Stylus CX8400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1280"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7183
-#, fuzzy
-msgid "Epson Stylus CX9300F"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1290"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7184
-#, fuzzy
-msgid "Epson Stylus CX9400"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1290s"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7185
-#, fuzzy
-msgid "Epson Stylus CX9400F"
-msgstr "Stylus C20sx"
+msgid "Epson Stylus Photo 1400"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7186
-#, fuzzy
-msgid "Epson Stylus CX9475F"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo 1410"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7187
-#, fuzzy
-msgid "Epson Stylus D68"
-msgstr "Stylus C60"
+msgid "Epson Stylus Photo 2000P"
+msgstr ""
 
 #: src/xml/xmli18n-tmp.h:7188
+msgid "Epson Stylus Photo 2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7189
+msgid "Epson Stylus Photo 2200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7190
+msgid "Epson Stylus Photo P50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7191
+msgid "Epson Stylus Photo R200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7192
+msgid "Epson Stylus Photo R210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7193
+msgid "Epson Stylus Photo R220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7194
+msgid "Epson Stylus Photo R230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7195
+msgid "Epson Stylus Photo R240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7196
+msgid "Epson Stylus Photo R245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7197
+msgid "Epson Stylus Photo R260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7198
+msgid "Epson Stylus Photo R265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7199
+msgid "Epson Stylus Photo R270"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7200
+msgid "Epson Stylus Photo R280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7201
+msgid "Epson Stylus Photo R285"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7202
+msgid "Epson Stylus Photo R290"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7203
+msgid "Epson Stylus Photo R300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7204
+msgid "Epson Stylus Photo R310"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7205
+msgid "Epson Stylus Photo R320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7206
+msgid "Epson Stylus Photo R340"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7207
+msgid "Epson Stylus Photo R350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7208
+msgid "Epson Stylus Photo R360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7209
+msgid "Epson Stylus Photo R380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7210
+msgid "Epson Stylus Photo R390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7211
+msgid "Epson Stylus Photo R800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7212
+msgid "Epson Stylus Photo R1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7213
+msgid "Epson Stylus Photo R1900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7214
 #, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7215
+msgid "Epson Stylus Photo R2400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7216
+msgid "Epson Stylus Photo R2880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7217
+msgid "Epson Stylus Photo R3000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7218
+msgid "Epson Stylus Photo RX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7219
+msgid "Epson Stylus Photo RX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7220
+msgid "Epson Stylus Photo RX425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7221
+msgid "Epson Stylus Photo RX430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7222
+msgid "Epson Stylus Photo RX500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7223
+msgid "Epson Stylus Photo RX510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7224
+msgid "Epson Stylus Photo RX560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7225
+msgid "Epson Stylus Photo RX580"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7226
+msgid "Epson Stylus Photo RX585"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7227
+msgid "Epson Stylus Photo RX590"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7228
+msgid "Epson Stylus Photo RX595"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7229
+msgid "Epson Stylus Photo RX600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7230
+msgid "Epson Stylus Photo RX610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7231
+msgid "Epson Stylus Photo RX620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7232
+msgid "Epson Stylus Photo RX630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7233
+msgid "Epson Stylus Photo RX640"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
+msgid "Epson Stylus Photo RX680"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7236
+msgid "Epson Stylus Photo RX685"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7237
+msgid "Epson Stylus Photo RX690"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7238
+msgid "Epson Stylus Photo RX700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7239
+msgid "Epson Stylus Photo TX700W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7240
+msgid "Epson Stylus Photo TX710W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7241
+msgid "Epson Stylus Photo TX800FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7242
+msgid "Epson Stylus Photo TX810FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7243
+msgid "Epson Stylus Pro 3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7244
+msgid "Epson Stylus Pro 3880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7245
+msgid "Epson Stylus Pro 3885"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7246
+msgid "Epson Stylus Pro 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7247
+msgid "Epson Stylus Pro 4800/4880 Back Compatible"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7248
+msgid "Epson Stylus Pro 4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7249
+msgid "Epson Stylus Pro 4880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7250
+msgid "Epson Stylus Pro 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7251
+msgid "Epson Stylus Pro 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7252
+msgid "Epson Stylus Pro 7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7253
+msgid "Epson Stylus Pro 7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7254
+msgid "Epson Stylus Pro 7600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7255
+msgid "Epson Stylus Pro 7700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7256
+msgid "Epson Stylus Pro 7800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7257
+msgid "Epson Stylus Pro 7880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7258
+msgid "Epson Stylus Pro 7890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7260
+msgid "Epson Stylus Pro 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7261
+msgid "Epson Stylus Pro 9500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7262
+msgid "Epson Stylus Pro 9600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7263
+msgid "Epson Stylus Pro 9700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7264
+msgid "Epson Stylus Pro 9800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7265
+msgid "Epson Stylus Pro 9880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7266
+msgid "Epson Stylus Pro 9890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7268
+msgid "Epson Stylus Pro 10000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7269
+msgid "Epson Stylus Pro 11800/11880 Back Compatible"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7270
+msgid "Epson Stylus Pro 11800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7271
+msgid "Epson Stylus Pro 11880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7272
+msgid "Epson Stylus Scan 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7273
+msgid "Epson Stylus Scan 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7274
+msgid "Epson Stylus CX1500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7275
+msgid "Epson Stylus CX3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7276
+msgid "Epson Stylus CX3200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7277
+msgid "Epson Stylus CX3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7278
+msgid "Epson Stylus CX3600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7279
+msgid "Epson Stylus CX3650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7280
+msgid "Epson Stylus CX3700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7281
+msgid "Epson Stylus CX3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7282
+msgid "Epson Stylus CX3805"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7283
+msgid "Epson Stylus CX3810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
+msgid "Epson Stylus CX4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7286
+msgid "Epson Stylus CX4200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7287
+msgid "Epson Stylus CX4400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7288
+msgid "Epson Stylus CX4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7289
+msgid "Epson Stylus CX4600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7290
+msgid "Epson Stylus CX4700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7291
+msgid "Epson Stylus CX4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7292
+msgid "Epson Stylus CX4900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7293
+msgid "Epson Stylus CX5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7294
+msgid "Epson Stylus CX5000F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7295
+msgid "Epson Stylus CX5100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7296
+msgid "Epson Stylus CX5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7297
+msgid "Epson Stylus CX5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7298
+msgid "Epson Stylus CX5400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7299
+msgid "Epson Stylus CX5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7300
+msgid "Epson Stylus CX5600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7301
+msgid "Epson Stylus CX5700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7302
+msgid "Epson Stylus CX5800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7303
+msgid "Epson Stylus CX6000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7304
+msgid "Epson Stylus CX6300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7305
+msgid "Epson Stylus CX6400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7306
+msgid "Epson Stylus CX6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7307
+msgid "Epson Stylus CX6600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7308
+msgid "Epson Stylus CX7000F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7309
+msgid "Epson Stylus CX7400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7310
+msgid "Epson Stylus CX7700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7311
+msgid "Epson Stylus CX7800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7312
+msgid "Epson Stylus CX8300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7313
+msgid "Epson Stylus CX8400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7314
+msgid "Epson Stylus CX9300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7315
+msgid "Epson Stylus CX9400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7316
+msgid "Epson Stylus CX9400F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7317
+msgid "Epson Stylus CX9475F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7318
+msgid "Epson Stylus D68"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
-msgstr "Stylus C80"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
-msgstr "Stylus Photo 700"
+msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
-msgstr "Stylus C20sx"
+msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
-msgstr "Stylus C20sx"
+msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
 #, fuzzy
-msgid "Epson Stylus SX510W"
+msgid "Epson Stylus SX420"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7371
+#, fuzzy
+msgid "Epson Stylus SX510W"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
-msgstr "Stylus C20sx"
+msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
-msgstr "Stylus C20sx"
+msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
-msgstr "Stylus C20sx"
+msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
-msgstr "Stylus C20sx"
+msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
-msgstr "Stylus C20sx"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
-msgstr "Stylus C20sx"
+msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
-msgstr "Stylus C20sx"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
 #, fuzzy
-msgid "Epson Stylus TX510FN"
+msgid "Epson Stylus TX420"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7405
+#, fuzzy
+msgid "Epson Stylus TX510FN"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
-msgstr "Stylus Color 400"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7293
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
-msgstr "Stylus Color 400"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7294
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
-msgstr "Stylus Color 500"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7295
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
-msgstr "Stylus Color 500"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7296
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7434
+msgid "Epson WorkForce 545"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
-msgstr "Stylus Color 600"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7297
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
-msgstr "Stylus Color 600"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7298
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
-msgstr "Stylus Color 500"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
 #, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson PX V630"
+
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Epson WorkForce 635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Epson WorkForce 645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
-msgstr "Stylus Color 500"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
-msgstr ""
+msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7314
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7315
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7316
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7317
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
-msgstr ""
+msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
-msgstr ""
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
-msgstr ""
+msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
-msgstr ""
+msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
-msgstr ""
+msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7324
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7325
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7326
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7327
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7328
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7329
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7330
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
 #, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson PM 940C"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
-msgstr ""
+msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
-msgstr ""
+msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
-msgstr ""
+msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
-msgstr ""
+msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
-msgstr ""
+msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
-msgstr ""
+msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
-msgstr ""
+msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
-msgstr ""
+msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
-msgstr ""
+msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
-msgstr ""
+msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
-msgstr ""
+msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
-msgstr ""
+msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
-msgstr ""
+msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
-msgstr ""
+msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
-msgstr ""
+msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
-msgstr ""
+msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
-msgstr ""
+msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
-msgstr ""
+msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7388
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
 #, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7390
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
 #, fuzzy
-msgid "Epson PX 401A"
+msgid "Epson PX 204"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7536
+msgid "Epson PX 401A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7537
 #, fuzzy
-msgid "Epson PX 601F"
+msgid "Epson PX 504A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7538
+msgid "Epson PX 601F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
-msgstr ""
+msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
-msgstr ""
+msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
-msgstr ""
+msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
-msgstr ""
+msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
-msgstr ""
+msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
-msgstr ""
+msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
-msgstr ""
+msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
-msgstr ""
+msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
-msgstr ""
+msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
-msgstr ""
+msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
-msgstr ""
+msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
-msgstr ""
+msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
-msgstr ""
+msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
-msgstr ""
+msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
-msgstr ""
+msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
-msgstr ""
+msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
-msgstr ""
+msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
-msgstr ""
+msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
-msgstr ""
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
-msgstr ""
+msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
-msgstr ""
+msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
-msgstr ""
+msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
-msgstr ""
+msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
-msgstr ""
+msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
-msgstr ""
+msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
-msgstr ""
+msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7476
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7477
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7478
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7479
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7480
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
-msgstr ""
+msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
-msgstr ""
+msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
-msgstr ""
+msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
-msgstr ""
+msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
-msgstr ""
+msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
-msgstr ""
+msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
-msgstr ""
+msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
-msgstr ""
+msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7493
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7494
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7497
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7498
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7499
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7500
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
-msgstr "Stylus C60"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7506
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7507
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7508
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7509
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7510
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7511
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7512
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
-msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
-msgstr ""
+msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
-msgstr ""
+msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
-msgstr ""
+msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
-msgstr ""
+msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
-msgstr ""
+msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
-msgstr ""
+msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
-msgstr ""
+msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
-msgstr ""
+msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
-msgstr ""
+msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
-msgstr ""
+msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
-msgstr ""
+msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
-msgstr ""
+msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
-msgstr ""
+msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
-msgstr ""
+msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
-msgstr ""
+msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
-msgstr ""
+msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
-msgstr ""
+msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
-msgstr ""
+msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
-msgstr ""
+msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
-msgstr ""
+msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
-msgstr ""
+msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
-msgstr ""
+msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
-msgstr ""
+msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
-msgstr ""
+msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
-msgstr ""
+msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
-msgstr ""
+msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
-msgstr ""
+msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
-msgstr ""
+msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
-msgstr ""
+msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
-msgstr ""
+msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
-msgstr ""
+msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
-msgstr ""
+msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
-msgstr ""
+msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
-msgstr ""
+msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
-msgstr ""
+msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
-msgstr ""
+msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
-msgstr ""
+msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
-msgstr ""
+msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
-msgstr ""
+msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
-msgstr ""
+msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
-msgstr ""
+msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
-msgstr ""
+msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
-msgstr ""
+msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
-msgstr ""
+msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
-msgstr ""
+msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
-msgstr ""
+msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
-msgstr ""
+msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
-msgstr ""
+msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
-msgstr ""
+msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
-msgstr ""
+msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
-msgstr ""
+msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
-msgstr ""
+msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
-msgstr ""
+msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
-msgstr ""
+msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
-msgstr ""
+msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
-msgstr ""
+msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
-msgstr ""
+msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
-msgstr ""
+msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
-msgstr ""
+msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
-msgstr ""
+msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
-msgstr ""
+msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
-msgstr ""
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
-msgstr ""
+msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
-msgstr ""
+msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
-msgstr ""
+msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
-msgstr ""
+msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
-msgstr ""
+msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
-msgstr ""
+msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
-msgstr ""
+msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
-msgstr ""
+msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
-msgstr ""
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
-msgstr ""
+msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
-msgstr ""
+msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
-msgstr ""
+msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
-msgstr ""
+msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
-msgstr ""
+msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
-msgstr ""
+msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
-msgstr ""
+msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
-msgstr ""
+msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
-msgstr ""
+msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
-msgstr ""
+msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
-msgstr ""
+msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
-msgstr ""
+msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
-msgstr ""
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
-msgstr ""
+msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
-msgstr ""
+msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
-msgstr ""
+msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
-msgstr ""
+msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
-msgstr ""
+msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
-msgstr ""
+msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
-msgstr ""
+msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
-msgstr ""
+msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
-msgstr ""
+msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
-msgstr ""
+msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
-msgstr ""
+msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
-msgstr ""
+msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
-msgstr ""
+msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
-msgstr ""
+msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
-msgstr ""
+msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
-msgstr ""
+msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
-msgstr ""
+msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
-msgstr ""
+msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
-msgstr ""
+msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
-msgstr ""
+msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
-msgstr ""
+msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
-msgstr ""
+msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
-msgstr ""
+msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
-msgstr ""
+msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
-msgstr ""
+msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
-msgstr ""
+msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
-msgstr ""
+msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
-msgstr ""
+msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
-msgstr ""
+msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
-msgstr ""
+msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
-msgstr ""
+msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
-msgstr ""
+msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
-msgstr ""
+msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
-msgstr ""
+msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
-msgstr ""
+msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
-msgstr ""
+msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
-msgstr ""
+msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
-msgstr ""
+msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
-msgstr ""
+msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
-msgstr "¥×¥ê¥ó¥¿Ì¾:"
+msgstr "プリンタ�:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
-msgstr ""
+msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
-msgstr ""
+msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
-msgstr ""
+msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
-msgstr ""
+msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
-msgstr ""
+msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
-msgstr ""
+msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
-msgstr ""
+msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
-msgstr ""
+msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
-msgstr ""
+msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
-msgstr ""
+msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
-msgstr ""
+msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
-msgstr ""
+msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
-msgstr ""
+msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
-msgstr ""
+msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
-msgstr ""
+msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
-msgstr ""
+msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
-msgstr ""
+msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
-msgstr ""
+msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
-msgstr ""
+msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
-msgstr ""
+msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
-msgstr ""
+msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
-msgstr ""
+msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
-msgstr ""
+msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
-msgstr ""
+msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
-msgstr ""
+msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
-msgstr ""
+msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
-msgstr ""
+msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
-msgstr ""
+msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
-msgstr ""
+msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
-msgstr ""
+msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
-msgstr ""
+msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
-msgstr ""
+msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
-msgstr ""
+msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
-msgstr ""
+msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
-msgstr ""
+msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
-msgstr ""
+msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
-msgstr ""
+msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
-msgstr ""
+msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
-msgstr ""
+msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
-msgstr ""
+msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
-msgstr ""
+msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
-msgstr ""
+msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
-msgstr ""
+msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
-msgstr ""
+msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
-msgstr ""
+msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
-msgstr ""
+msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
-msgstr ""
+msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
-msgstr ""
+msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
-msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
-msgstr ""
+msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
-msgstr ""
+msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
-msgstr ""
+msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
-msgstr ""
+msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
-msgstr ""
+msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
-msgstr ""
+msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
-msgstr ""
+msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
-msgstr ""
+msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
-msgstr ""
+msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
-msgstr ""
+msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
-msgstr ""
+msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
-msgstr ""
+msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
-msgstr ""
+msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
-msgstr ""
+msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
-msgstr ""
+msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
-msgstr ""
+msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
-msgstr ""
+msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
+msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
-msgstr ""
+msgstr "富士フィルム プリンピックス CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
-msgstr ""
+msgstr "富士フィルム プリンピックス CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
-msgstr ""
+msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
-msgstr ""
+msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
-msgstr ""
+msgstr "大日本�刷 DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
-msgstr ""
+msgstr "大日本�刷 DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Color=Yes,Category=Advanced Image Control"
-#~ msgstr "½ÐÎϤμïÎà:"
-
-#, fuzzy
-#~ msgid "Color=Yes,Category=Advanced Output Control"
-#~ msgstr "½ÐÎϤμïÎà:"
-
-#, fuzzy
-#~ msgid "Basic Printer Setup"
-#~ msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
-
-#, fuzzy
-#~ msgid "Core Parameter"
-#~ msgstr "ColorLife Paper"
-
-#, fuzzy
-#~ msgid "GrayBalance"
-#~ msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
-
-#, fuzzy
-#~ msgid "Output Curves"
-#~ msgstr "½ÐÎϤμïÎà:"
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
 
-#, fuzzy
-#~ msgid "Epson Stylus PX700W"
-#~ msgstr "Stylus C70"
+#~ msgid "Advanced Ink Adjustment"
+#~ msgstr "詳細�インク調整"
 
-#, fuzzy
-#~ msgid "Epson Stylus Offixe TX300F"
-#~ msgstr "Stylus C20sx"
+#~ msgid "Advanced Output Adjustment"
+#~ msgstr "詳細�出力調整"
 
-#~ msgid "ISOLatin1"
-#~ msgstr "ISO ¥é¥Æ¥ó£±"
+#~ msgid "Advanced Printer Functionality"
+#~ msgstr "プリンター�拡張機能"
 
-#, fuzzy
-#~ msgid "Three Level Grayscale"
-#~ msgstr "Two Level Grayscale"
+#~ msgid "Advanced Printer Setup"
+#~ msgstr "詳細�プリンター設定"
 
-#~ msgid "Seven Color Enhanced"
-#~ msgstr "Seven Color Enhanced"
+#~ msgid "Basic Image Adjustment"
+#~ msgstr "基本イメージ調整"
 
-#, fuzzy
-#~ msgid "720 x 720 DPI"
-#~ msgstr "2880 x 720 DPI"
-
-#, fuzzy
-#~ msgid "2880 x 1440 DPI Transposed"
-#~ msgstr "1440 x 1440 DPI"
-
-#, fuzzy
-#~ msgid "ISO A4"
-#~ msgstr "SRA4"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
-#~ msgstr "¤ª¤«¤·¤Ê¥«¥é¡¼¶õ´Ö: bps %d ¥Á¥ã¥ó¥Í¥ë %d ¶õ´Ö %s\n"
+#~ msgid "Basic Output Adjustment"
+#~ msgstr "基本出力調整"
 
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: No row buffer\n"
-#~ msgstr "Äã¥ì¥Ù¥ë¥Ð¥Ã¥Õ¥¡¤¬¤¢¤ê¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
-#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s=%s (¤ª¤½¤é¤¯¿ôÃÍ) ¤ò²òÀϤǤ­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤ò -s·¿¼° ¤ò»È¤Ã¤Æ»ØÄꤷ¤Æ²¼¤µ¤¤\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤ÏÉÔÌÀ¤Ê·¿¼°¤Ç¤¹\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ë %s ¤ò»È¤Ã¤Æ°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: bad key code %d\n"
-#~ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n"
-#~ msgstr "image_init ¤Ë¼ºÇÔ %d\n"
-
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
-#~ msgstr "¥Õ¥¡¥¤¥ë¡¦¥Ç¥£¥¹¥¯¥ê¥×¥¿¤ò³«¤±¤Þ¤»¤ó: %s\n"
+#~ msgid "Basic Printer Setup"
+#~ msgstr "プリンター�基本設定"
 
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
-#~ msgstr "%s ¤ò³«¤±¤Þ¤»¤ó: %s\n"
+#~ msgid "Core Parameter"
+#~ msgstr "主�パラメーター"
 
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤¬ÉÔÌÀ¤Ç¤¹\n"
+#~ msgid "Epson EPL-5900PS"
+#~ msgstr "Epson EPL-5900PS"
 
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
-#~ msgstr "¤ª¤«¤·¤Ê¥Ñ¥é¥á¡¼¥¿; ³¹Ô¤Ç¤­¤Þ¤»¤ó¡ª\n"
+#~ msgid "Epson EPL-6100PS"
+#~ msgstr "Epson EPL-6100PS"
 
-#, fuzzy
-#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
-#~ msgstr "%.0f ¤Ç¼¡¤ÎÄã¥ì¥Ù¥ë¥Õ¥£¡¼¥ë¥É¤ò¼èÆÀ¤·¤Þ¤¹\n"
+#~ msgid "GrayBalance"
+#~ msgstr "グレー�ランス"
 
 #, fuzzy
 #~ msgid "90x90 DPI"
@@ -15364,6 +15502,10 @@ msgstr ""
 #~ msgstr "720 x 360 DPI MW2"
 
 #, fuzzy
+#~ msgid "720x720 DPI"
+#~ msgstr "2880 x 720 DPI"
+
+#, fuzzy
 #~ msgid "720x720 DPI DMT"
 #~ msgstr "2880 x 720 DPI"
 
@@ -15428,57 +15570,72 @@ msgstr ""
 #~ msgstr "2400x600 DPI"
 
 #~ msgid "Back Print Film"
-#~ msgstr "ÇØ·Ê°õºþÍÑ¥Õ¥£¥ë¥à"
+#~ msgstr "背景�刷用フィルム"
 
 #~ msgid "Fabric Sheets"
-#~ msgstr "Á¡°Ý¼Á¤ÎÍÑ»æ"
+#~ msgstr "繊維質�用紙"
 
 #~ msgid "Envelope"
-#~ msgstr "ÉõÅû"
+#~ msgstr "�筒"
 
 #~ msgid "High Resolution Paper"
-#~ msgstr "¹â²òÁüÅÙ¤ÎÍÑ»æ"
+#~ msgstr "高解�度�用紙"
 
 #~ msgid "T-Shirt Transfers"
-#~ msgstr "T-¥·¥ã¥Ä¤ÎÌÏÍÍ"
+#~ msgstr "T-シャツ�模様"
 
 #~ msgid "High Gloss Film"
-#~ msgstr "¹â±ð¥Õ¥£¥ë¥à"
+#~ msgstr "高艶フィルム"
 
 #~ msgid "Glossy Photo Cards"
-#~ msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É"
+#~ msgstr "光沢付�フォト・カード"
 
 #~ msgid "Photo Paper Pro"
-#~ msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
+#~ msgstr "フォト用紙 Pro"
 
 #~ msgid "CMYK Color"
-#~ msgstr "CMYK ¿§"
+#~ msgstr "CMYK 色"
 
 #~ msgid "Photo CcMmY Color"
-#~ msgstr "¥Õ¥©¥È CcMmY ¿§"
+#~ msgstr "フォト CcMmY 色"
 
 #~ msgid "Photo CcMmYK Color"
-#~ msgstr "¥Õ¥©¥È CcMmYK ¿§"
+#~ msgstr "フォト CcMmYK 色"
 
 #, fuzzy
 #~ msgid " Gamma"
-#~ msgstr "¥¬¥ó¥Þ:"
+#~ msgstr "ガンマ:"
+
+#, fuzzy
+#~ msgid "Advanced Image Control"
+#~ msgstr "出力�種類:"
 
 #, fuzzy
 #~ msgid " Curve"
-#~ msgstr "¹õ¿§"
+#~ msgstr "黒色"
+
+#, fuzzy
+#~ msgid "Output Curves"
+#~ msgstr "出力�種類:"
 
 #, fuzzy
 #~ msgid "Red Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�黄色��ランスを調整���。"
+
+#~ msgid "Seven Color Enhanced"
+#~ msgstr "Seven Color Enhanced"
+
+#, fuzzy
+#~ msgid "ISO A4"
+#~ msgstr "SRA4"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C60"
 #~ msgstr "Stylus C60"
 
 #, fuzzy
-#~ msgid "EPSON Stylus C61"
-#~ msgstr "Stylus C61"
+#~ msgid "EPSON Stylus C70"
+#~ msgstr "Stylus C70"
 
 #, fuzzy
 #~ msgid "EPSON Stylus C82"
@@ -15705,10 +15862,6 @@ msgstr ""
 #~ msgstr "Stylus Photo 2200"
 
 #, fuzzy
-#~ msgid "EPSON Stylus Pro 5000"
-#~ msgstr "Stylus Pro 5000"
-
-#, fuzzy
 #~ msgid "EPSON Stylus Pro 5500"
 #~ msgstr "Stylus Pro 5500"
 
@@ -15771,27 +15924,30 @@ msgstr ""
 #~ "\n"
 #~ "\n"
 #~ "Copyright (C) 1997-2001 Michael Sweet, Robert Krawitz,\n"
-#~ "¤½¤·¤Æ Gimp-Print ³«È¯¥Á¡¼¥à¡£\n"
+#~ "��� Gimp-Print 開発�ーム。\n"
 #~ "\n"
-#~ "¥Û¡¼¥à¥Ú¡¼¥¸ <http://gimp-print.sourceforge.net> ¤Ë¤ª±Û¤·²¼¤µ¤¤¡£\n"
+#~ "ホームページ <http://gimp-print.sourceforge.net> ��越�下��。\n"
 #~ "\n"
-#~ "¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹; ¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬È¯¹Ô¤¹¤ë\n"
-#~ "GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ÎÂèÆóÈǤޤ¿¤Ï¤½¤ì°Ê¹ß¤ÎÈǤβ¼¤Ç²þÊÑ¡¦½¤Àµ¡¦ºÆÇÛÉÛ"
-#~ "¤¬\n"
-#~ "ǧ¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+#~ "��プログラム�フリーソフトウェア��; フリーソフトウェア財団�発行�る\n"
+#~ "GNU 公有使用許諾契約書�第二版����れ以��版�下�改変・修正・��布"
+#~ "�\n"
+#~ "��られ����。\n"
 #~ "\n"
-#~ "¤³¤Î¥×¥í¥°¥é¥à¤ÏÊØÍø¤Ë»È¤Ã¤Æ¤â¤é¤¨¤ë¤è¤¦¤ËÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢\n"
-#~ "´°Á´¤Ë̵ÊݾڤǤ¹; ¾¦ÍÑÍøÍѤޤ¿¤Ï¤¢¤ëÆÃÄê¤ÎÌÜŪ¤Ë¤ª¤±¤ëŬ¹çÀ­¤ÎÊݾڤâ\n"
-#~ "¤¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ï GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷²¼¤µ¤¤¡£\n"
+#~ "��プログラム�便利�使��もら�るよ���布�れ������\n"
+#~ "完全�無�証��; 商用利用����る特定�目的���る��性��証も\n"
+#~ "�り��ん。詳細� GNU 公有使用許諾契約書を�覧下��。\n"
 #~ "\n"
-#~ "µ®Êý¤Ï¡¢¤³¤Î¥×¥í¥°¥é¥à¤ËŬ±þ¤·¤¿ GNU ¸øÍ­»ÈÍѵöÂú·ÀÌó½ñ¤Î¥³¥Ô¡¼¤ò\n"
-#~ "¼õ¤±¼è¤ëɬÍפ¬¤¢¤ê¤Þ¤¹; ¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢\n"
+#~ "貴方����プログラム��応�� GNU 公有使用許諾契約書�コピーを\n"
+#~ "���る必���り��; も���������場���\n"
 #~ "Free Software Foundation, Inc., 56 Temple Place - \n"
-#~ "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "Suite 330, Boston, MA 02111-1307, USA ��連絡��下��。\n"
 
 #, fuzzy
 #~ msgid "Gutenprint"
-#~ msgstr "¥Æ¥¹¥È°õºþ"
+#~ msgstr "テスト�刷"
+
+#~ msgid "ISOLatin1"
+#~ msgstr "ISO ラテン１"
 
 #, fuzzy
 #~ msgid ""
@@ -15802,48 +15958,126 @@ msgstr ""
 #~ "under certain conditions; type 'escputil -l' for details.\n"
 #~ msgstr ""
 #~ ", Copyright (C) 2000-2001 Robert Krawitz\n"
-#~ "Escputil ¤Ï´°Á´ÌµÊݾڤǤ¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n"
-#~ "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¤¤¯¤Ä¤«¤Î¾ò·ï¤Î²¼¤ÇºÆÇÛÉÛ¤ò\n"
-#~ "´¿·Þ¤·¤Þ¤¹; ¾ÜºÙ¤Ï `escputil -l` ¤Ç¤´Í÷²¼¤µ¤¤¡£\n"
+#~ "Escputil �完全無�証��; 詳細� `escputil -l` ��覧下��。\n"
+#~ "�れ�フリーソフトウェア�������件�下���布を\n"
+#~ "歓迎���; 詳細� `escputil -l` ��覧下��。\n"
 
 #, fuzzy
 #~ msgid "Cannot identify printer!\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "プリンタ�ら�出力を解�����ん\n"
 
 #, fuzzy
 #~ msgid "Printer does not support listing ink types!\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
+#~ msgstr "プリンタ�カラー�刷をサ�ート�����ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Bad color space: bps %d channels %d space %s\n"
+#~ msgstr "����カラー空間: bps %d �ャン�ル %d 空間 %s\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/File/°õºþ..."
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: No row buffer\n"
+#~ msgstr "低レベル�ッファ��り��ん\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "ERROR: ijsgutenprint: Unable to parse parameter %s=%s (expect a number)\n"
+#~ msgstr "パラメータ %s=%s (��ら�数値) を解�����ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Printer must be specified with -sDeviceModel\n"
+#~ msgstr "プリンタを -s型� を使��指定��下��\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Printer %s is not a known model\n"
+#~ msgstr "プリンタ %s ��明�型���\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse TopLeft %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse PaperSize %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse curve %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse %s float %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse %s int %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse %s dimension %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: cannot parse %s boolean %s\n"
+#~ msgstr "プリンタ %s � %s を使���刷�る�������ん\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Bad parameter %s %d\n"
+#~ msgstr "プリンタ %s ��明��\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: bad key code %d\n"
+#~ msgstr "%.0f �次�低レベルフィールドを�得���\n"
 
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
-#~ msgstr "ijs_server_get_page_header ¤Ë¼ºÇÔ %d\n"
+#~ msgstr "ijs_server_get_page_header �失敗 %d\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: image_init failed %d\n"
+#~ msgstr "image_init �失敗 %d\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Unable to open file descriptor: %s\n"
+#~ msgstr "ファイル・ディスクリプタを開���ん: %s\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Unable to open %s: %s\n"
+#~ msgstr "%s を開���ん: %s\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Unknown printer %s\n"
+#~ msgstr "プリンタ %s ��明��\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
+#~ msgstr "����パラメータ; 続行����ん�\n"
+
+#, fuzzy
+#~ msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+#~ msgstr "%.0f �次�低レベルフィールドを�得���\n"
 
 #, fuzzy
 #~ msgid "Gloss Balance"
-#~ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�黄色��ランスを調整���。"
 
 #~ msgid ""
 #~ "Printer alignment must be done with a raw device or else\n"
 #~ "the -m option must be used to specify a printer.\n"
 #~ msgstr ""
-#~ "Åù´Ö³Ö¤Î°õºþ¤ÏÄã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤«¡¢¤¢¤ë¤¤¤Ï\n"
-#~ "'-m' ¥ª¥×¥·¥ç¥ó¤Ç¥×¥ê¥ó¥¿¤òÆÃÄꤷ¤Æ»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "等間隔��刷�低レベル・デ�イスを使����る��\n"
+#~ "'-m' オプション�プリンタを特定��使用�るよ����下��。\n"
 
 #~ msgid "Attempting to detect printer model..."
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½ÐÃæ¤Ç¤¹..."
+#~ msgstr "プリンタ�型�を検出中��..."
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot open %s read/write: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
+#~ "%s を読�書�モード�開���ん: %s\n"
 
 #~ msgid "Printer model %s is not known.\n"
-#~ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼° %s ¤ÏÉÔÌÀ¤Ç¤¹¡£\n"
+#~ msgstr "プリンタ�型� %s ��明��。\n"
 
 #, fuzzy
 #~ msgid "Gimp-Print"
@@ -15852,64 +16086,64 @@ msgstr ""
 #, fuzzy
 #~ msgid "Brightness of the print (0 is solid black, 2 is solid white)"
 #~ msgstr ""
-#~ "°õºþ¤¹¤ëÌÀ¤ë¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£\n"
-#~ "(0.0Êý¸þ: °Å¤¯ 2.0Êý¸þ: ÌÀ¤ë¤¯)"
+#~ "�刷�る明る�をセット���。\n"
+#~ "(0.0方�: 暗� 2.0方�: 明る�)"
 
 #~ msgid ""
 #~ "Enter the correct command to print to your printer. Note: Please do not "
 #~ "remove the `-l' or `-oraw' from the command string, or printing will "
 #~ "probably fail!"
 #~ msgstr ""
-#~ "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¸þ¤±¤Î°õºþ¥³¥Þ¥ó¥É¤òÆþÎϤ·¤Þ¤¹¡£¡ÚÃíµ­¡Û: '-l' ¤Þ¤¿¤Ï '-"
-#~ "oraw' ¥ª¥×¥·¥ç¥ó¤òºï½ü¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£°õºþ¤Ë¼ºÇÔ¤·¤Þ¤¹¡ª"
+#~ "�使��プリンタ����刷コマンドを入力���。�注記】: '-l' ��� '-"
+#~ "oraw' オプションを削除����下��。�刷�失敗����"
 
 #~ msgid "PPD File?"
-#~ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
+#~ msgstr "PPD ファイル���？"
 
 #~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "%s: オプション '%s' �体��使用����ん\n"
 
 #~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '--%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '--%s' ��引数�����\n"
 
 #~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%c%s' ¤Ë¤Ï°ú¿ô¤ÏÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '%c%s' ��引数�����\n"
 
 #~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+#~ msgstr "%s: オプション '%s' ��引数�必���\n"
 
 #~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '--%s'\n"
+#~ msgstr "%s: �明�オプション '--%s'\n"
 
 #~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: ÉÔÌÀ¤Ê¥ª¥×¥·¥ç¥ó '`%c%s'\n"
+#~ msgstr "%s: �明�オプション '`%c%s'\n"
 
 #~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+#~ msgstr "%s: �正�オプション -- %c\n"
 
 #~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: ¤ª¤«¤·¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+#~ msgstr "%s: ����オプション -- %c\n"
 
 #~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n"
+#~ msgstr "%s: オプション��引数�必��� -- %c\n"
 
 #~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ñÂΤǤϻÈÍѤǤ­¤Þ¤»¤ó\n"
+#~ msgstr "%s: オプション '-W %s' �体��使用����ん\n"
 
 #~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: ¥ª¥×¥·¥ç¥ó '-W %s' ¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+#~ msgstr "%s: オプション '-W %s' ��引数�����\n"
 
 #, fuzzy
 #~ msgid "Bright"
-#~ msgstr "ÌÀ¤ë¤µ:"
+#~ msgstr "明る�:"
 
 #, fuzzy
 #~ msgid "Image is too wide for the page\n"
-#~ msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
+#~ msgstr "用紙サイズを 100 ���場��比率��。"
 
 #, fuzzy
 #~ msgid "Full Bleed"
-#~ msgstr "¥í¡¼¥ë¼°µë»æ"
+#~ msgstr "ロール�給紙"
 
 #, fuzzy
 #~ msgid "traditional"
@@ -15926,10 +16160,10 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Optimize the settings for the type of image to be printed"
-#~ msgstr "°õºþ¤¹¤ë²èÁü¤Î¼ïÎफ¤é½ÐÎÏ·ë²Ì¤òºÇŬ²½¤·¤Þ¤¹¡£"
+#~ msgstr "�刷�る画��種類�ら出力�果を最�化���。"
 
 #~ msgid "Solid Colors"
-#~ msgstr "̵ÃϤο§"
+#~ msgstr "無地�色"
 
 #~ msgid "Stylus C20ux"
 #~ msgstr "Stylus C20ux"
@@ -15981,135 +16215,135 @@ msgstr ""
 #~ "WARNING: THIS FUNCTION IS NOT YET TESTED!  It may not work, and it may\n"
 #~ "damage your printer!\n"
 #~ msgstr ""
-#~ "¤´ÍøÍÑÁ°¤Ë¼¡¤ÎÀâÌÀ¤òÃí°Õ¿¼¤¯¤ªÆɤ߲¼¤µ¤¤¡£\n"
+#~ "�利用��次�説明を注�深��読�下��。\n"
 #~ "\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤Ï EPSON À½¤Î Stylus ¥¤¥ó¥¯¥¸¥§¥Ã¥È¼°¥×¥ê¥ó¥¿¤Î\n"
-#~ "¥«¥é¡¼°õºþ¥Ø¥Ã¥É¤ò°ìÎó¤Ëʤ٤Ƥ¯¤ì¤Þ¤¹¡£\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤ò»È¤¤¤¹¤®¤ë¤È¡¢°õºþ¤ÎÉʼÁ¤òÄã²¼¤µ¤»¥×¥ê¥ó¥¿¤Î¸Î¾ã¤Î¸¶°ø¤ò\n"
-#~ "°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï SEIKO EPSON ¼Ò¤Ç¥Æ¥¹¥È¤·¤¿¤ï¤±¤Ç"
-#~ "¤Ï¤Ê¤¤¤Î¤Ç\n"
-#~ "¡¢Á´¤¯ÌµÊݾڤǤ¹¡£¤³¤Î¥Ä¡¼¥ë¤Î¤´»ÈÍѤˤϤ´¼«¿È¤ÎÀÕǤ²¼¤Ç¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
+#~ "��ツール� EPSON 製� Stylus インクジェット�プリンタ�\n"
+#~ "カラー�刷ヘッドを一列�並���れ��。\n"
+#~ "��ツールを使���る���刷��質を低下��プリンタ�故障�原因を\n"
+#~ "引�起���能性��り��。��ツール� SEIKO EPSON 社�テスト�����"
+#~ "�����\n"
+#~ "�全�無�証��。��ツール��使用���自身�責任下�行��下��。\n"
 #~ "\n"
-#~ "¤³¤Î¥Ä¡¼¥ë¤Ï°ìËç¤ÎÍÑ»æ¤Ë %d ¸Ä¤Î¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤ò½Å¤Í°õºþ¤·¤Þ¤¹¡£\n"
-#~ "¤Ä¤Þ¤ê¡¢°ì¥Ñ¥¿¡¼¥ó°õºþ¤¹¤ë¤ÈÇӻ椹¤ë¤Î¤Ç¡¢Æ±¤¸ÍÑ»æ¤òµë»æ¤·¤ÆºÆÅÙ°õºþ¤·¤Þ"
-#~ "¤¹¡£\n"
-#~ "³Æ¥Ú¥¢¡¦¥é¥¤¥ó¤Î²¼¤Ë¤Ï %d ¤È %d ¤Î´Ö¤ò¼¨¤¹ \"¥Ú¥¢ÈÖ¹æ\" ¤¬¤¢¤ê¤Þ¤¹¡£\n"
+#~ "��ツール�一枚�用紙� %d 個�テストパターンを���刷���。\n"
+#~ "��り�一パターン�刷�る�排紙�る�����用紙を給紙���度�刷��"
+#~ "�。\n"
+#~ "�ペア・ライン�下�� %d � %d �間を示� \"ペア番�\" ��り��。\n"
 #~ "\n"
-#~ "¥Ñ¥¿¡¼¥ó¤ò´Ñ»¡¤¹¤ë¾ì¹ç¤Ï¡¢°ì¤Ä¤Î¥Ñ¥Ã¥Á¤¬³ê¤é¤«¤Ê (\"γ»Ò\" ¤Ë¶á¤¤) ¥Æ¥¯¥¹"
-#~ "¥Á¥ã\n"
-#~ "¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£¤½¤ÎÃ椫¤éºÇŬ¤Ê¥Ñ¥Ã¥Á¤òÁªÂò¤¹¤ë¤¿¤á¤Ë\n"
-#~ "Ãí°Õ¿¼¤¯´Ñ»¡¤·¤Æ²¼¤µ¤¤¡£¥Õ¥©¥ÈÍѤιâÉʼÁ¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍѻ桢¤¢¤ë¤¤¤Ï\n"
-#~ "¤½¤ì¤Ë»÷¤¿¹âÉʼÁ¤ÎÍÑ»æ¤ò»È¤Ã¤Æ¥Æ¥¹¥È¤¹¤ë¤³¤È¤ò¤ª¾©¤á¤·¤Þ¤¹¡£\n"
-#~ "¤â¤·³ê¤é¤«¤Ê¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢¤³¤Î¥Æ¥¹¥È¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "パターンを観察�る場���一��パッ��滑ら�� (\"粒�\" �近�) テクス"
+#~ "�ャ\n"
+#~ "�����る��を確���下��。��中�ら最��パッ�を�択�る���\n"
+#~ "注�深�観察��下��。フォト用�高�質インクジェット用紙��る��\n"
+#~ "�れ�似�高�質�用紙を使��テスト�る��を�奨����。\n"
+#~ "も�滑ら��パターン���場�����テストを繰り返��下��。\n"
 #~ "\n"
-#~ "¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤Î´Ñ»¡¤¬´°Î»¤·¤¿¤é¥Ñ¥Ã¥Á¤òÀöÂõ¤·¡¢\n"
-#~ "¤½¤Î¥×¥ê¥ó¥¿ÍѤˤ½¤ÎÀßÄê¤òÊݸ (s) ¤¹¤ë¤«¡¢¥Æ¥¹¥È¥Ñ¥¿¡¼¥ó¤òºÆ¤Ó¼Â¹Ô¤¹¤ë "
-#~ "(r) ¤«¡¢\n"
-#~ "Êݸ¤·¤Ê¤¤¤Ç½ªÎ» (q) ¤¹¤ë¤«ÁªÂò¤·¤Æ²¼¤µ¤¤¡£½ªÎ»¤·¤Æ¤â°ÊÁ°¤ÎÀßÄê¤ËÌá¤ê¤Þ¤»"
-#~ "¤ó¤¬¡¢\n"
-#~ "¥×¥ê¥ó¥¿¤ÎÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¸Â¤êÌ᤹¤³¤È¤Ï²Äǽ¤Ç¤¹¡£½ªÎ»¤·¤¿¾ì¹ç¤Ë¡¢\n"
-#~ "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
-#~ "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
+#~ "テストパターン�観察�完了��らパッ�を洗濯��\n"
+#~ "��プリンタ用���設定を�存 (s) �る��テストパターンを��実行�る "
+#~ "(r) ��\n"
+#~ "�存����終了 (q) �る��択��下��。終了��も以��設定�戻り��"
+#~ "ん��\n"
+#~ "プリンタ�電�を OFF �����り戻�����能��。終了��場���\n"
+#~ "�����設定を�存���場���も�一度��手順を行��下��。\n"
+#~ "��作業を行���る最中�電�を OFF �����下��。\n"
 #~ "\n"
-#~ "¡Ú·Ù¹ð¡Û: ¤³¤Îµ¡Ç½¤Ï¤Þ¤À¥Æ¥¹¥È¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢ Æ°ºî¤·¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»"
-#~ "¤ó¡ª\n"
-#~ "          ¤Þ¤¿¡¢¥×¥ê¥ó¥¿¸Î¾ã¤Î¸¶°ø¤Ë¤Ê¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡ª\n"
+#~ "�警告】: ��機能���テスト�������� 動作����も�れ��"
+#~ "ん�\n"
+#~ "          ���プリンタ故障�原因��る�も�れ��ん�\n"
 
 #~ msgid "Printer %s does not require color head alignment.\n"
-#~ msgstr "¥×¥ê¥ó¥¿ %s ¤Ï¥«¥é¡¼¡¦¥Ø¥Ã¥É´Ö³Ö¤ÏɬÍפ¢¤ê¤Þ¤»¤ó¡£\n"
+#~ msgstr "プリンタ %s �カラー・ヘッド間隔�必��り��ん。\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "Please inspect the print, and choose the pattern in each set.\n"
 #~ "Type a pattern number, '?' for help, or 'r' to repeat the procedure.\n"
 #~ msgstr ""
-#~ "°õºþ·ë²Ì¤ò³Îǧ¤·¤Æ¡¢³Æ¥Ñ¥¿¡¼¥ó¤ÇºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
-#~ "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·"
-#~ "¤Þ¤¹¡£\n"
+#~ "�刷�果を確�����パターン�最��ライン�ペアを�択��下��。\n"
+#~ "��ペア�番�を入力��'r' ���設定を�り�����'?' �ヘルプを表示�"
+#~ "��。\n"
 
 #, fuzzy
 #~ msgid "Model %d out of range.\n"
-#~ msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
+#~ msgstr "範囲外�ペア番����\n"
 
 #~ msgid "Right Border:"
-#~ msgstr "±¦Â¦¤Î±ï:"
+#~ msgstr "����:"
 
 #~ msgid "Bottom Border:"
-#~ msgstr "²¼Â¦¤Î±ï:"
+#~ msgstr "下���:"
 
 #~ msgid "Size"
-#~ msgstr "²èÁü¤Î¥µ¥¤¥º"
+#~ msgstr "画��サイズ"
 
 #~ msgid "Image / Output Settings"
-#~ msgstr "²èÁü / ½ÐÎÏÀßÄê"
+#~ msgstr "画� / 出力設定"
 
 #, fuzzy
 #~ msgid "GIMP-print"
-#~ msgstr "°õºþ"
+#~ msgstr "�刷"
 
 #, fuzzy
 #~ msgid "Resolutions"
-#~ msgstr "²òÁüÅÙ"
+#~ msgstr "解�度"
 
 #~ msgid "Media Type:"
-#~ msgstr "ÍÑ»æ¤Î¼ïÎà:"
+#~ msgstr "用紙�種類:"
 
 #~ msgid "Type of media you're printing to"
-#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¼ïÎà¤Ç¤¹¡£"
+#~ msgstr "�刷�る用紙�種類��。"
 
 #~ msgid "Size of paper that you wish to print to"
-#~ msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
+#~ msgstr "�刷�る用紙�サイズ��。"
 
 #~ msgid "Media Source:"
-#~ msgstr "µë»æÊýË¡:"
+#~ msgstr "給紙方法:"
 
 #~ msgid "Source (input slot) of media you're printing to"
-#~ msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
+#~ msgstr "�刷時�給紙方���。"
 
 #~ msgid "Ink Type:"
-#~ msgstr "¥¤¥ó¥¯¤Î¼ïÎà:"
+#~ msgstr "インク�種類:"
 
 #~ msgid "Resolution:"
-#~ msgstr "²òÁüÅÙ:"
+#~ msgstr "解�度:"
 
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr ""
-#~ "¹õ¿§¤ÈÇò¿§¤ò»È¤Ã¤Æ°õºþ¤·¤Þ¤¹ (¥«¥é¡¼¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£±Æ¤âÉÕ¤­¤Þ¤»¤ó)¡£"
+#~ "黒色�白色を使���刷��� (カラー���り��ん。影も付���ん)。"
 
 #~ msgid "Fastest and brightest color for text and line art"
-#~ msgstr "¥Æ¥­¥¹¥È¤ä¥é¥¤¥ó¥¢¡¼¥È¸þ¤±¤Ë°ìÈÖÌÀ¤ë¤¯¹â®°õºþ¤·¤Þ¤¹¡£"
+#~ msgstr "テキストやラインアート���一番明る�高速�刷���。"
 
 #~ msgid "Best for images dominated by regions of solid color"
-#~ msgstr "³Ê»Ò¾å¤Î¿§¤Ç¹½À®¤µ¤ì¤¿²èÁü¤òºÇŬ²½¤·¤Þ¤¹¡£"
+#~ msgstr "格�上�色�構��れ�画�を最�化���。"
 
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
 #~ msgstr ""
-#~ "Ä㮤Ǥ¹¤¬¡¢Ï¢Â³¤·¤¿¥È¡¼¥ó²èÁü¤ä¼Ì¿¿¸þ¤±¤Ë¤â¤Ã¤È¤âÀºÌ©¤Ç³ê¤é¤«¤Ë¤·¤Þ¤¹¡£"
+#~ "低速����連続��トーン画�や写真���も��も精密�滑ら�����。"
 
 #~ msgid "Dither Algorithm:"
-#~ msgstr "¥Ç¥£¥¶¥ê¥ó¥°Êý¼°:"
+#~ msgstr "ディザリング方�:"
 
 #~ msgid ""
 #~ "\n"
 #~ "Cannot read from %s: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
+#~ "%s �ら読�込���ん: %s\n"
 
 #~ msgid "%s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "%s ¤ÎÈϰϤò±Û¤¨¤Þ¤·¤¿ (¸½ºß¤ÎÃÍ %f, ºÇ¾® %f, ºÇÂç %f)\n"
+#~ msgstr "%s �範囲を越���� (�在�値 %f, 最� %f, 最大 %f)\n"
 
 #~ msgid "%s is not a valid dither algorithm\n"
-#~ msgstr "%s ¤ÏŬÀڤʥǥ£¥¶Êý¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+#~ msgstr "%s ��切�ディザ方����り��ん\n"
 
 #~ msgid ""
 #~ "Please re-insert the same alignment sheet in the printer when it is\n"
 #~ "finished printing.\n"
 #~ msgstr ""
-#~ "°õºþ¤¬´°Î»¤·¤¿¤é¡¢\n"
-#~ "ºÆÅÙ¡¢¥×¥ê¥ó¥¿¤ËÁ°¤Ë»ÈÍѤ·¤¿´Ö³ÖÊäÀµÍÑ»æ¤òÁÞÆþ¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ "�刷�完了��ら�\n"
+#~ "�度�プリンタ���使用��間隔補正用紙を挿入��下��。\n"
 
 #~ msgid ""
 #~ "Inspect the alignment sheet, and determine which pattern is the "
@@ -16119,31 +16353,31 @@ msgstr ""
 #~ "best pattern, and repeat the procedure.\n"
 #~ "Type a pattern number, or '?' for help.\n"
 #~ msgstr ""
-#~ "´Ö³ÖÊäÀµÍÑ»æ¤ò³Îǧ¤·¡¢¤É¤Î¥Ñ¥¿¡¼¥ó¤¬°ìÈ֤ʤá¤é¤«¤Ç¤¢¤ë¤«¤ò¥Á¥§¥Ã¥¯¤·¤Æ²¼¤µ"
-#~ "¤¤¡£\n"
-#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤Ë¤Ï°ìÈÖ¾®¤µ¤¤ \"grain\" ¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£\n"
-#~ "¤½¤Î¤è¤¦¤Ê¥Ñ¥¿¡¼¥ó¤ò³Îǧ¤Ç¤­¤Ê¤¤¾ì¹ç¤Ï¡¢¤â¤Ã¤È¤âºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÁªÂò"
-#~ "¤·¡¢\n"
-#~ "¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
-#~ "¥Ñ¥¿¡¼¥ó¤ÎÈÖ¹æ¤òÆþÎϤ·¤Æ²¼¤µ¤¤ ('?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹)¡£\n"
+#~ "間隔補正用紙を確�����パターン�一番��ら���る�を�ェック��下�"
+#~ "�。\n"
+#~ "��よ��パターン��一番��� \"grain\" �表示�れ��。\n"
+#~ "��よ��パターンを確�����場���も��も最��パターン�番�を�択"
+#~ "��\n"
+#~ "��手順を繰り返��下��。\n"
+#~ "パターン�番�を入力��下�� ('?' �ヘルプを表示���)。\n"
 
 #~ msgid "The best pattern should be numbered between 1 and %d.\n"
-#~ msgstr "ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
+#~ msgstr "最��パターン� 1 � %d �間�番����下��。\n"
 
 #~ msgid "Set the contrast of the print"
-#~ msgstr "°õºþ»þ¤Î¥³¥ó¥È¥é¥¹¥È¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
+#~ msgstr "�刷時�コントラストをセット���。"
 
 #~ msgid "Cyan:"
-#~ msgstr "¥·¥¢¥ó:"
+#~ msgstr "シアン:"
 
 #~ msgid "Magenta:"
-#~ msgstr "¥Þ¥¼¥ó¥¿:"
+#~ msgstr "マゼンタ:"
 
 #~ msgid "Yellow:"
-#~ msgstr "²«¿§:"
+#~ msgstr "黄色:"
 
 #~ msgid "Parameter %s out of range (value %f, min %f, max %f)\n"
-#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %f, ºÇ¾®ÃÍ %f, ºÇÂçÃÍ %f)\n"
+#~ msgstr "パラメータ %s �範囲外�� (値 %f, 最�値 %f, 最大値 %f)\n"
 
 #~ msgid "Parameter %s out of range (value %d, min %d, max %d)\n"
-#~ msgstr "¥Ñ¥é¥á¡¼¥¿ %s ¤ÏÈϰϳ°¤Ç¤¹ (ÃÍ %d, ºÇ¾®ÃÍ %d, ºÇÂçÃÍ %d)\n"
+#~ msgstr "パラメータ %s �範囲外�� (値 %d, 最�値 %d, 最大値 %d)\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 158b452..990c3eb 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index cb07f39..ef89a94 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -133,188 +133,208 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Størrelse"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Raskt heltall"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Blekktype"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Type blekk i skriveren"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -322,7 +342,7 @@ msgstr ""
 msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -330,102 +350,82 @@ msgstr "Lys cyan"
 msgid "Light Magenta Transition"
 msgstr "Lys magenta"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egendefinert"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "Utskriftstype:"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Begge"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -474,154 +474,197 @@ msgstr "Begge"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Sort"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografi"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Utskriftstype:"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -657,7 +700,7 @@ msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -674,11 +717,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -788,8 +831,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -841,178 +884,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1021,8 +1064,8 @@ msgid "Adjust the cyan gamma"
 msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1074,178 +1117,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1254,8 +1297,8 @@ msgid "Adjust the magenta gamma"
 msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1307,178 +1350,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Gul"
 
@@ -1487,18 +1530,18 @@ msgid "Adjust the yellow gamma"
 msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1515,14 +1558,14 @@ msgid "Adjust the green gamma"
 msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1534,7 +1577,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1542,7 +1585,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1551,7 +1594,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
@@ -1853,11 +1896,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Blekktype"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1866,14 +1904,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1883,7 +1913,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Utskriftstype:"
@@ -2271,143 +2301,151 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Magenta"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Sett til standardverdier"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Raskt heltall"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Vanlig papir"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2461,104 +2499,104 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2877,25 +2915,18 @@ msgstr "Manuell uten pause"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
@@ -2904,33 +2935,33 @@ msgstr "Matt papir"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2962,7 +2993,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuell"
 
@@ -3052,28 +3083,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Høyde:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografi"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -3105,15 +3128,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Egendefinert"
 
@@ -3121,7 +3144,7 @@ msgstr "Egendefinert"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3130,35 +3153,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3860,124 +3886,124 @@ msgstr "Skriv ut"
 msgid "(Default Printer)"
 msgstr "Sett opp skriver"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Innstillinger for parametere"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Utskriftstype:"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "Skuff 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "Skuff 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "Skuff 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "Skuff 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Norwegian"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Mediestørrelse:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Farger"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Gråtoner"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Farger"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY-farge"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4159,28 +4185,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke lese fra %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Skriverstatus krever bruk av en rå enhet.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Ukjent flagg %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4189,7 +4215,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4200,7 +4226,7 @@ msgstr ""
 "Kan ikke finne skrivertype.\n"
 "Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4242,23 +4268,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4280,84 +4306,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4379,116 +4405,116 @@ msgstr "Lys cyan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4530,338 +4556,338 @@ msgstr "Sort"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matt papir"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Sort"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Størrelse"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Metning:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Feil i inndata\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Feil i inndata\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Feil i inndata\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Skrivernavn:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Blekkfarge"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Prosent gjenstående"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoder...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4900,7 +4926,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4936,17 +4962,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4958,20 +4984,20 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -4980,7 +5006,7 @@ msgstr ""
 "OK, skriveren er justert, men justeringen er ikke lagret.\n"
 "Hvis du ønsker å lagre justeringen må d\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -4989,12 +5015,12 @@ msgstr ""
 "Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
 "skrive «r»:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5004,44 +5030,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "I ferd med å lagre innstillinger..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "feilet!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "fullført!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Innstillingene for justering er lagret til skriveren.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Siste kommando ble ikke bekreftet.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5052,12 +5078,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Trykk linjeskift for å fortsette > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5065,42 +5091,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Gjennomgang #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vennligst sett inn et nytt ark.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Tallet er utenfor gyldig område!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Kan ikke forstå det du skrev inn!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver å sette justering..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "fullført.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5109,11 +5135,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Feil i inndata\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Fil/Skriv ut..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Skriver ut..."
@@ -5382,21 +5417,21 @@ msgstr "Skriver ut..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5425,7 +5460,7 @@ msgstr "Matt papir"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Postkort"
 
@@ -5721,29 +5756,29 @@ msgstr "Glanset fotopapir"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6105,8 +6140,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
@@ -6182,8 +6217,8 @@ msgstr "Stylus Photo"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6196,10 +6231,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6341,6 +6376,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6402,6 +6438,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "2400x600 DPI"
@@ -6463,6 +6500,7 @@ msgstr "2400x600 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6591,7 +6629,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "150x150 DPI"
@@ -6671,6 +6710,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
@@ -6708,13 +6748,14 @@ msgstr "150x150 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
@@ -6737,6 +6778,7 @@ msgstr "Gul"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
@@ -6821,8207 +6863,8833 @@ msgstr "Lys magenta"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Skuff"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografi"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Skuff"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapir"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Skuff 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Skuff 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Skuff 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Skuff 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Skuff 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Matt papir"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Sett til standardverdier"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Gråtoner"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 invitasjon"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Konvolutt"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Konvolutt"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkort"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
-msgid "Canon S800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6855
+msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6856
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S830D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXUS iP2700"
+msgid "Canon PIXMA iP2700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Canon i80"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
 msgid "Canon i865"
-msgstr ""
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20ux"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Sett opp skriver"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
+#: src/xml/xmli18n-tmp.h:8526
 #, fuzzy
-msgid "Canon SELPHY-CP-520"
+msgid "Canon SELPHY-CP400"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8527
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
+#: src/xml/xmli18n-tmp.h:8531
 #, fuzzy
-msgid "Canon SELPHY-CP-730"
+msgid "Canon SELPHY-CP710"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
+#: src/xml/xmli18n-tmp.h:8533
 #, fuzzy
-msgid "Canon SELPHY-CP-750"
+msgid "Canon SELPHY-CP740"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8534
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
+msgid "Canon SELPHY-CP750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Utskriftstype:"
 
@@ -15309,9 +15977,6 @@ msgstr ""
 #~ msgid "CMYK Color"
 #~ msgstr "CMYK-farge"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Fil/Skriv ut..."
-
 #, fuzzy
 #~ msgid "Gutenprint"
 #~ msgstr "testutskrift"
diff --git a/po/nl.gmo b/po/nl.gmo
index 7b14e25..f4ff6ad 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index b6979e5..fe9ee02 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,28 +1,28 @@
-# translation of gutenprint-5.2.3.99.1.nl.po to Dutch
+# translation of gutenprint-20110308.nl.po to Dutch
 # Dutch translations for gutenprint.
 # 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, 2009.
+# Freek de Kruijf <f.de.kruijf@gamil.com>, 2006, 2007, 2008, 2009, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint 5.2.3.99.1\n"
+"Project-Id-Version: gutenprint 20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-0400\n"
-"PO-Revision-Date: 2009-06-14 23:06+0200\n"
-"Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
+"PO-Revision-Date: 2011-07-09 22:52+0200\n"
+"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\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 1.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Standaard"
 
@@ -145,284 +145,284 @@ msgstr "Kleurconversie-module"
 msgid "Dither algorithm"
 msgstr "Ruis-algoritme"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Paginagrootte"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Type medium"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type medium (blanco papier, fotopapier, etc.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Bronmedium"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Bronmedium (invoerpoort)"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Binnenafmeting CD-printdeel"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Druk af op het printdeel van de CD of helemaal tot het gat"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "CD-grootte (handmatig)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Variabele aanpassing van de buitendiameter van de CD"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "Afmeting van CD-printdeel (handmatig)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Schaal de afdruk tot de afmeting van de binnenrand van de CD"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Horizontale fijnafstelling van CD"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Fijnafstelling van de horizontale positie voor het printen op een CD"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "Verticale fijnafstelling van CD"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type inkt"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Inktkanalen"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Wijze van printen"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Manier van printen"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Inktsetje"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Type inkt van de printer"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Zonder randen"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Afdrukken zonder randen"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Duplex/Omkeer stand"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Printkwaliteit"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Hoeveelheid cyaan"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Hoeveelheid magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Hoeveelheid geel"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Hoeveelheid zwart"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Lichtcyaan-overgang"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Lichtmagenta-overgang"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Lichtgeel-overgang"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Uit"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Lange zijde (standaard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - handmatig"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Afdrukken naar tussenstation"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Handmatige controle"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standaard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Beide"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -471,154 +471,195 @@ msgstr "Beide"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Zwart"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Geen"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Handmatige controle"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standaard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Hoge nauwkeurigheid"
@@ -652,7 +693,7 @@ msgid "Pre-Dithered"
 msgstr "Voorbehandeld met ruis-algoritme"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Grijsschaal"
 
@@ -668,11 +709,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -774,8 +815,8 @@ msgid "Gamma value assumed by application"
 msgstr "De gammawaarde die verondersteld wordt door de applicatie"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -827,178 +868,178 @@ msgstr "De gammawaarde die verondersteld wordt door de applicatie"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -1007,8 +1048,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1060,178 +1101,178 @@ msgstr "Pas de hoeveelheid cyaan aan"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1240,8 +1281,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1293,178 +1334,178 @@ msgstr "Pas de hoeveelheid magenta aan"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Geel"
 
@@ -1473,18 +1514,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Rood"
 
@@ -1501,14 +1542,14 @@ msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid groen aan"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Blauw"
 
@@ -1520,7 +1561,7 @@ msgstr "Pas de hoeveelheid blauw aan"
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Cyaanwaarde"
 
@@ -1528,7 +1569,7 @@ msgstr "Cyaanwaarde"
 msgid "Adjust the cyan gray balance"
 msgstr "Pas de cyaan-grijsbalans aan"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Magentawaarde"
 
@@ -1536,7 +1577,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Geelwaarde"
 
@@ -1803,11 +1844,11 @@ msgstr "Automatische printmodus"
 
 #: src/main/print-escp2.c:222
 msgid "CD Allow Other Media Sizes"
-msgstr ""
+msgstr "CD Sta andere media-afmetingen toe"
 
 #: src/main/print-escp2.c:223
 msgid "Allow non-CD media sizes when printing to CD"
-msgstr ""
+msgstr "Niet-cd media-afmetingen toestaan bij afdrukken naar cd"
 
 #: src/main/print-escp2.c:229 src/main/print-pcl.c:1371
 msgid "Resolution of the print"
@@ -1821,10 +1862,6 @@ msgstr "Verhoogde glans"
 msgid "Add gloss enhancement"
 msgstr "Voeg glansverhoging toe"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Inktsetje"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Richting van het afdrukken"
@@ -1835,14 +1872,6 @@ msgstr ""
 "Richting van het afdrukken (unidirectioneel geeft hogere kwaliteit, echter "
 "langzamer)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Zonder randen"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Afdrukken zonder randen"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Interleave methode"
@@ -1852,7 +1881,7 @@ msgid "Interleave pattern to use"
 msgstr "Te gebruiken interleave patroon"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Volgorde van uitvoer"
 
@@ -1897,9 +1926,8 @@ msgid "Raw Channel Names"
 msgstr "Raw-kanaalnamen"
 
 #: src/main/print-escp2.c:335 src/main/print-escp2.c:336
-#, fuzzy
 msgid "Channel Names"
-msgstr "Raw-kanaalnamen"
+msgstr "Kanaalnamen"
 
 #: src/main/print-escp2.c:348
 msgid "Raw Channel Count"
@@ -2188,136 +2216,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Hextoongrijs-1-schaal (lichtst)"
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Droogtijd per pagina"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Stel droogtijd per pagina in"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Droogtijd per scan"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Stel droogtijd per scan in"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimale droogtijd per scan"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Stel minimale droogtijd per scan in"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Kwaliteitsverbetering"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Verbeter de kwaliteit door meerdere doorgangen"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Papierdikte"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Stel de papierdikte van de printer in"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Zuigkracht"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Stel zuigkracht in"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Invoer-volgorde"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Stel de invoer-volgorde in (printerspecifiek)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Wijze van printen"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Stel de wijze van printen in (printerspecifiek)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Kophoogte"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Stel kophoogte in (printerspecifiek)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Invoerafstelling"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Stel de invoerafstelling in (0,01% units)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Volledig handmatige controle"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Automatische controle op instellingen"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Bidirectioneel"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Unidirectioneel"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Afwisselend opvullen"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Oplopend vullen"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Aflopend vullen"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Dubbel oplopend"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vermijden van naaste buur"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print opties niet geverifiëerd; kan niet printen.\n"
@@ -2371,104 +2407,104 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr "Vierkleuren standaard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr "Driekleuren composiet"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr "Zeskleuren foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Vijfkleuren foto composiet"
 
@@ -2787,24 +2823,17 @@ msgstr "Handmatig zonder pauze"
 msgid "Coated"
 msgstr "Gecoat"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Geen"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Glanzend"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Oppervlaktestructuur"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Mat"
 
@@ -2812,32 +2841,32 @@ msgstr "Mat"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Laagjespatroon"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Aanpassing van uitvoerniveau"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Pas de cyaanbalans aan"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Pas de magentabalans aan"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Pas de geelbalans aan"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Zwartbalans"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Pas de zwartbalans aan"
 
@@ -2869,14 +2898,13 @@ msgstr "Sneldrogend foto"
 msgid "Quick-dry Transparency"
 msgstr "Sneldrogende transparant"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Handmatig"
 
 #: src/main/print-pcl.c:239
-#, fuzzy
 msgid "Manual - Movable Guides"
-msgstr "Lade 1 - Verplaatsbare geleiders"
+msgstr "Handmatig - verplaatsbare geleiders"
 
 #: src/main/print-pcl.c:241
 msgid "Tray 1 - Movable Guides"
@@ -2959,26 +2987,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Proefdruk"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Hoog"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Foto"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Kleur + Zwarte patronen"
@@ -3007,15 +3028,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:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Gebruiker"
 
@@ -3024,7 +3045,7 @@ msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Afmeting van afbeelding moet overeenkomen met de afmetingen van het papier"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Fatale fout!"
 
@@ -3035,33 +3056,36 @@ msgstr ""
 "Gaarne de bovenstaande informatie rapporteren aan gimp-print-devel@lists."
 "sourceforge.net"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Snel en zuinig"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Zuinig"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Het best"
 
@@ -3751,113 +3775,113 @@ msgstr "Printer"
 msgid "(Default Printer)"
 msgstr "(Standaard printer)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Printermogelijkheden"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Controle op uitvoer"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Gezamelijk"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Engels"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Afmetingen van het medium"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Kleurmodel"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Omgekeerde grijsschaal"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "RGB-kleur"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY-kleur"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Kleurprecisie"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Nee"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Waarde"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Fijnafstelling"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Omkeren"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 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:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Verkleinen (de gehele pagina afdrukken)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Afsnijden (behoud de afmetingen)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Vergroot (gebruik de gehele pagina)"
 
@@ -4146,28 +4170,28 @@ msgstr "Lezen van de printer duurt te lang\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan niet lezen van %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Specificeer een raw-apparaat\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan %s niet openen lezen/schrijven: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Onbekende printer %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan niet schrijven naar %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4176,7 +4200,7 @@ msgstr ""
 "\n"
 "Kan niet schrijven naar %s:%s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4187,7 +4211,7 @@ msgstr ""
 "Kan printer type niet vaststellen.\n"
 "Gebruik -m om uw printermodel te specificeren.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4229,22 +4253,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Fotozwart"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4266,83 +4290,83 @@ msgstr "Onbekend"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Lichtcyaan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4364,114 +4388,114 @@ msgstr "Lichtcyaan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Lichtmagenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Grijs"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4513,154 +4537,154 @@ msgstr "Grijs"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Matzwart"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Glansverbeteraar"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Lichtgrijs"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fout\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Status: Zelfstandig aan het printen\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Bezig\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: In de wacht\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Idle\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: In pauze\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Aan het schoonmaken\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Status: Fabrieksinstelling\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Aan het afsluiten\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fout: fatale fout\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Fout: Het andere interface is gekozen\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Fout: Deksel is open\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Fout: Papier zit vast\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fout: Geen inkt\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fout: geen papier\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Fout: Een of andere papierfout\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Fout: Overflow met onderhoudscartidge\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Fout: Wacht op signaal van de afscheurplek\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Fout: in tweezijdige doorvoer\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4669,183 +4693,183 @@ msgstr ""
 "Fout: Inktcartridgehendel losgezet\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Fout: Onherstelbare fout in snij-instrument\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Fout: Herstelbaar snij-instrument zit vast\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Fout: Geen onderhoudscartridge aanwezig\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Fout: Achterdeksel is open\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Fout: Geen CD-lade aanwezig\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fout: Laden van een kaart gaat fout\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Fout: Ladedeksel is open\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Fout: Deksel van onderhoudscartidge is open\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Fout: Deksel aan de voorkant is open\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Fout: Onderhoudsverzoek\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fout: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Waarschuwing: %s inkt staat laag\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Waarschuwing: Inkt in kanaal %d staat laag\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Waarschuwing: %s schoonmaken uitgezet\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Waarschuwing: Kanaal %d schoonmaken\n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Waarschuwing: Onderhoudscartridge bijna vol\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Waarschuwing: Onderhoudsverzoek in behandeling\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Waarschuwing: Onbekend (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Spuitmondjes zelftest\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Printernaam: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Inktniveau's:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Inktkleur"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Percentage nog aanwezig"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Jobnaam: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "inktniveau's"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Verkrijgen van %s vereist een 'raw' apparaat.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Het verkrijgen van uitgebreide inktinformatie vereist een 'raw' apparaat.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Inktcartridge"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Nummer van onderdeel"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Het identificeren van het printermodel vereist een 'raw' apparaat.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan het printermodel niet identificeren.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Bezig met het schoonmaken van de koppen..\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Bezig met het controleren van de spuitmondjes, let op dat er papier in de "
 "printer zit.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4923,7 +4947,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4999,18 +5023,18 @@ msgstr ""
 "tijdens deze procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 "Onmogelijk om commando's naar de printer te sturen, bezig te stoppen.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Bezig te stoppen\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5029,13 +5053,13 @@ msgstr ""
 "U krijgt daarna de vraag uw keuze te bevestigen.\n"
 "Wat wilt u doen (s,q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5043,7 +5067,7 @@ msgstr ""
 "Graag bevestiging dat u wilt stoppen zonder te bewaren door opnieuw 'q' te "
 "typen:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5052,7 +5076,7 @@ msgstr ""
 "OK, uw printer is uitgelijnt, maar de uitlijning is niet bewaard.\n"
 "Als u de uitlijning wilt bewaren, moet u het proces herhalen.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5061,12 +5085,12 @@ msgstr ""
 "Graag bevestiging dat u het uitlijnproces wilt herhalen door\n"
 "het typen van een 'r':\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Herhaal de uitlijnprocedure.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5081,17 +5105,17 @@ msgstr ""
 "Graag bevestigen door 's' opnieuw in te typen om de instellingen\n"
 "in uw printer te bewaren:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Bezig met wegschrijven van instellingen..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "mislukt!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5100,27 +5124,27 @@ msgstr ""
 "Uw instellingen werden niet succesvol weggeschreven. U moet de\n"
 "uitlijnprocedure herhalen.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "gelukt!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Uw uitlijn-instellingen zijn bewaard door de printer.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Onbekend commando.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Laatste commando is niet bevestigd.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5137,12 +5161,12 @@ msgstr ""
 "Zet een vel papier in uw printer om te beginnen met de\n"
 "procedure voor het uitlijnen van de koppen.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Druk op enter om door te gaan > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5152,42 +5176,42 @@ msgstr ""
 "Kijk naar de afdruk, en kies het beste paar lijnen in elk patroon.\n"
 "Tik een paar-nummerin, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Stap #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Voer een nieuw vel papier in.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nummer valt buiten bereik!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Begrijp niet wat u zonjuist ingetikt hebt!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Probeert de uitlijning in te stellen..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "gelukt.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5201,11 +5225,20 @@ msgstr ""
 "lijnpatroon %d is. Als dat niet zo is dan zult u de procedure moeten\n"
 "herhalen om de beste kwaliteit te krijgen.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Fout in de invoer\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Afdrukken zonder randen"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Bezig met afdrukken..."
@@ -5474,21 +5507,21 @@ msgstr "Bezig met afdrukken..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "EPSON standaard inkt"
 
@@ -5516,7 +5549,7 @@ msgstr "Helder wit papier"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Briefkaart"
 
@@ -5802,29 +5835,29 @@ msgstr "Premium luster fotopapier 250 wt"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Viertonig"
 
@@ -6184,8 +6217,8 @@ msgstr "Waterverfpapier - stralend wit"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
@@ -6260,8 +6293,8 @@ msgstr "UltraChrome Photo Black"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome Matte Black"
 
@@ -6274,10 +6307,10 @@ msgstr "UltraChrome Matte Black"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr "Hextonig"
 
@@ -6418,6 +6451,7 @@ msgstr "360 DPI hoge kwaliteit"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6478,6 +6512,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6538,6 +6573,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6663,7 +6699,8 @@ msgstr "720 DPI hoge kwaliteit"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6741,6 +6778,7 @@ msgstr "2880 x 720 DPI hoogste kwaliteit"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6777,12 +6815,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Donkergeel"
 
@@ -6804,6 +6843,7 @@ msgstr "Donkergeel"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6877,7835 +6917,8257 @@ msgstr "Levendig lichtmagenta"
 msgid "Vivid Magenta"
 msgstr "Levendig magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Hoofdlade"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Fotolade"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Afdrukken naar CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Lade aan achterzijde"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Lade aan voorzijde"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Handmatige toevoer"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Aanvoer vanaf rol (snij elke pagina af)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Aanvoer vanaf rol (niet afsnijden)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Handmatige papiergeleider"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Handmatige toevoer (voorzijde)"
 
-#: src/xml/xmli18n-tmp.h:4138
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
-msgstr "Aanvoer vanaf rol (niet afsnijden)"
+msgstr "Aanvoer vanaf rol (zonder rand met een enkele snede)"
 
-#: src/xml/xmli18n-tmp.h:4139
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
-msgstr "Aanvoer vanaf rol (niet afsnijden)"
+msgstr "Aanvoer vanaf rol (zonder rand met een dubbele snede)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Fotobord"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Lade 1 voor vellen"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Lade 2 voor vellen"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch selecteren van vellen"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Handmatig selecteren"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Enkelkleur 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Driekleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Vierkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Vijfkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Zeskleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "Grijs 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "Grijs 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "Grijs 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr "MIS Viertonig"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr "MIS Zestonig"
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "Grijs 5"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "Grijs 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enkelkleur 'raw' verbeterde glans"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Driekleuren 'raw' glanzend"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Vierkleuren 'raw' glanzend"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Zeskleuren verbeterde glans 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Zevenkleuren verbeterde glans 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "Matzwart"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Standaard zwart"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Zevenkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Zeskleuren verbeterde samenstelling"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Zevenkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Grijsschaal met twee waarden"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Tweekleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Achtkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Achtkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Vierkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Interleave"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Volledige overlap"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Viermaal een doorgang"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Volledige overlap 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Interleave 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Achtmaal doorgang"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Aan"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:6618
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6641
 msgid "L"
-msgstr "DL"
+msgstr "L"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
-msgstr ""
+msgstr "KG"
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapier (afscheurranden)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson L fotopapier (afscheurranden)"
 
-#: src/xml/xmli18n-tmp.h:6623
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6646
 msgid "4x8"
-msgstr "4x6"
+msgstr "4x8"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
-msgstr ""
+msgstr "2L"
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
-msgstr ""
+msgstr "Rokukire"
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
-msgstr ""
+msgstr "YonKire"
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
-msgstr ""
+msgstr "HanKire"
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0-landschap"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1-landschap"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2-landschap"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3-landschap"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4-landschap"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5-landschap"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4-landschap"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6-landschap"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL-landschap"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6-landschap"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7-landschap"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8-landschap"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9-landschap"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10-landschap"
 
-#: src/xml/xmli18n-tmp.h:6723
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
-msgstr "A5"
+msgstr "EA5"
 
-#: src/xml/xmli18n-tmp.h:6724
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
-msgstr "C5-landschap"
+msgstr "EA5-landschap"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Smalle paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin smalle paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin grootte paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki Kaart"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku Kaart"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japanese lange envelop #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanse lange envelop #3 - landschap"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japanse lange envelop #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanse lange envelop #4 - landschap"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japanse lange envelop #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japanse lange envelop #4 - landschap"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japanese lange envelop #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japanse lange envelop #3 - landschap"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanse Kaku-envelop #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanse Kaku-envelop #4 - landschap"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 - landschap"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarch envelop"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Monarch-envelop - landschap"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
-msgstr ""
+msgstr "Breedte 101,6x180,6"
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Kaart"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Brede briefkaart"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:6771
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6799
 msgid "A3+"
-msgstr "A3"
+msgstr "A3+"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm papierrol"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm papierrol"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 inch paperrol"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini320"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4700"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
 #, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
 #, fuzzy
-msgid "Canon PIXMA MP250"
+msgid "Canon PIXMA MP240"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6922
+msgid "Canon PIXMA MP250"
+msgstr "Canon PIXMA MP250"
+
+#: src/xml/xmli18n-tmp.h:6923
 #, fuzzy
-msgid "Canon PIXMA MP270"
+msgid "Canon PIXMA MP260"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6870
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6924
+msgid "Canon PIXMA MP270"
+msgstr "Canon PIXMA MP270"
+
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
-msgstr "Canon PIXMA MP220"
+msgstr "Canon PIXMA MP280"
 
-#: src/xml/xmli18n-tmp.h:6871
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6872
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP370"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
 #, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
-msgstr "Canon PIXMA MP730"
+msgstr "Canon PIXMA MP390"
 
-#: src/xml/xmli18n-tmp.h:6874
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP450"
 
-#: src/xml/xmli18n-tmp.h:6875
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP460"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
 #, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
-msgstr "Canon PIXMA MP180"
+msgstr "Canon PIXMA MP480"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
 #, fuzzy
-msgid "Canon PIXMA MP493"
-msgstr "Canon PIXMA MP150"
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
+msgid "Canon PIXMA MP493"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP510"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
 #, fuzzy
-msgid "Canon PIXMA MP540"
+msgid "Canon PIXMA MP530"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6941
+msgid "Canon PIXMA MP540"
+msgstr "Canon PIXMA MP540"
+
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
-msgstr "Canon PIXMA MP500"
+msgstr "Canon PIXMA MP550"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
 #, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 msgid "Canon PIXMA MP600"
-msgstr "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
-msgstr "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
-msgstr "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
-msgstr "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
 #, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6902
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6965
 msgid "Canon PIXMA MP960"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP960"
 
-#: src/xml/xmli18n-tmp.h:6903
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP970"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6905
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
 #, fuzzy
-msgid "Canon PIXMA MG5100"
-msgstr "Canon PIXMA MP500"
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6973
 #, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
+msgid "Canon PIXMA MG5100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6976
 msgid "Canon PIXMA MG5200"
-msgstr "Canon PIXMA MP500"
+msgstr "Canon PIXMA MG5200"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
 #, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
 msgid "Canon PIXMA MG6100"
-msgstr "Canon PIXMA MP610"
+msgstr "Canon PIXMA MG6100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
 #, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
 msgid "Canon PIXMA MG8100"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MG8100"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
 #, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6913
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
 #, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX330"
 
-#: src/xml/xmli18n-tmp.h:6915
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6916
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MX350"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
 #, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
 msgid "Canon PIXMA MX700"
-msgstr "Canon PIXMA MP700"
+msgstr "Canon PIXMA MX700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
 #, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6922
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
-msgstr "Canon PIXMA MP160"
+msgstr "Canon PIXMA MX860"
 
-#: src/xml/xmli18n-tmp.h:6923
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
-msgstr "Canon PIXMA MP170"
+msgstr "Canon PIXMA MX870"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
-msgstr "Canon PIXMA MP150"
+msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
 #, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
-msgstr "Canon PIXMA MP700"
+msgstr "Canon PIXMA MX7600"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
 #, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Epson Artisan 50"
-msgstr "Epson Artisan 700"
+msgstr "Epson Artisan 50"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
-msgstr "Epson Artisan 700"
+msgstr "Epson Artisan 710"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
-msgstr "Epson Artisan 800"
+msgstr "Epson Artisan 810"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Epson B-310"
-msgstr "Epson B-300"
+msgstr "Epson B-310"
 
-#: src/xml/xmli18n-tmp.h:6939
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Epson B-310N"
-msgstr "Epson B-300"
+msgstr "Epson B-310N"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Epson B-510DN"
-msgstr "Epson B-500DN"
+msgstr "Epson B-510DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
-msgstr "Epson Stylus Office B30"
+msgstr "Epson Stylus Office B1100"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
-msgstr "Epson Stylus Office T30"
+msgstr "Epson Stylus Office T1100"
 
-#: src/xml/xmli18n-tmp.h:7024
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
-msgstr "Epson Stylus Office T30"
+msgstr "Epson Stylus Office T1110"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
-msgstr "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290s"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7190
 msgid "Epson Stylus Photo P50"
-msgstr "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo P50"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7217
 msgid "Epson Stylus Photo R3000"
-msgstr "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R3000"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
-msgstr "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo TX710W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
-msgstr "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX810FW"
 
-#: src/xml/xmli18n-tmp.h:7115
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Epson Stylus Pro 3800"
-msgstr "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 3800"
 
-#: src/xml/xmli18n-tmp.h:7116
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Epson Stylus Pro 3880"
-msgstr "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 3880"
 
-#: src/xml/xmli18n-tmp.h:7117
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Epson Stylus Pro 3885"
-msgstr "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 3885"
 
-#: src/xml/xmli18n-tmp.h:7118
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Epson Stylus Pro 4000"
-msgstr "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 4000"
 
-#: src/xml/xmli18n-tmp.h:7119
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
-msgstr "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 4800/4880 achterwaarts compatibel"
 
-#: src/xml/xmli18n-tmp.h:7120
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Epson Stylus Pro 4800"
-msgstr "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 4800"
 
-#: src/xml/xmli18n-tmp.h:7121
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Epson Stylus Pro 4880"
-msgstr "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 4880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Epson Stylus Pro 7700"
-msgstr "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7700"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Epson Stylus Pro 7890"
-msgstr "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7890"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Epson Stylus Pro 9700"
-msgstr "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9700"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Epson Stylus Pro 9890"
-msgstr "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9890"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
-msgstr "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11800/11880 achterwaarts compatibel"
 
-#: src/xml/xmli18n-tmp.h:7140
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Epson Stylus Pro 11800"
-msgstr "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11800"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
-msgstr "Epson Stylus NX105"
+msgstr "Epson Stylus NX115"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
-msgstr "Epson Stylus NX105"
+msgstr "Epson Stylus NX215"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
-msgstr "Epson Stylus NX105"
+msgstr "Epson Stylus NX415"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
 #, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
-msgstr "Epson Stylus NX105"
+msgstr "Epson Stylus NX515"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
 #, fuzzy
-msgid "Epson Stylus Photo PX650"
-msgstr "Epson Stylus Photo RX500"
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7349
 #, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
+msgid "Epson Stylus Photo PX650"
+msgstr "Epson Stylus Photo PX650"
+
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
-msgstr "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo PX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
-msgstr "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo PX710W"
 
-#: src/xml/xmli18n-tmp.h:7219
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
-msgstr "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
-msgstr "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo PX810FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
-msgstr "Epson Stylus S20"
+msgstr "Epson Stylus S21"
 
-#: src/xml/xmli18n-tmp.h:7223
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
-msgstr "Epson Stylus C50"
+msgstr "Epson Stylus S50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
-msgstr "Epson Stylus SX100"
+msgstr "Epson Stylus SX110"
 
-#: src/xml/xmli18n-tmp.h:7227
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus SX115"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
-msgstr "Epson Stylus SX100"
+msgstr "Epson Stylus SX210"
 
-#: src/xml/xmli18n-tmp.h:7231
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus SX215"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
-msgstr "Epson Stylus SX100"
+msgstr "Epson Stylus SX410"
 
-#: src/xml/xmli18n-tmp.h:7235
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus SX415"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
 #, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
-msgstr "Epson Stylus SX100"
+msgstr "Epson Stylus SX510W"
 
-#: src/xml/xmli18n-tmp.h:7237
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
 #, fuzzy
-msgid "Epson Stylus SX600FW"
-msgstr "Epson Stylus PX800FW"
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7374
 #, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
+msgid "Epson Stylus SX600FW"
+msgstr "Epson Stylus SX600FW"
+
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
-msgstr "Epson Stylus SX100"
+msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7240
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus SX615"
 
-#: src/xml/xmli18n-tmp.h:7241
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
-msgstr "Epson Stylus CX3650"
+msgstr "Epson Stylus SX650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
-msgstr "Epson Stylus T20"
+msgstr "Epson Stylus T21"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
-msgstr "Epson Stylus T20"
+msgstr "Epson Stylus T26"
 
-#: src/xml/xmli18n-tmp.h:7248
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
-msgstr "Epson Stylus T20"
+msgstr "Epson Stylus T30"
 
-#: src/xml/xmli18n-tmp.h:7249
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
-msgstr "Epson Stylus TX400"
+msgstr "Epson Stylus T40W"
 
-#: src/xml/xmli18n-tmp.h:7250
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
-msgstr "Epson Stylus C50"
+msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7251
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Epson Stylus T59"
-msgstr "Epson Stylus C50"
+msgstr "Epson Stylus T59"
 
-#: src/xml/xmli18n-tmp.h:7252
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Epson Stylus T60"
-msgstr "Epson Stylus CX3650"
+msgstr "Epson Stylus T60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX110"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX210"
 
-#: src/xml/xmli18n-tmp.h:7264
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
-msgstr "Epson Stylus CX9300F"
+msgstr "Epson Stylus TX300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX410"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
 #, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX510FN"
 
-#: src/xml/xmli18n-tmp.h:7268
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
-msgstr "Epson Stylus CX5500"
+msgstr "Epson Stylus TX550W"
 
-#: src/xml/xmli18n-tmp.h:7269
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX610FW"
 
-#: src/xml/xmli18n-tmp.h:7270
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
-msgstr "Epson Stylus TX105"
+msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7271
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
-msgstr "Epson Stylus CX3650"
+msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7272
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Epson Stylus TX659"
-msgstr "Epson Stylus TX105"
+msgstr "Epson Stylus TX659"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
-msgstr "Epson WorkForce 30"
+msgstr "Epson WorkForce 310"
 
-#: src/xml/xmli18n-tmp.h:7294
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
-msgstr "Epson WorkForce 30"
+msgstr "Epson WorkForce 315"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
-msgstr "Epson WorkForce 600"
+msgstr "Epson WorkForce 610"
 
-#: src/xml/xmli18n-tmp.h:7298
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
-msgstr "Epson WorkForce 500"
+msgstr "Epson WorkForce 615"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
 #, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
-msgstr "Epson WorkForce 500"
+msgstr "Epson WorkForce 1100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
-msgstr "Epson E 300"
+msgstr "Epson EP 302"
 
-#: src/xml/xmli18n-tmp.h:7314
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
-msgstr "Epson EP 801A"
+msgstr "Epson EP 702A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
-msgstr "Epson ME 300"
+msgstr "Epson ME 320"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
-msgstr "Epson ME Office 700FW"
+msgstr "Epson ME Office 600F"
 
-#: src/xml/xmli18n-tmp.h:7329
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
-msgstr "Epson ME Office 360"
+msgstr "Epson ME Office 620F"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
 #, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
-msgstr "Epson ME Office 70"
+msgstr "Epson ME Office 1100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
-msgstr "Epson PX 101"
+msgstr "Epson PX 1001"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
-msgstr "Brother HL-2060"
+msgstr "Brother HL-2030"
 
-#: src/xml/xmli18n-tmp.h:7440
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
-msgstr "Brother HL-1050"
+msgstr "Brother HL-2035"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
-msgstr "Canon LBP-430"
+msgstr "Canon LBP-3360"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
-msgstr "Epson MC 2000"
+msgstr "Epson AL-C2000"
 
-#: src/xml/xmli18n-tmp.h:7476
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
-msgstr "Epson AcuLaser C2000PS"
+msgstr "Epson AL-C2000 PS3"
 
-#: src/xml/xmli18n-tmp.h:7477
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
-msgstr "Epson EPL-5200"
+msgstr "Epson AL-C8500"
 
-#: src/xml/xmli18n-tmp.h:7478
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
-msgstr "Epson EPL-5700PS"
+msgstr "Epson AL-C8500PS"
 
-#: src/xml/xmli18n-tmp.h:7479
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
-msgstr "Epson EPL-5800"
+msgstr "Epson AL-C8600"
 
-#: src/xml/xmli18n-tmp.h:7480
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
-msgstr "Epson EPL-5800PS"
+msgstr "Epson AL-C8600 PS3"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
-msgstr "Epson EPL-5900PS"
+msgstr "Epson EPL-5900 PS3"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
-msgstr "Epson EPL-6100PS"
+msgstr "Epson EPL-6100 PS3"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
-msgstr "Epson EPL-N2500PS"
+msgstr "Epson EPL-N2500 PS3"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
-msgstr "Kyocera FS-1010"
+msgstr "Kyocera CS-1815"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
-msgstr "Kyocera FS-1200"
+msgstr "Kyocera FS-920"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
-msgstr "Kyocera FS-1010"
+msgstr "Kyocera FS-1018MFP"
 
-#: src/xml/xmli18n-tmp.h:7918
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kyocera FS-1020D"
 
-#: src/xml/xmli18n-tmp.h:7919
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kyocera FS-1030D"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
-msgstr "Kyocera FS-1010"
+msgstr "Kyocera FS-1118MFP"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
-msgstr "Kyocera FS-1010"
+msgstr "Kyocera FS-1714M"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
-msgstr "Kyocera FS-1200"
+msgstr "Kyocera FS-1920"
 
-#: src/xml/xmli18n-tmp.h:7933
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
-msgstr "Kyocera FS-1000"
+msgstr "Kyocera FS-2000D"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
-msgstr "Kyocera FS-1800"
+msgstr "Kyocera FS-3718M"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
-msgstr "Kyocera FS-3800"
+msgstr "Kyocera FS-3820N"
 
-#: src/xml/xmli18n-tmp.h:7943
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
-msgstr "Kyocera FS-3800"
+msgstr "Kyocera FS-3830N"
 
-#: src/xml/xmli18n-tmp.h:7944
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kyocera FS-3900DN"
 
-#: src/xml/xmli18n-tmp.h:7945
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kyocera FS-4000DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
-msgstr "Kyocera FS-600"
+msgstr "Kyocera FS-6020"
 
-#: src/xml/xmli18n-tmp.h:7949
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
-msgstr "Kyocera FS-600"
+msgstr "Kyocera FS-6026"
 
-#: src/xml/xmli18n-tmp.h:7950
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
-msgstr "Kyocera FS-600"
+msgstr "Kyocera FS-6300"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
-msgstr "Kyocera FS-1750"
+msgstr "Kyocera FS-6750"
 
-#: src/xml/xmli18n-tmp.h:7955
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
-msgstr "Kyocera FS-600"
+msgstr "Kyocera FS-6900"
 
-#: src/xml/xmli18n-tmp.h:7956
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
-msgstr "Kyocera FS-9500DN"
+msgstr "Kyocera FS-6950DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
-msgstr "Kyocera FS-1700"
+msgstr "Kyocera FS-7028M"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kyocera FS-9130DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
-msgstr "Kyocera FS-9500DN"
+msgstr "Kyocera FS-9530DN"
 
-#: src/xml/xmli18n-tmp.h:7966
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
-msgstr "Kyocera KM-1530"
+msgstr "Kyocera KM-1510"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
-msgstr "Kyocera KM-1810"
+msgstr "Kyocera KM-1815"
 
-#: src/xml/xmli18n-tmp.h:7970
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
-msgstr "Kyocera KM-1810"
+msgstr "Kyocera KM-1820"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
-msgstr "Kyocera KM-3530"
+msgstr "Kyocera KM-3050"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
-msgstr "Kyocera KM-4530"
+msgstr "Kyocera KM-4050"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
-msgstr "Kyocera KM-2030"
+msgstr "Kyocera KM-4230/5230"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
-msgstr "Kyocera KM-5530"
+msgstr "Kyocera KM-5050"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
-msgstr "Kyocera KM-2030"
+msgstr "Kyocera KM-6030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
-msgstr "Kyocera KM-2030"
+msgstr "Kyocera KM-8030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
-msgstr "Oki OL400"
+msgstr "Oki B4350"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
-msgstr ""
+msgstr "Tektronix Phaser 750DP"
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
-msgstr ""
+msgstr "Tektronix Phaser 750DX"
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
-msgstr ""
+msgstr "Tektronix Phaser 750N"
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
-msgstr ""
+msgstr "Tektronix Phaser 750P"
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
-msgstr ""
+msgstr "Xerox Phaser 2135"
 
-#: src/xml/xmli18n-tmp.h:8288
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 4400B"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
-msgstr ""
+msgstr "Xerox Phaser 4400DT"
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
-msgstr ""
+msgstr "Xerox Phaser 4400DX"
 
-#: src/xml/xmli18n-tmp.h:8291
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 4400N"
 
-#: src/xml/xmli18n-tmp.h:8292
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4500B"
 
-#: src/xml/xmli18n-tmp.h:8293
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4500DT"
 
-#: src/xml/xmli18n-tmp.h:8294
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4500DX"
 
-#: src/xml/xmli18n-tmp.h:8295
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4500N"
 
-#: src/xml/xmli18n-tmp.h:8296
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4510B"
 
-#: src/xml/xmli18n-tmp.h:8297
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4510DT"
 
-#: src/xml/xmli18n-tmp.h:8298
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4510DX"
 
-#: src/xml/xmli18n-tmp.h:8299
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
-msgstr "Xerox DocuPrint 4508"
+msgstr "Xerox Phaser 4510N"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
-msgstr ""
+msgstr "Xerox Phaser 5500B"
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
-msgstr ""
+msgstr "Xerox Phaser 5500DN"
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
-msgstr ""
+msgstr "Xerox Phaser 5500DT"
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
-msgstr ""
+msgstr "Xerox Phaser 5500DX"
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
-msgstr ""
+msgstr "Xerox Phaser 5500N"
 
-#: src/xml/xmli18n-tmp.h:8305
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 6130N"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
-msgstr ""
+msgstr "Xerox Phaser 6180DN"
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
-msgstr ""
+msgstr "Xerox Phaser 6180MFP-D"
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
-msgstr ""
+msgstr "Xerox Phaser 6200B"
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
-msgstr ""
+msgstr "Xerox Phaser 6200DP"
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
-msgstr ""
+msgstr "Xerox Phaser 6200DX"
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
-msgstr ""
+msgstr "Xerox Phaser 6200N"
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
-msgstr ""
+msgstr "Xerox Phaser 6250B"
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
-msgstr ""
+msgstr "Xerox Phaser 6250DP"
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
-msgstr ""
+msgstr "Xerox Phaser 6250DT"
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
-msgstr ""
+msgstr "Xerox Phaser 6250DX"
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
-msgstr ""
+msgstr "Xerox Phaser 6250N"
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
-msgstr ""
+msgstr "Xerox Phaser 6300DN"
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
-msgstr ""
+msgstr "Xerox Phaser 6300N"
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
-msgstr ""
+msgstr "Xerox Phaser 6350DP"
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
-msgstr ""
+msgstr "Xerox Phaser 6350DT"
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
-msgstr ""
+msgstr "Xerox Phaser 6350DX"
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
-msgstr ""
+msgstr "Xerox Phaser 6360DN"
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
-msgstr ""
+msgstr "Xerox Phaser 6360DX"
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
-msgstr ""
+msgstr "Xerox Phaser 7300B"
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
-msgstr ""
+msgstr "Xerox Phaser 7300DN"
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
-msgstr ""
+msgstr "Xerox Phaser 7300DT"
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
-msgstr ""
+msgstr "Xerox Phaser 7300DX"
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
-msgstr ""
+msgstr "Xerox Phaser 7300N"
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
-msgstr ""
+msgstr "Xerox Phaser 7400DN"
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
-msgstr ""
+msgstr "Xerox Phaser 7400DT"
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
-msgstr ""
+msgstr "Xerox Phaser 7400DX"
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
-msgstr ""
+msgstr "Xerox Phaser 7400DXF"
 
-#: src/xml/xmli18n-tmp.h:8333
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 7400N"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
-msgstr ""
+msgstr "Xerox Phaser 7700DN"
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
-msgstr ""
+msgstr "Xerox Phaser 7700DX"
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
-msgstr ""
+msgstr "Xerox Phaser 7700GX"
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
-msgstr ""
+msgstr "Xerox Phaser 7750B"
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
-msgstr ""
+msgstr "Xerox Phaser 7750DN"
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
-msgstr ""
+msgstr "Xerox Phaser 7750DXF"
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
-msgstr ""
+msgstr "Xerox Phaser 7750GX"
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
-msgstr ""
+msgstr "Xerox Phaser 7760DN"
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
-msgstr ""
+msgstr "Xerox Phaser 7760DX"
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
-msgstr ""
+msgstr "Xerox Phaser 7760GX"
 
-#: src/xml/xmli18n-tmp.h:8344
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 8400B"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
-msgstr ""
+msgstr "Xerox Phaser 8400BD"
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
-msgstr ""
+msgstr "Xerox Phaser 8400DP"
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
-msgstr ""
+msgstr "Xerox Phaser 8400DX"
 
-#: src/xml/xmli18n-tmp.h:8348
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
-msgstr "Xerox Able 1406"
+msgstr "Xerox Phaser 8400N"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
-msgstr ""
+msgstr "Xerox Phaser 8500DN"
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
-msgstr ""
+msgstr "Xerox Phaser 8500N"
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
-msgstr ""
+msgstr "Xerox Phaser 8550DP"
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
-msgstr ""
+msgstr "Xerox Phaser 8550DT"
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
-msgstr ""
+msgstr "Xerox Phaser 8550DX"
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
-msgstr ""
+msgstr "Xerox Phaser 8560DN"
 
-#: src/xml/xmli18n-tmp.h:8355
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
-msgstr "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre 7345"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
-msgstr "Canon SELPHY-CP-500"
+msgid "Canon SELPHY-CP530"
+msgstr "Canon SELPHY-CP-530"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
-msgstr "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak EasyShare-G600-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
-msgstr "Kyocera FS-9100DN"
+msgstr "Kodak PD-4000"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
-msgstr ""
+msgstr "Kodak PD-6000"
 
-#: src/xml/xmli18n-tmp.h:8407
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
-msgstr "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Photo-Printer"
 
-#: src/xml/xmli18n-tmp.h:8408
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
-msgstr "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Photo-Printer-500"
 
-#: src/xml/xmli18n-tmp.h:8409
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
-msgstr "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Printer-Dock-Plus"
 
-#: src/xml/xmli18n-tmp.h:8410
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
-msgstr "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Printer-Dock-Plus-S3"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
 #, fuzzy
-#~ msgid "Color=Yes,Category=Basic Image Adjustment"
-#~ msgstr "Basis beeldaanpassing"
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
 
-#, fuzzy
-#~ msgid "Color=Yes,Category=Advanced Image Control"
-#~ msgstr "Geavanceerde controle van het beeld"
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
 
-#, fuzzy
-#~ msgid "Color=Yes,Category=Advanced Output Control"
-#~ msgstr "Geavanceerde controle van uitvoer"
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
 
-#, fuzzy
-#~ msgid "Color=Yes,Category=Advanced HSL Curves"
-#~ msgstr "Geavanceerde HSL-krommen"
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
 
 #~ msgid "Screening Adjustment"
 #~ msgstr "Aanpassing van aftasting"
@@ -14728,15 +15190,27 @@ msgstr "RAW DATA 8 bit"
 #~ msgid "Advanced Ink Adjustment"
 #~ msgstr "Geavanceerde aanpassing van de inkt"
 
+#~ msgid "Basic Image Adjustment"
+#~ msgstr "Basis beeldaanpassing"
+
+#~ msgid "Advanced Image Control"
+#~ msgstr "Geavanceerde controle van het beeld"
+
 #~ msgid "GrayBalance"
 #~ msgstr "Grijswaarde"
 
 #~ msgid "Output Curves"
 #~ msgstr "Kromme van uitvoer"
 
+#~ msgid "Advanced HSL Curves"
+#~ msgstr "Geavanceerde HSL-krommen"
+
 #~ msgid "Advanced Output Adjustment"
 #~ msgstr "Geavanceerde aanpassing van uitvoer"
 
+#~ msgid "Epson Stylus PX700W"
+#~ msgstr "Epson Stylus PX700W"
+
 #~ msgid "Epson AcuLaser C2000"
 #~ msgstr "Epson AcuLaser C2000"
 
@@ -14751,6 +15225,3 @@ msgstr "RAW DATA 8 bit"
 
 #~ msgid "Epson AcuLaser C8600PS"
 #~ msgstr "Epson AcuLaser C8600PS"
-
-#~ msgid "Epson Stylus PX700W"
-#~ msgstr "Epson Stylus PX700W"
diff --git a/po/pl.gmo b/po/pl.gmo
index 981b2bf..9f58b09 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 8022f4a..340a068 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domy¶lne"
@@ -139,293 +139,292 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model drukarki:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Typ tuszu:"
+
+#: src/main/print-canon.c:307
+msgid "Type of inkset in the printer"
+msgstr ""
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr ""
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Automatycznie"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 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:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr ""
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Oba"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -474,154 +473,197 @@ msgstr "Oba"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Czarny"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 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:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr ""
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -657,7 +699,7 @@ msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Odcienie szaro¶ci"
 
@@ -674,11 +716,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -788,8 +830,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -841,178 +883,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -1021,8 +1063,8 @@ msgid "Adjust the cyan gamma"
 msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1074,178 +1116,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -1254,8 +1296,8 @@ msgid "Adjust the magenta gamma"
 msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1307,178 +1349,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "¯ó³æ"
 
@@ -1487,18 +1529,18 @@ msgid "Adjust the yellow gamma"
 msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1515,14 +1557,14 @@ msgid "Adjust the green gamma"
 msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1534,7 +1576,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1542,7 +1584,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
@@ -1551,7 +1593,7 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "¯ó³æ"
@@ -1850,11 +1892,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Typ tuszu:"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1863,14 +1900,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1880,7 +1909,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ wyj¶ciowy:"
@@ -2246,144 +2275,152 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Purpurowy"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ustaw domy¶lne"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Model drukarki:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2437,104 +2474,104 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2853,24 +2890,17 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr ""
 
@@ -2878,32 +2908,32 @@ msgstr ""
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2935,7 +2965,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr ""
 
@@ -3024,28 +3054,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Wysoko¶æ:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -3077,15 +3099,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr ""
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 #, fuzzy
 msgid "Custom"
 msgstr "Automatycznie"
@@ -3094,7 +3116,7 @@ msgstr "Automatycznie"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3103,35 +3125,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3821,121 +3846,121 @@ msgstr "Wydrukuj"
 msgid "(Default Printer)"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Polecenie:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Polish"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Rozmiar papieru:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 #, fuzzy
 msgid "CMY Color"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4117,28 +4142,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ z %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Nieznana opcja %c\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4147,7 +4172,7 @@ msgstr ""
 "\n"
 "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4155,7 +4180,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4197,23 +4222,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4235,83 +4260,83 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr ""
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4333,116 +4358,116 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4484,337 +4509,337 @@ msgstr "Czarny"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Rozmiar"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Nasycenie:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Model drukarki:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Mo¿na podaæ tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Czyszczenie g³owic...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4853,7 +4878,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4889,17 +4914,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4911,38 +4936,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4952,44 +4977,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5000,12 +5025,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5013,42 +5038,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5057,11 +5082,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr ""
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Plik/Wydrukuj..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Drukowanie..."
@@ -5330,21 +5364,21 @@ msgstr "Drukowanie..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5372,7 +5406,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr ""
 
@@ -5660,29 +5694,29 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6043,8 +6077,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
@@ -6120,8 +6154,8 @@ msgstr "Stylus Photo"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6134,10 +6168,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6279,6 +6313,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6340,6 +6375,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "1440 x 360 DPI"
@@ -6401,6 +6437,7 @@ msgstr "1440 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6528,7 +6565,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6608,6 +6646,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -6645,13 +6684,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "¯ó³æ"
@@ -6674,6 +6714,7 @@ msgstr "¯ó³æ"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -6758,8097 +6799,8703 @@ msgstr "Purpurowy"
 msgid "Vivid Magenta"
 msgstr "Purpurowy"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografia"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Czarny"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Czarny"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Ustaw domy¶lne"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jasno¶æ:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Koperta"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Koperta"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Model drukarki:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Typ wyj¶ciowy:"
 
@@ -15351,9 +15998,6 @@ msgstr ""
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Plik/Wydrukuj..."
-
 #, fuzzy
 #~ msgid "Gloss Balance"
 #~ msgstr "¯ó³æ"
diff --git a/po/pt.gmo b/po/pt.gmo
index c885b06..c1ba391 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 764d118..01f12b3 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -147,138 +147,158 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamanho"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Tipo de Média"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Fonte de Média"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Fonte do \"media\" para o qual está a imprimir"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Redimensionar a impressão para o tamanho da página"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Tipo de tinta"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Tipo de tinta na impressora"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -286,55 +306,55 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 DPI Qualidade Máxima"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -342,7 +362,7 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -350,102 +370,82 @@ msgstr "Ciano Claro"
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 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:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Ambos"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -494,154 +494,197 @@ msgstr "Ambos"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Preto"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 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:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -677,7 +720,7 @@ msgid "Pre-Dithered"
 msgstr "Imprimir"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -694,11 +737,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -813,8 +856,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -866,178 +909,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -1047,8 +1090,8 @@ msgid "Adjust the cyan gamma"
 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:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1100,178 +1143,178 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1281,8 +1324,8 @@ msgid "Adjust the magenta gamma"
 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:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1334,178 +1377,178 @@ msgstr "Ajustar o equilíbrio de magenta da impressão"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -1515,18 +1558,18 @@ msgid "Adjust the yellow gamma"
 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:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1545,14 +1588,14 @@ msgid "Adjust the green gamma"
 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:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1566,7 +1609,7 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 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:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1575,7 +1618,7 @@ msgstr ""
 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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1585,7 +1628,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
@@ -1891,11 +1934,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Tipo de tinta"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1904,14 +1942,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1921,7 +1951,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de Output:"
@@ -2319,145 +2349,153 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Magenta Claro"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Definir Valores Padrão"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papel Normal"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2511,104 +2549,104 @@ 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:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
@@ -2927,25 +2965,18 @@ msgstr "Manual sem Pausa"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
@@ -2954,36 +2985,36 @@ msgstr "Papel Mate"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
@@ -3016,7 +3047,7 @@ msgstr "Foto Secagem Rápida"
 msgid "Quick-dry Transparency"
 msgstr "Transparência Secagem Rápida"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manual"
 
@@ -3106,28 +3137,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Altura"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Cor + Preto"
@@ -3159,15 +3182,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Carta"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -3175,7 +3198,7 @@ msgstr "Personalizado"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3184,35 +3207,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3942,124 +3968,124 @@ msgstr "Imprimir"
 msgid "(Default Printer)"
 msgstr "Configurar a Impressora"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Definições da Impressora"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de Output:"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "Tabuleiro 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "Tabuleiro 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "Tabuleiro 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "Tabuleiro 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Portuguese"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Tamanho do \"Media\":"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Cor"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Escala de Cinzento"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Cor"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Cor CMY"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4332,28 +4358,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Não é possível ler a partir de %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Status da impressora requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Opção desconhecida %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4362,7 +4388,7 @@ msgstr ""
 "\n"
 "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4373,7 +4399,7 @@ 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:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4415,23 +4441,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4453,84 +4479,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4552,116 +4578,116 @@ msgstr "Ciano Claro"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4703,339 +4729,339 @@ msgstr "Preto"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Mate"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Preto"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Tamanho"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Saturação:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Erro no input\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Erro no input\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Erro no input\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Nome da Impressora:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Cor da Tinta"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Percentagem restante"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpando as cabeças...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "A testar a agulha, por favor assegure-se que existe papel na impressora.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5120,7 +5146,7 @@ msgstr ""
 "procedimento.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5195,17 +5221,17 @@ msgstr ""
 "os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5224,20 +5250,20 @@ msgstr ""
 "Vai-lhe ser pedido para confirmar a sua escolha.\n"
 "O que é que pretende fazer (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5246,7 +5272,7 @@ msgstr ""
 "A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
 "Se deseja gravar o alinhamento, terá de repetir o processo.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5255,12 +5281,12 @@ msgstr ""
 "Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
 "o processo de alinhamento:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5275,17 +5301,17 @@ msgstr ""
 "Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
 "as configurações para a sua impressora:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Prestes a gravar as configurações..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "falhou!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5294,28 +5320,28 @@ msgstr ""
 "A suas configurações não foram gravados com sucesso.\n"
 "Vai ter de repetir o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "sucesso!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 "As suas configurações do alinhamento foram gravadas para a impressora.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando desconhecido.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "O comando final não foi confirmado.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5332,12 +5358,12 @@ msgstr ""
 "Por favor coloque uma folha de papel na impressora para iniciar\n"
 "o processo de alinhamento da cabeça.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Pressione enter para continuar > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5348,42 +5374,42 @@ msgstr ""
 "padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Passagem #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Por favor insira uma nova folha de papel.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Número fora do intervalo|\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Eu não consigo intender o que escreveu!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentando definir o alinhamento..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "sucesso.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5398,11 +5424,20 @@ msgstr ""
 "é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
 "qualidade de impressão.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Erro no input\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Imagem>/Ficheiro/Imprimir..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Imprimindo..."
@@ -5671,21 +5706,21 @@ msgstr "Imprimindo..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5714,7 +5749,7 @@ msgstr "Papel Mate"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Cartão"
 
@@ -6011,29 +6046,29 @@ msgstr "Papel de Fotografia Brilhante Premium"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quato Tons"
 
@@ -6395,8 +6430,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
@@ -6472,8 +6507,8 @@ msgstr "Seis Cores Foto"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6486,10 +6521,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6632,6 +6667,7 @@ msgstr "1440 x 360 DPI Alta Qualidade"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6693,6 +6729,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
@@ -6754,6 +6791,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6883,7 +6921,8 @@ msgstr "1200 DPI alta qualidade"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6966,6 +7005,7 @@ msgstr "1440 x 360 DPI Máxima Qualidade"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -7003,13 +7043,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
@@ -7032,6 +7073,7 @@ msgstr "Amarelo"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -7116,8120 +7158,8730 @@ msgstr "Magenta Claro"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Tabuleiro"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografia"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Tabuleiro"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel de Fotografia"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Três Cores Compósito"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Tabuleiro 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Tabuleiro 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Tabuleiro 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quato Tons"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Tabuleiro 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Tabuleiro 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sete Cores Realçado"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Três Cores Compósito"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sete Cores Realçado"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Papel Mate"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Definir Valores Padrão"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executivo"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x8"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIs"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Papel Ministro Americano"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Papel Ministro Europeu"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Pequena Brochura"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Pequena Brochura Pinguim"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Grande Brochura Pinguim"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Cartão Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Cartão Oufuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Envelope longo Japonês #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Envelope longo Japonês #3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Envelope longo Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Envelope longo Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Envelope longo Japonês #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Envelope longo Japonês #4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Envelope longo Japonês #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Envelope longo Japonês #3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "Convite A2"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Envelope Monarca"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Envelope Monarca"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Cartão"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "Papel Contínuo 89 mm"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "Papel Contínuo 5 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "Papel Contínuo 210 mm"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "Papel Contínuo 22 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "Papel Contínuo 24 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "Papel Contínuo 44 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configurar a Impressora"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Tipo de Output:"
 
@@ -15849,9 +16501,6 @@ msgstr ""
 #~ msgid "Printer does not support listing ink types!\n"
 #~ msgstr "A impressora não suporta a cor de impressão\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Imagem>/Ficheiro/Imprimir..."
-
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
 #~ msgstr "ijs_server_get_page_header falhou %d\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index 3d54303..f2786d7 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index ebce383..828f25f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -134,284 +134,284 @@ msgstr "Модуль преобразовани� цвета"
 msgid "Dither algorithm"
 msgstr "�лгоритм �глаживани� переходов"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Формат �траницы"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Тип но�ител�"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "И�точник но�ител�"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Внутренний диаметр CD"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "Внешний диаметр CD (заказной)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "Внутренний диаметр CD (заказной)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr ""
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Разрешение и каче�тво печати"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Тип чернил"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Тип чернил принтера"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Режим печати"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "�абор чернил"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Тип чернил принтера"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Двух�торонн�� печать"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Каче�тво печати"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Плотно�ть голубого"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Изменить плотно�ть голубого"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Плотно�ть пурпурного"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Изменить плотно�ть пурпурного"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Плотно�ть желтого"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Изменить плотно�ть желтого"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Плотно�ть черного"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Изменить плотно�ть черного"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Выкл"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 дюймов"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 дюйма"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Ручной контроль"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Как обычно"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Везде"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -460,154 +460,195 @@ msgstr "Везде"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Черный (K)"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Фотографиче�кое"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Ручной контроль"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Как обычно"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Вы�ока� точно�ть"
@@ -641,7 +682,7 @@ msgid "Pre-Dithered"
 msgstr ""
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Градации �ерого"
 
@@ -657,11 +698,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -761,8 +802,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -814,178 +855,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Голубой (C)"
 
@@ -994,8 +1035,8 @@ msgid "Adjust the cyan gamma"
 msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1047,178 +1088,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Пурпурный (M)"
 
@@ -1227,8 +1268,8 @@ msgid "Adjust the magenta gamma"
 msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1280,178 +1321,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Желтый (Y)"
 
@@ -1460,18 +1501,18 @@ msgid "Adjust the yellow gamma"
 msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Кра�ный (R)"
 
@@ -1488,14 +1529,14 @@ msgid "Adjust the green gamma"
 msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Синий (B)"
 
@@ -1507,7 +1548,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Балан� голубого"
 
@@ -1515,7 +1556,7 @@ msgstr "Балан� голубого"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Балан� пурпурного"
 
@@ -1523,7 +1564,7 @@ msgstr "Балан� пурпурного"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Балан� желтого"
 
@@ -1801,10 +1842,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "�абор чернил"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "�аправление печати"
@@ -1813,14 +1850,6 @@ msgstr "�аправление печати"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1830,7 +1859,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Пор�док вывода"
 
@@ -2180,140 +2209,148 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr ""
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Плотно�ть черного"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Режим печати"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Обычна� бумага"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Коррекци� уровней на выводе"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Полно�тью ручной контроль"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "�втоматиче�ки"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Двунаправленное"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "В�енаправленное"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Поочередна� заливка"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Во�ход�ща� заливка"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "�и�ход�ща� заливка"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2367,104 +2404,104 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2783,24 +2820,17 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr ""
 
@@ -2808,32 +2838,32 @@ msgstr ""
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Коррекци� уровней на выводе"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2865,7 +2895,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr ""
 
@@ -2954,26 +2984,19 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Черновик"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Вы�окое"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Фотографиче�кое"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -3003,15 +3026,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr "�е выбрана; укажите файл PPD "
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Свой вариант"
 
@@ -3019,7 +3042,7 @@ msgstr "Свой вариант"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Фатальна� ошибка!"
 
@@ -3028,33 +3051,36 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Бы�тра� �кономна� печать"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Экономна� печать"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Отличное фотографиче�кое"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ультравы�окое фотографиче�кое"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "�аилучшее"
 
@@ -3719,117 +3745,117 @@ msgstr "Принтер"
 msgid "(Default Printer)"
 msgstr ""
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Контроль вывода"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "И�точник но�ител�"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Цветова� модель"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Градации �ерого"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Цвет"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 #, fuzzy
 msgid "CMY Color"
 msgstr "Цвет"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Точно�ть цветопередачи"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Да"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "�ет"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Значение"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4011,35 +4037,35 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4047,7 +4073,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4089,22 +4115,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4126,83 +4152,83 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr ""
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4224,114 +4250,114 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr ""
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4373,335 +4399,335 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Страница"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Стату�: ошибка\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Стату�: зан�т\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Стату�: ожидани�\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Стату�: про�той\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Стату�: пауза\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Стату�: неизве�тен (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Ошибка: фатальна� ошибка\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Ошибка: бумага за�тр�ла\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Ошибка: кончили�ь чернила\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Ошибка: кончила�ь бумага\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Ошибка: кончила�ь бумага\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Им� задачи:"
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "�тату�"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4740,7 +4766,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4776,17 +4802,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "�евозможно по�лать команду принтеру, выход.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Выход\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4798,38 +4824,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4839,44 +4865,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -4887,12 +4913,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4900,42 +4926,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -4944,11 +4970,19 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr ""
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr ""
@@ -5217,21 +5251,21 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5260,7 +5294,7 @@ msgstr "Матова� бумага"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Открытка"
 
@@ -5547,29 +5581,29 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -5929,8 +5963,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr ""
 
@@ -6005,8 +6039,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6019,10 +6053,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6163,6 +6197,7 @@ msgstr "360dpi вы�окое каче�тво"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6223,6 +6258,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
@@ -6283,6 +6319,7 @@ msgstr "720 × 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6408,7 +6445,8 @@ msgstr "720dpi вы�окое каче�тво"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
@@ -6486,6 +6524,7 @@ msgstr "2880×720dpi наивы�шее каче�тво"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
@@ -6522,12 +6561,13 @@ msgstr "1440 × 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr ""
 
@@ -6549,6 +6589,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
@@ -6625,7821 +6666,8467 @@ msgstr ""
 msgid "Vivid Magenta"
 msgstr "Пурпурный (M)"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Лоток дл� фотобумаги"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Печать на CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Черный (K)"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "По умолчанию"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "�льбом"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10×15 �м"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6834
-#, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6835
-#, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP3100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6837
-msgid "Canon PIXMA iP3000"
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
-msgid "Canon PIXMA iP3100"
-msgstr "Canon PIXMA iP3100"
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Типовой принтер PCL 4"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Типовой принтер PCL 4 LF"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Типовой принтер PCL 5"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Типовой принтер PCL 5 LF"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Типовой принтер PCL 5c"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Типовой принтер PCL 5c LF"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Типовой принтер PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Типовой принтер Generic PCL 5e LF"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Типовой принтер PCL 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Типовой принтер PCL 6/PCL XL LF"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 #, fuzzy
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 #, fuzzy
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 #, fuzzy
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 #, fuzzy
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP3100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Базова� цветокоррекци�"
 
diff --git a/po/sk.gmo b/po/sk.gmo
index ee09dee..4f498e6 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index b231012..1185e43 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 #, fuzzy
 msgid "Default"
 msgstr "Nastavi» ¹tandardné"
@@ -150,138 +150,158 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
 msgstr "Veµkos»"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ atramentu tlaèiarne"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tlaèiarne:"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Typ atramentu"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Typ atramentu tlaèiarne"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr ""
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
@@ -289,55 +309,55 @@ msgstr ""
 msgid "Print Quality"
 msgstr "720 DPI Najvy¹¹ia kvalita"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -345,7 +365,7 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 msgid "Light Cyan Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -353,102 +373,82 @@ msgstr "Jasná azúrová"
 msgid "Light Magenta Transition"
 msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastný"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Èiernobielo"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 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:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "©tandardný"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Oboje"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -497,154 +497,197 @@ msgstr "Oboje"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Èierna"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+#, fuzzy
+msgid "Photo"
+msgstr "Fotografia"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 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:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "©tandardný"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -680,7 +723,7 @@ msgid "Pre-Dithered"
 msgstr "Tlaèi»"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "V odtieòoch ¹edej"
 
@@ -697,11 +740,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr ""
 
@@ -815,8 +858,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -868,178 +911,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -1049,8 +1092,8 @@ msgid "Adjust the cyan gamma"
 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:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1102,178 +1145,178 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -1283,8 +1326,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1336,178 +1379,178 @@ msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "®ltá"
 
@@ -1517,18 +1560,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr ""
 
@@ -1547,14 +1590,14 @@ msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr ""
 
@@ -1568,7 +1611,7 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 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:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1577,7 +1620,7 @@ msgstr ""
 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:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurová"
@@ -1587,7 +1630,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
@@ -1893,11 +1936,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Typ atramentu"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1906,14 +1944,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1923,7 +1953,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
@@ -2321,145 +2351,153 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Jasná purpurová"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Model tlaèiarne:"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Obyèajný papier"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2513,104 +2551,104 @@ msgid "test print"
 msgstr "Test tlaèe"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr "©tandardný ¹tvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
@@ -2929,25 +2967,18 @@ msgstr "Manuálne bez preru¹enia"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papier"
@@ -2956,36 +2987,36 @@ msgstr "Matný papier"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 #, fuzzy
 msgid "Black Balance"
 msgstr "Èiernobielo"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
@@ -3018,7 +3049,7 @@ msgstr "Rýchloschnúce foto"
 msgid "Quick-dry Transparency"
 msgstr "Rýchloschnúce priesvit. fólie"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuál"
 
@@ -3108,28 +3139,20 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 #, fuzzy
 msgid "High"
 msgstr "Vý¹ka:"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-#, fuzzy
-msgid "Photo"
-msgstr "Fotografia"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Farebná + èierna kazeta"
@@ -3161,15 +3184,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Vlastný"
 
@@ -3177,7 +3200,7 @@ msgstr "Vlastný"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3186,35 +3209,38 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3939,124 +3965,124 @@ msgstr "Tlaèi»"
 msgid "(Default Printer)"
 msgstr "Nastavi» tlaèiareò"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 #, fuzzy
 msgid "Printer Features"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ výstupu:"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 #, fuzzy
 msgid "Common"
 msgstr "Príkaz:"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 #, fuzzy
 msgid "Extra 1"
 msgstr "Zásobník 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 #, fuzzy
 msgid "Extra 2"
 msgstr "Zásobník 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 #, fuzzy
 msgid "Extra 3"
 msgstr "Zásobník 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 #, fuzzy
 msgid "Extra 4"
 msgstr "Zásobník 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Slovak"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Veµkos» média:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Farebne"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Farebne"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY farba"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4342,28 +4368,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie je mo¾né èíta» z %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Stav tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Neznáme nastavenie %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4372,7 +4398,7 @@ msgstr ""
 "\n"
 "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4383,7 +4409,7 @@ 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:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4425,23 +4451,23 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4463,84 +4489,84 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4562,116 +4588,116 @@ msgstr "Jasná azúrová"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4713,338 +4739,338 @@ msgstr "Èierna"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papier"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Èierna"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Veµkos»"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "Sýtos»:"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, fuzzy, c-format
 msgid "Error: Ink out\n"
 msgstr "Chyba na vstupe\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, fuzzy, c-format
 msgid "Error: Paper out\n"
 msgstr "Chyba na vstupe\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Chyba na vstupe\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Názov tlaèiarne:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Farebný atrament"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Zostávajúce percentá"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Èistenie hláv...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5119,7 +5145,7 @@ msgstr ""
 "toho procesu nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5189,17 +5215,17 @@ msgstr ""
 "nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5218,20 +5244,20 @@ msgstr ""
 "Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
 "Èo chcete spravi»? (s,q,r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5240,7 +5266,7 @@ msgstr ""
 "V poriadku, va¹a tlaèiareò je  zarovnaná, ale zarovnanie nebolo ulo¾ené.\n"
 "Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5249,12 +5275,12 @@ msgstr ""
 "Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
 "zarovnávania:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5269,17 +5295,17 @@ msgstr ""
 "Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
 "va¹ej tlaèiarne:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "O nastaveniach ukladania..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "zlyhalo!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5288,27 +5314,27 @@ msgstr ""
 "Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
 "procedúru zarovnávania.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "úspe¹ne!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Neznámy príkaz.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Závereèný príkaz nebol potvrdený.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5325,12 +5351,12 @@ msgstr ""
 "Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
 "procedúra zarovnávania hlavy.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Pre pokraèovanie stlaète enter > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5340,42 +5366,42 @@ msgstr ""
 "Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n"
 "Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Prechod #%d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vlo¾te prosím nový hárok papiera.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èíslo je mimo rozsahu!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokú¹am sa nastavi» zarovnávanie..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "úspe¹né.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5388,11 +5414,20 @@ msgstr ""
 "%d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
 "výsledky pri tlaèi.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba na vstupe\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Súbor/Tlaè..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Tlaèím..."
@@ -5661,21 +5696,21 @@ msgstr "Tlaèím..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5704,7 +5739,7 @@ msgstr "Matný papier"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Pohµadnica"
 
@@ -6001,29 +6036,29 @@ msgstr "Ligotavý foto papier Premium"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6384,8 +6419,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografický ¹es»farebný"
@@ -6461,8 +6496,8 @@ msgstr "Fotografický ¹es»farebný"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6475,10 +6510,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6621,6 +6656,7 @@ msgstr "1440 x 360 DPI Vysoká kvalita"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
@@ -6682,6 +6718,7 @@ msgstr "600 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
@@ -6743,6 +6780,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
@@ -6872,7 +6910,8 @@ msgstr "1200 DPI Vysoká kvalita"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
@@ -6955,6 +6994,7 @@ msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
@@ -6992,13 +7032,14 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "®ltá"
@@ -7021,6 +7062,7 @@ msgstr "®ltá"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
@@ -7105,8122 +7147,8732 @@ msgstr "Jasná purpurová"
 msgid "Vivid Magenta"
 msgstr "Purpurová"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Zásobník"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografia"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlaèi» do súboru?"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Zásobník"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Kotúèový podávaè"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotografický papier"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Kompozitný trojfarebný"
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Zásobník 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Zásobník 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Zásobník 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Zásobník 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Zásobník 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Kompozitný trojfarebný"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Matný papier"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Americké rozmery"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Európske rozmery"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki karta"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku karta"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japonská dlhá obálka #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japonská dlhá obálka #4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japonská dlhá obálka #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japonská dlhá obálka #3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2 pozvánka"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Obálka"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohµadnica"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1000"
+msgid "Canon S900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1200"
+msgid "Canon S9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon SELPHY DS700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon SELPHY DS810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA mini320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP90"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP90v"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavi» tlaèiareò"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Stylus C60"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Advanced Image Control"
 #~ msgstr "Typ výstupu:"
 
@@ -15838,9 +16490,6 @@ msgstr ""
 #~ msgid "Printer does not support listing ink types!\n"
 #~ msgstr "Tlaèiareò nepodporuje farebný výstup\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Súbor/Tlaè..."
-
 #, fuzzy
 #~ msgid "ERROR: ijsgutenprint: ijs_server_get_page_header failed %d\n"
 #~ msgstr "Získanie nasledujúceho riadku zlyhalo na %d\n"
diff --git a/po/sl.gmo b/po/sl.gmo
index 8b7498a..14c52e0 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index ca96adc..24c45a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 20110308\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
 "PO-Revision-Date: 2011-03-13 22:13+0100\n"
 "Last-Translator: Andrej Žnidarši� <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Privzeto"
 
@@ -144,284 +144,284 @@ msgstr "Modul pretvorbe barve"
 msgid "Dither algorithm"
 msgstr "Algoritem razprševanja"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Velikost strani"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Velikost papirja na katerga želite tiskati"
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Vrsta ve�predstavnostne datoteke"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Vrsta nosilca (navaden papir, foto papir, itd.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Vir medija"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "Vir (vhodna reža) medija"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr "Velikost CD gumba"
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr "Tiskanje le izven gumba CD-ja ali vse do luknje"
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr "Velikost CD (po meri)"
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr "Spremenljiva prilagoditev zunanjega premera CD-ja"
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr "Velikost CD gumba (po meri)"
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Spremenljiva prilagoditev notranjega gumba CD-ja"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr "Vodoravna fina prilagoditev CD-ja"
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr "Fina prilagoditev vodoravnega položaja za tiskanje CD-jev"
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr "Navpi�na fina prilagoditev CD-ja"
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Lo�ljivost"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Lo�ljivost in kakovost tiskanja"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Vrsta �rnila"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Vrsta �rnila v tiskalniku"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Kanali �rnila"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Na�in tiskanja"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Izhodni modul tiskanja"
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "Nastavljeno �rnilo"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Vrsta �rnila v tiskalniku"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Brez roba"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Tiskaj brez robov"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Obojestransko tiskanje"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr "Nastavitev dvostranskega tiskanja/obra�anja"
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Kakovost tiska"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "Gostota sinje barve"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "Prilagodi gostoto sinje barve"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "Gostota barve magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "Prilagodi gostoto magenta barve"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "Gostota rumene barve"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "Prilagodi gostoto rumene barve"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "Gostota �rne barve"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "Prilagodi gostoto �rne barve"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr "Prehod svetle sinje barve"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr "Svetlo Å¡rklaten prehod"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr "Svetlo rumen prehod"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Izklju�eno"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "Dolga stranica (obi�ajno)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Kratka stranica (vodoravno zrcaljenje)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 pal�ni"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 pal�ni"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 msgid "CD - Custom"
 msgstr "CD - Po meri"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Obi�ajno"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr "Tiskaj na gumb"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "ÄŒrno in belo"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr "Ro�no upravljanje"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Obi�ajno"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "Oboje"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -470,154 +470,195 @@ msgstr "Oboje"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "ÄŒrna"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Fotografije"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Brez"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Ro�no upravljanje"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Obi�ajno"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Visoka natan�nost"
@@ -651,7 +692,7 @@ msgid "Pre-Dithered"
 msgstr "Predhodno razpršeno"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Sivine"
 
@@ -667,11 +708,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -773,8 +814,8 @@ msgid "Gamma value assumed by application"
 msgstr "Vrednost game, ki jo predpostavi program"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -826,178 +867,178 @@ msgstr "Vrednost game, ki jo predpostavi program"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Sinja"
 
@@ -1006,8 +1047,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Prilagodi sinjo gamo"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1059,178 +1100,178 @@ msgstr "Prilagodi sinjo gamo"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Å krlatna"
 
@@ -1239,8 +1280,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Prilagodi Å¡krlatno gamo"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1292,178 +1333,178 @@ msgstr "Prilagodi Å¡krlatno gamo"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Rumena"
 
@@ -1472,18 +1513,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Prilagodi rumeno gamo"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Rde�a"
 
@@ -1500,14 +1541,14 @@ msgid "Adjust the green gamma"
 msgstr "Prilagodi zeleno gamo"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Modra"
 
@@ -1519,7 +1560,7 @@ msgstr "Prilagodi modro gamo"
 msgid "Adjust the black gamma"
 msgstr "Prilagodi �rno gamo"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Ravnotežje sinje barve"
 
@@ -1527,7 +1568,7 @@ msgstr "Ravnotežje sinje barve"
 msgid "Adjust the cyan gray balance"
 msgstr "Prilagodi ravnotežje sinje barve"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Ravnotežje škrlatne"
 
@@ -1535,7 +1576,7 @@ msgstr "Ravnotežje škrlatne"
 msgid "Adjust the magenta gray balance"
 msgstr "Prilagodi ravnotežje škrlatne barve"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Ravnotežje rumene barve"
 
@@ -1820,10 +1861,6 @@ msgstr "Izboljšan lesk"
 msgid "Add gloss enhancement"
 msgstr "Doda izboljšavo leska"
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr "Nastavljeno �rnilo"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "Smer tiskanja"
@@ -1832,14 +1869,6 @@ msgstr "Smer tiskanja"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Smer tiskanja (enosmerno je boljše kakovosti vendar po�asnejše)"
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr "Brez roba"
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr "Tiskaj brez robov"
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr "Na�in prepletanja"
@@ -1849,7 +1878,7 @@ msgid "Interleave pattern to use"
 msgstr "Vzorec prepletanja za uporabo"
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr "Red izhoda"
 
@@ -2184,136 +2213,144 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Merilo gostote šesttonska siva 1 (najsvetlejše) "
 
 #: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
 msgid "Drying Time Per Page"
 msgstr "Čas sušenja na stran"
 
-#: src/main/print-escp2.c:903
+#: src/main/print-escp2.c:911
 msgid "Set drying time per page"
 msgstr "Nastavi �as sušenja na stran"
 
-#: src/main/print-escp2.c:910
+#: src/main/print-escp2.c:918
 msgid "Drying Time Per Scan"
 msgstr "Čas sušenja na opti�no branje"
 
-#: src/main/print-escp2.c:911
+#: src/main/print-escp2.c:919
 msgid "Set drying time per scan"
 msgstr "Nastavi �as sušenja na opti�no branje"
 
-#: src/main/print-escp2.c:918
+#: src/main/print-escp2.c:926
 msgid "Minimum Drying Time Per Scan"
 msgstr "Najmanjši �as sušenja za opti�no branje"
 
-#: src/main/print-escp2.c:919
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr "Nastavi najmanjši �as sušenja za opti�no branje"
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr "Izboljšava kakovosti"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr "Izboljšaj kakovost tiskanja z dodatnimi prehodi"
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 msgid "Paper Thickness"
 msgstr "Debelina papirja"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr "Nastavi debelino papirja tiskalnika"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 msgid "Vacuum Intensity"
 msgstr "Mo� vakuuma"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Nastavi intenziteto vakuuma (dolo�eno za tiskalnik)"
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr "Zaporedje virov"
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Nastavi zaporedje virov papirja (dolo�eno za tiskalnik)"
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 msgid "Print Method"
 msgstr "Na�in tiskanja"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr "Nastavi na�in tiskanja (dolo�eno za tiskalnik)"
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 msgid "Platen Gap"
 msgstr "Odmik valja"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr "Nastavi odmik valja (odvisno od tiskalnika)"
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr "Prilagoditev virov"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Nastavi prilagoditev vira papirja (enote 0,01%)"
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr "Polen ro�en nadzor"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr "Samodejen nadzor nastavitev"
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Dvosmerno"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Enosmerno"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr "Nadomestna zapolnitev"
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr "Naraš�ajo�a zapolnitev"
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr "Padajo�a zapolnitev"
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr "Naraš�ajo�e dvojno"
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Izogibanje najbližjim sosedom"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr "Kratka stranica (zrcali)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Ta tiskalnik ne podpira izhoda surovega tiskalnika pri globini %d\n"
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Možnosti tiskanja niso preverjene. Ni mogo�e tiskati.\n"
@@ -2367,104 +2404,104 @@ msgid "test print"
 msgstr "preizkusno tiskanje"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr "Obi�ajne štiri barve"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr "Sestavljeno iz treh barv"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr "Å est barvna fotografija"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Fotografija sestavljena iz petih barv"
 
@@ -2783,24 +2820,17 @@ msgstr "Ro�no brez premora"
 msgid "Coated"
 msgstr "Pokrito"
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Brez"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Bleš�e�e"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Tekstura."
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Mat"
 
@@ -2808,32 +2838,32 @@ msgstr "Mat"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Vzorec laminata"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr "Prilagoditev izhodne ravni"
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Prilagodi ravnotežje sinje barve"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Prilagodi ravnotežje škrlatne barve"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Prilagodi ravnotežje rumene barve"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Ravnotežje beline"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Prilagodi ravnotežje �rne barve"
 
@@ -2865,7 +2895,7 @@ msgstr "Hitro suše�a fotografija"
 msgid "Quick-dry Transparency"
 msgstr "Hitro suše�a prozornost"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Ro�no"
 
@@ -2954,26 +2984,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Osnutek"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Visoka"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Fotografije"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Barvne in �rne kartuše"
@@ -3002,15 +3025,15 @@ msgstr "Ime modela datoteke PPD"
 msgid "None; please provide a PPD file"
 msgstr "Brez, zagotovite datoteko PPD"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Pismo"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Po meri"
 
@@ -3018,7 +3041,7 @@ msgstr "Po meri"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Mere slike se morajo ujemati z merami tiskalnika"
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr "Usodna napaka!"
 
@@ -3027,33 +3050,36 @@ msgid ""
 "Please report the above information to gimp-print-devel@lists.sourceforge.net"
 msgstr "Poro�ajte zgornje podatke na gimp-print-devel@lists.sourceforge.net"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Hitro ekonomi�no"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Ekonomi�no"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr "Super fotografija"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr "Ultra fotografija"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Najboljše"
 
@@ -3741,113 +3767,113 @@ msgstr "Tiskalnik"
 msgid "(Default Printer)"
 msgstr "(Privzeti tiskalnik)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Zmožnosti tiskalnika"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr "Nadzor izhoda"
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Skupno"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Dodatno 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Dodatno 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Dodatno 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Dodatno 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Dodatno 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "angleš�ina"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 msgid "Media Size"
 msgstr "Velikost medija"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 msgid "Color Model"
 msgstr "Barvni model"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 msgid "Inverted Grayscale"
 msgstr "Obrnjene sivine"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 msgid "RGB Color"
 msgstr "Barva RGB"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "Barva CMY"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 msgid "Color Precision"
 msgstr "Barvna natan�nost"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Da"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Ne"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 msgid "Value"
 msgstr "Vrednost"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Fina prilagoditev"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr "%.1f mm"
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr "Obrnjeno"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 msgid "2-Sided Printing"
 msgstr "Dvostransko tiskanje"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Skr�i stran, �e je zahtevano za prilagajanje robovom"
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr "Skr�i (natisni celotno stran)"
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr "Obreži (ohrani mere)"
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr "Razširi (uporabi najve�je podro�je strani)"
 
@@ -4133,28 +4159,28 @@ msgstr "Branje iz tiskalnika je zakasnelo\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Ni mogo�e brati iz %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr "Dolo�ite surovo napravo\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Ni mogo�e odpreti branja/pisanja %s: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Neznan tiskalnik %s!\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Ni mogo�e pisati v %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4163,7 +4189,7 @@ msgstr ""
 "\n"
 "Ni mogo�e pisati v %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4174,7 +4200,7 @@ msgstr ""
 "Ni mogo�e zaznati vrste tiskalnika.\n"
 "Uporabite -m za navedbo svojega modela tiskalnika.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4216,22 +4242,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Foto �rna"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4253,83 +4279,83 @@ msgstr "Neznano"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Svetlo sinja"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4351,114 +4377,114 @@ msgstr "Svetlo sinja"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Svetlo Å¡krlatna"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Svetlo �rna"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4500,154 +4526,154 @@ msgstr "Svetlo �rna"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Mat �rna"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Optimizator bleš�anja"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Zelo svetlo �rna"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr "Oranžna"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Stanje: napaka\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr "Stanje: samotiskanje\n"
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Stanje: zaposleno\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Stanje: �akanje\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Stanje: nedejavno\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Stanje: v premoru\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Stanje: �iš�enje\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr "Stanje: tovarniška pošiljka\n"
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Stanje: Izklapljanje\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Stanje: neznano (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Napaka: usodna napaka\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr "Napaka: izbran je bil drug vmesnik\n"
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr "Napaka: pokrov je odprt\n"
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr "Napaka: papir se je zataknil\n"
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Napaka: �rnila je zmanjkalo\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Napaka: papirja je zmanjkalo\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr "Napaka: razli�ne napake papirja\n"
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr "Napak: prekora�itev vzdrževanja kartuše\n"
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr "Napaka: �akanje na vra�ilo s položaja odtrganja\n"
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr "Napaka: napaka dvojnega vira\n"
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
@@ -4656,182 +4682,182 @@ msgstr ""
 "Napaka: ro�ica kartuše �rnila je bila sproš�ena\n"
 "\n"
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr "Napaka: nepopravljiva napaka rezalnika\n"
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr "Napaka: obnovljivi rezalnik se je zataknil\n"
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr "Napaka: kartuša vzdrževanja ni prisotna\n"
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Napaka: zadnji porov je odprt\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr "Napaka: CD podajalnik je zunaj\n"
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Napaka: napaka nalaganja kartice\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr "Napaka: pokrov pladnja je odprt\n"
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr "Napaka: pokrov kartuše vzdrževanja je odprt\n"
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr "Napaka: sprednji pokrov je odprt\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr "Napaka: zahteva po vzdrževanju\n"
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Napaka: neznano (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Opozorilo: �rnila %s je malo\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Opozorilo: nivo �rnila kanala %d je nizek\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr "Opozorilo: �iš�enje %s je onemogo�eno\n"
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr "Opozorilo: �iš�enje kanala %d\n"
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr "Opozorilo: kartuša vzdrževanja je skoraj polna\n"
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr "Opozorilo: na �akanju je zahteva vzdrževanja\n"
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Opozorilo: neznano (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Samopreizkus Å¡obe tiskanja\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, c-format
 msgid "Printer Name: %s\n"
 msgstr "Ime tiskalnika: %s\n"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Ravni �rnila:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Barvna �rnila"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Preostali odstotki"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Ime posla:"
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "ravni �rnila"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "stanje"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Pridobivanje %s zahteva uporabo surove naprave.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Pridobivanje razširjenih podrobnosti �rnila zahteva uporabo surove naprave.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr "Črnilo kartuše"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr "Å tevilka dela"
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Dolo�ilo tiskalnika zahteva uporabo surove naprave.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Modela tiskalnika ni mogo�e dolo�iti.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čiš�enje glav ...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Poganjanje preverjanja šob. Prepri�ajte se, da je papir v tiskalniku.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4907,7 +4933,7 @@ msgstr ""
 "tem postopkom tiskalnika ne smete izklopiti.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4976,17 +5002,17 @@ msgstr ""
 "izklopiti.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Na tiskalnik ni mogo�e poslati ukaza, kon�evanje.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Kon�evanje\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5005,13 +5031,13 @@ msgstr ""
 "Nato boste morali svojo izbiro potrditi.\n"
 "Kaj želite storiti (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5019,7 +5045,7 @@ msgstr ""
 "Če želite kon�ati brez shranjevanja to potrdite s ponovnim pritiskom na "
 "'q':\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5028,7 +5054,7 @@ msgstr ""
 "Vaš tiskalnik je poravnan, vendar poravna še ni bila shranjena.\n"
 "V primeru da želite poravnavo shraniti, morate opravilo ponoviti.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5037,12 +5063,12 @@ msgstr ""
 "Če želite ponoviti opravilo poravnave to potrdite s\n"
 "ponovnim pritiskom na 'r':\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Ponavljanje opravila poravnave.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5057,17 +5083,17 @@ msgstr ""
 "V primeru da želite shraniti nastavitve na svoj tiskalnik, še enkrat\n"
 "pritisnite 's':\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Tik pred shranitvijo nastavitev ..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "spodletelo!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5076,27 +5102,27 @@ msgstr ""
 "Vaše nastavitve niso bile uspešno shranjene. Ponovite postopek\n"
 "poravnave.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "uspešno!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vaše nastavitve poravnave so bile shranjene v tiskalnik.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Nepoznan ukaz.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Zadnjega ukaza ni mogo�e potrditi.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5113,12 +5139,12 @@ msgstr ""
 "Za za�etek postopka poravnave glave tiskalnika dajte v svoj tiskalnik\n"
 "list papirja.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Za nadaljevanje pritisnite enter >"
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5128,42 +5154,42 @@ msgstr ""
 "Preu�ite natisnjeno in izberite najboljši par vrstic v vsakem vzorcu.\n"
 "Za pomo� napišite število '?', za ponovitev postopka pa 'r'.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Prehod Å¡t %d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vstavite nenatisnjen list papirja.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Å tevilo je izven obsega!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Ne morem razumeti kaj ste napisali!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Najboljši par vrstic bi moral biti oštevil�en med 1 in %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Poskušanje nastavljanja poravnave ...."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspešno.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5176,11 +5202,20 @@ msgstr ""
 "%d. V primeru da ni, ponovite opravilo, dokler ne dobite tiskanja\n"
 "najboljše kakovosti.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Napava v vhodu\n"
 
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Tiskaj brez robov"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr ""
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Tiskanje ..."
@@ -5449,21 +5484,21 @@ msgstr "Tiskanje ..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr "Standardna �rnila EPSON"
 
@@ -5491,7 +5526,7 @@ msgstr "ÄŒrno beli papir"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Razglednica"
 
@@ -5777,29 +5812,29 @@ msgstr "Premium luster foto papir 250 tž"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Å tiritonsko"
 
@@ -6159,8 +6194,8 @@ msgstr "Akvarel papir - radiant bela"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto �rn"
 
@@ -6235,8 +6270,8 @@ msgstr "UltraChrome foto �rn"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat �rn"
 
@@ -6249,10 +6284,10 @@ msgstr "UltraChrome mat �rn"
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr "Å esttonsko"
 
@@ -6393,6 +6428,7 @@ msgstr "360 DPI visoke kakovosti"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6453,6 +6489,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6513,6 +6550,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6638,7 +6676,8 @@ msgstr "720 DPI visoka kakovost"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6716,6 +6755,7 @@ msgstr "2880 x 720 DPI najvišje kakovosti"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6752,12 +6792,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Temno rumena"
 
@@ -6779,6 +6820,7 @@ msgstr "Temno rumena"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6852,7630 +6894,8281 @@ msgstr "Živa svetla škrlatna"
 msgid "Vivid Magenta"
 msgstr "Živa škrlatna"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr "Glavni podajalnik"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 msgid "Photo Tray"
 msgstr "Fotografski podajalnik"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Natisni na CD"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr "Zadnji podajalnik"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr "Prednji podajalnik"
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Ro�ni podajalnik"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr "Vir zvitka (izreži vsako stran)"
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr "Vir zvitka (ne reži)"
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Podajalnik zvitkov"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 msgid "Manual Sheet Guide"
 msgstr "Ro�ni vodi� lista"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 msgid "Manual Feed (Front)"
 msgstr "Ro�ni vir (ospredje)"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr "Vir zvitka (brez roba z enim rezom)"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr "Vir zvitka (brez roba z dvojnim rezom)"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 msgid "Photo Board"
 msgstr "Ploš�a fotografij"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr "Obrez lista koš 2"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr "Obrez lista koš 2"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr "Samodejno izbiranje obreza lista"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr "Ro�na izbira"
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Enobarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Tribarvna surova "
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Å tiribarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Petbarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Å estbarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Gray 3"
 msgstr "Siva 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Gray 2"
 msgstr "Siva 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Gray 1"
 msgstr "Siva 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr "MIS kvadton"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr "MIS Å¡esttonski"
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 msgid "Gray 5"
 msgstr "Siva 5"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 msgid "Gray 4"
 msgstr "Siva 4"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enobarvno surovo izboljšano bleste�e"
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr "Tribarvno surovo bleste�e"
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr "Štiribarvno surovo bleste�e"
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šestbarvno izboljšano bleste�e surovo"
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedembarvno izboljšano bleste�e surovo"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 msgid "MatteBlack"
 msgstr "MatÄŒrno"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 msgid "Default Black"
 msgstr "Privzeta �rna"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Sedembarvna fotografijska"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr "Sestavljeno izboljšano šestbarvno"
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Sedembarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr "Sivine dveh ravni"
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Dvobarvna surova"
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Osembarvna fotografija"
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Osembarvna surova"
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr "Å tiribarvna fotografija"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr "Prepleteno"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Polno prekrivanje"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr "Å tirje prehodi"
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr "Polno prekrivanje 2"
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr "Prepleteno 2"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr "Osem prehodov"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "Omogo�eno"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Pravna"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Izvedilna"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 msgid "L"
 msgstr "L"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr "KG"
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 foto papir (robove je mogo�e odtrgati)"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson L foto papir (robove je mogo�e odtrgati)"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 msgid "4x8"
 msgstr "4x8"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr "2L"
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr "Rokukire"
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Inžinirstvo C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr "YonKire"
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr "HanKire"
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super spremenilnik"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 msgid "C0 landscape"
 msgstr "C0 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 msgid "C1 landscape"
 msgstr "C1 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 msgid "C2 landscape"
 msgstr "C2 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 msgid "C3 landscape"
 msgstr "C3 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 msgid "C4 landscape"
 msgstr "C4 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 msgid "C5 landscape"
 msgstr "C5 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 msgid "B6-C4 landscape"
 msgstr "B6-C4 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 msgid "C6 landscape"
 msgstr "C6 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 msgid "DL landscape"
 msgstr "DL leže�e"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 msgid "C7-6 landscape"
 msgstr "C7-6 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 msgid "C7 landscape"
 msgstr "C7 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 msgid "C8 landscape"
 msgstr "C8 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 msgid "C9 landscape"
 msgstr "C9 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 msgid "C10 landscape"
 msgstr "C10 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 msgid "EA5"
 msgstr "EA5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 msgid "EA5 landscape"
 msgstr "EA5 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr "ArchA transponiran"
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr "ArchB transpniran"
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr "ArchC transponiran"
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr "ArchD transponiran"
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr "ArchE transponiran"
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Ameriški foolscap"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Evropski foolscap"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Kronsti Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Veliki kronski Quatro"
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Kronski Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Veliki kronski Octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Majhna brošura"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Penguin majhna brošura"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Penguin velika brošura"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Kartica Hagaki"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Kartica Oufuku"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japonska dolga ovojnica Å¡t. 3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonska dolga ovojnica št. 3 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japonska dolga ovojnica Å¡t. 4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonska dolga ovojnica št. 4 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japonska dolga ovojnica Å¡t. 4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japonska dolga ovojnica št. 4 leže�e"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japonska dolga ovojnica Å¡t. 3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japonska dolga ovojnica št. 3 leže�e"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonska ovojnica Kaku Å¡t. 4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonska Kaku ovojnica št. 4 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Komericalno 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr "Komericalno 10 leže�e"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "Vabilo A2"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Ovojnica Monarch"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr "Ovojnica Monarch leže�e"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr "Å iroko 101,6x180,6"
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Kartica"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Å iroka razglednica"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr "Čilski pisarniški papir"
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr "ÄŒilski dvojni pisemski papir"
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr "Čilski dvojni pisarniški papir"
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 msgid "A3+"
 msgstr "A3+"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 msgid "17 Inch Roll Paper"
 msgstr "17 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 msgid "60 Inch Roll Paper"
 msgstr "60 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 msgid "64 Inch Roll Paper"
 msgstr "64 pal�ni zvitek papirja"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript raven 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript raven 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
-msgid "Canon S4500"
-msgstr "Canon S4500"
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S830D"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S900"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon S9000"
+msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1500"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon PIXMA iP1900"
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA mini320"
 msgstr "Canon PIXMA iP1900"
 
-#: src/xml/xmli18n-tmp.h:6831
-msgid "Canon PIXMA iP1900"
-msgstr "Canon PIXMA iP1900"
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6832
-msgid "Canon PIXMA iP2000"
-msgstr "Canon PIXMA iP2000"
+#: src/xml/xmli18n-tmp.h:6866
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP2200"
-msgstr "Canon PIXMA iP2000"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:6836
-msgid "Canon PIXUS iP2700"
-msgstr "Canon PIXUS iP2700"
-
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6871
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6872
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6876
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 msgid "Canon PIXMA iP4700"
 msgstr "Canon PIXMA iP4700"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
 msgid "Canon PIXMA iX4000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon PIXMA iX4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 msgid "Canon PIXMA MP250"
 msgstr "Canon PIXMA MP250"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 msgid "Canon PIXMA MP270"
 msgstr "Canon PIXMA MP270"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 msgid "Canon PIXMA MP280"
 msgstr "Canon PIXMA MP280"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 msgid "Canon PIXMA MP360"
 msgstr "Canon PIXMA MP360"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 msgid "Canon PIXMA MP370"
 msgstr "Canon PIXMA MP370"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
 msgid "Canon PIXMA MP390"
 msgstr "Canon PIXMA MP390"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 msgid "Canon PIXMA MP450"
 msgstr "Canon PIXMA MP450"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 msgid "Canon PIXMA MP460"
 msgstr "Canon PIXMA MP460"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
 msgid "Canon PIXMA MP480"
 msgstr "Canon PIXMA MP480"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 msgid "Canon PIXMA MP495"
 msgstr "Canon PIXMA MP495"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 msgid "Canon PIXMA MP510"
 msgstr "Canon PIXMA MP510"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
 msgid "Canon PIXMA MP540"
 msgstr "Canon PIXMA MP540"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 msgid "Canon PIXMA MP550"
 msgstr "Canon PIXMA MP550"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
 msgid "Canon PIXMA MP600"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon PIXMA MP600"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
 msgid "Canon PIXMA MP950"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 msgid "Canon PIXMA MP960"
 msgstr "Canon PIXMA MP960"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 msgid "Canon PIXMA MP970"
 msgstr "Canon PIXMA MP970"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon PIXMA MP950"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 msgid "Canon PIXMA MP990"
 msgstr "Canon PIXMA MP990"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
 msgid "Canon PIXMA MG5100"
 msgstr "Canon PIXMA MG5100"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 msgid "Canon PIXMA MG5200"
 msgstr "Canon PIXMA MG5200"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
 msgid "Canon PIXMA MG6100"
 msgstr "Canon PIXMA MG6100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
 msgid "Canon PIXMA MG8100"
 msgstr "Canon PIXMA MG8100"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
 msgid "Canon PIXMA MX300"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 msgid "Canon PIXMA MX310"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
 msgid "Canon PIXMA MX330"
 msgstr "Canon PIXMA MX330"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 msgid "Canon PIXMA MX340"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 msgid "Canon PIXMA MX350"
 msgstr "Canon PIXMA MX350"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon PIXMA MX300"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon PIXMA MX310"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon PIXMA MX340"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
 msgid "Canon PIXMA MX700"
 msgstr "Canon PIXMA MX700"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Canon PIXMA MX850"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Canon PIXMA MX860"
 msgstr "Canon PIXMA MX860"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Canon PIXMA MX870"
 msgstr "Canon PIXMA MX870"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon PIXMA MX850"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Canon PIXMA MX7600"
 msgstr "Canon PIXMA MX7600"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:6930
-msgid "Canon i865"
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Epson Artisan 50"
 msgstr "Epson Artisan 50"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Epson Artisan 710"
 msgstr "Epson Artisan 710"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Epson Artisan 810"
 msgstr "Epson Artisan 810"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Epson B-310"
 msgstr "Epson B-310"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Epson B-310N"
 msgstr "Epson B-310N"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Epson B-510DN"
 msgstr "Epson B-510DN"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus Office B1100"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus Office T1100"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus Office T1110"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290s"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo P50"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo R2880"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R3000"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo TX710W"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo TX810FW"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 3800"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 3880"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 3885"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 4000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 4800/4880 nazaj združljivo"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 4800"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 4880"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7700"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7890"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9700"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9890"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 11800/11880 Back Compatible"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 11800"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4000"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus NX115"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus NX215"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus NX415"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus NX515"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo PX650"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo PX700W"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo PX710W"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo PX800FW"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo PX810FW"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus S21"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus S50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus SX110"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus SX115"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus SX210"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus SX215"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus SX410"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus SX415"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus SX510W"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus SX515"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus SX600FW"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus SX610FW"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus SX615"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus SX650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus T21"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus T26"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus T30"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus T40W"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus T50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus T59"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus T60"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus TX110"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus TX210"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus TX300F"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus TX410"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus TX510FN"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus TX550W"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus TX610FW"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus TX615"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus TX650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus TX659"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Epson WorkForce 310"
 msgstr "Epson WorkForce 310"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Epson WorkForce 315"
 msgstr "Epson WorkForce 315"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Epson WorkForce 610"
 msgstr "Epson WorkForce 610"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Epson WorkForce 615"
 msgstr "Epson WorkForce 615"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "Epson WorkForce 1100"
 msgstr "Epson WorkForce 1100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 msgid "Epson EP 302"
 msgstr "Epson EP 302"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 msgid "Epson EP 702A"
 msgstr "Epson EP 702A"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 msgid "Epson EP 801A"
 msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 msgid "Epson EP 901A"
 msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 msgid "Epson EP 901F"
 msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 msgid "Epson ME 300"
 msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 msgid "Epson ME 320"
 msgstr "Epson ME 320"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 msgid "Epson ME Office 360"
 msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 msgid "Epson ME Office 600F"
 msgstr "Epson ME Office 600F"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 msgid "Epson ME Office 620F"
 msgstr "Epson ME Office 620F"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
 msgid "Epson ME Office 1100"
 msgstr "Epson ME Office 1100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 msgid "Epson PM A940"
 msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 msgid "Epson PM T960"
 msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
 msgid "Epson PX 401A"
 msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 msgid "Epson PX 1001"
 msgstr "Epson PX 1001"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 msgid "Epson PX G5600"
 msgstr "Epson PX G5600"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr "Brother HL-2030"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr "Brother HL-2035"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-3360"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 msgid "Epson AL-C2000"
 msgstr "Epson AL-C2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AL-C2000 PS3"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 msgid "Epson AL-C8500"
 msgstr "Epson AL-C8500"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 msgid "Epson AL-C8500PS"
 msgstr "Epson AL-C8500PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 msgid "Epson AL-C8600"
 msgstr "Epson AL-C8600"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson AL-C8600 PS3"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900 PS3"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100 PS3"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-N2500 PS3"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Splošni tiskalnik PCL 4"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 msgid "Generic PCL 4 LF Printer"
 msgstr "Splošni tiskalnik PCL 4 LF"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Splošni tiskalnik PCL 5"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 msgid "Generic PCL 5 LF Printer"
 msgstr "Splošni tiskalnik PCL 5 LF"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Splošni tiskalnik PCL 5c"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 msgid "Generic PCL 5c LF Printer"
 msgstr "Splošni tiskalnik PCL 5c LF"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Splošni tiskalnik PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 msgid "Generic PCL 5e LF Printer"
 msgstr "Splošni tiskalnik PCL 5e LF"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Splošni tiskalnik 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Splošni tiskalnik PCL 6/PCL XL LF"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr "Kyocera CS-1815"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-920"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1018MFP"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-1020D"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-1030D"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1118MFP"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1714M"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1920"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-2000D"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-3718M"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3820N"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3830N"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-3900DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-4000DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-6020"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-6026"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-6300"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-6750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-6900"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-6950DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-7028M"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9130DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9530DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1510"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1815"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1820"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3050"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4050"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-4230/5230"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5050"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-6030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-8030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr "Oki B4350"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 msgid "Savin 2535/2235"
 msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 msgid "Savin 2545/2245"
 msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 msgid "Savin 4035/4135g"
 msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 msgid "Savin 4045/4145g"
 msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 msgid "Savin 8035/8035g"
 msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 msgid "Savin 8045/8045g"
 msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr "Tektronix Phaser 750DP"
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr "Tektronix Phaser 750DX"
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr "Tektronix Phaser 750N"
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr "Tektronix Phaser 750P"
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr "Xerox Phaser 2135"
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Phaser 4400B"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr "Xerox Phaser 4400DT"
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr "Xerox Phaser 4400DX"
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Phaser 4400N"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox Phaser 4500B"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox Phaser 4500DT"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox Phaser 4500DX"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox Phaser 4500N"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox Phaser 4510B"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox Phaser 4510DT"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox Phaser 4510DX"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox Phaser 4510N"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr "Xerox Phaser 5500B"
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr "Xerox Phaser 5500DN"
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr "Xerox Phaser 5500DT"
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr "Xerox Phaser 5500DX"
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr "Xerox Phaser 5500N"
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Phaser 6130N"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr "Xerox Phaser 6180DN"
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr "Xerox Phaser 6180MFP-D"
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr "Xerox Phaser 6200B"
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr "Xerox Phaser 6200DP"
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr "Xerox Phaser 6200DX"
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr "Xerox Phaser 6200N"
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr "Xerox Phaser 6250B"
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr "Xerox Phaser 6250DP"
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr "Xerox Phaser 6250DT"
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr "Xerox Phaser 6250DX"
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr "Xerox Phaser 6250N"
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr "Xerox Phaser 6300DN"
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr "Xerox Phaser 6300N"
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr "Xerox Phaser 6350DP"
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr "Xerox Phaser 6350DT"
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr "Xerox Phaser 6350DX"
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr "Xerox Phaser 6360DN"
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr "Xerox Phaser 6360DX"
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr "Xerox Phaser 7300B"
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr "Xerox Phaser 7300DN"
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr "Xerox Phaser 7300DT"
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr "Xerox Phaser 7300DX"
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr "Xerox Phaser 7300N"
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr "Xerox Phaser 7400DN"
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr "Xerox Phaser 7400DT"
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr "Xerox Phaser 7400DX"
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr "Xerox Phaser 7400DXF"
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Phaser 7400N"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr "Xerox Phaser 7700DN"
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr "Xerox Phaser 7700DX"
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr "Xerox Phaser 7700GX"
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr "Xerox Phaser 7750B"
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr "Xerox Phaser 7750DN"
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr "Xerox Phaser 7750DXF"
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr "Xerox Phaser 7750GX"
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr "Xerox Phaser 7760DN"
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr "Xerox Phaser 7760DX"
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr "Xerox Phaser 7760GX"
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Phaser 8400B"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr "Xerox Phaser 8400BD"
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr "Xerox Phaser 8400DP"
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr "Xerox Phaser 8400DX"
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Phaser 8400N"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr "Xerox Phaser 8500DN"
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr "Xerox Phaser 8500N"
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr "Xerox Phaser 8550DP"
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr "Xerox Phaser 8550DT"
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr "Xerox Phaser 8550DX"
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr "Xerox Phaser 8560DN"
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox WorkCentre 7345"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
-msgid "Canon SELPHY-CP-520"
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-520"
 
-#: src/xml/xmli18n-tmp.h:8384
-msgid "Canon SELPHY-CP-530"
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-530"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8387
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon SELPHY-CP-720"
-
-#: src/xml/xmli18n-tmp.h:8388
-msgid "Canon SELPHY-CP-730"
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:8389
-msgid "Canon SELPHY-CP-740"
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:8390
-msgid "Canon SELPHY-CP-750"
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:8391
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-800"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY ES1"
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY ES2"
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY ES20"
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr "Kodak EasyShare-G600-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr "Kodak PD-4000"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr "Kodak PD-6000"
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr "Kodak Photo-Printer"
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr "Kodak Photo-Printer-500"
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr "Kodak Printer-Dock-Plus"
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr "Kodak Printer-Dock-Plus-S3"
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr "Dai Nippon Printing DS40"
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr "Dai Nippon Printing DS80"
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "SUROVI 16 bitni PODATKI"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "SUROVI 8 bitni PODATKI"
 
+#, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon PIXMA iP1900"
+
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon PIXMA iP1900"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon PIXMA iP2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon PIXMA iP2000"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
+
 #~ msgid "Color=Yes,Category=Gamma"
 #~ msgstr "Barva=Da,Kategorija=Gama"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index f940a8f..1d0af8d 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index eb84242..e4bcc72 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,13 +3,13 @@
 # Daniel Nylander <po@danielnylander.se>, 2006.
 # Christian Rose <menthos@menthos.com>, 2001, 2002.
 #
-# $Id: sv.po,v 1.104 2011/05/02 01:36:58 rlk Exp $
+# $Id: sv.po,v 1.106 2011/12/27 02:27:52 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "Standard"
 
@@ -144,190 +144,210 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Pappersstorlek"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 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:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Typ av media (vanligt papper, fotopapper, etc.)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ av bläck i skrivaren"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr "Bläckkanaler"
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Utskriftsläge"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+#, fuzzy
+msgid "Ink Set"
+msgstr "Bläcktyp"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Typ av bläck i skrivaren"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "Utskriftskvalitet"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
@@ -335,7 +355,7 @@ msgstr "Justera cyanbalansen på utskriften"
 msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
@@ -343,101 +363,81 @@ msgstr "Ljus cyan"
 msgid "Light Magenta Transition"
 msgstr "Ljus magenta"
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr "Av"
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr "LÃ¥ng kant (Standard)"
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "CD - 5 tum"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "CD - 3 tum"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Anpassat"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 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:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-#, fuzzy
-msgid "Manual Control"
-msgstr "Utdatatyp:"
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "Standard"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "BÃ¥de och"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -486,154 +486,196 @@ msgstr "BÃ¥de och"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "Svart"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Foto"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "Inget"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+#, fuzzy
+msgid "Manual Control"
+msgstr "Utdatatyp:"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "Standard"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr "Hög träffsäkerhet"
@@ -668,7 +710,7 @@ msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -684,11 +726,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -799,8 +841,8 @@ msgid "Gamma value assumed by application"
 msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -852,178 +894,178 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -1032,8 +1074,8 @@ msgid "Adjust the cyan gamma"
 msgstr "Justera cyangamma"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1085,178 +1127,178 @@ msgstr "Justera cyangamma"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -1265,8 +1307,8 @@ msgid "Adjust the magenta gamma"
 msgstr "Justera magentagamma"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1318,178 +1360,178 @@ msgstr "Justera magentagamma"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "Gul"
 
@@ -1498,18 +1540,18 @@ msgid "Adjust the yellow gamma"
 msgstr "Justera gulgamma"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "Röd"
 
@@ -1526,14 +1568,14 @@ msgid "Adjust the green gamma"
 msgstr "Justera gröngamma"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "Blå"
 
@@ -1545,7 +1587,7 @@ msgstr "Justera blågamma"
 msgid "Adjust the black gamma"
 msgstr "Justera svartgamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "Cyanbalans"
 
@@ -1553,7 +1595,7 @@ msgstr "Cyanbalans"
 msgid "Adjust the cyan gray balance"
 msgstr "Justera cyan-gråbalansen"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "Magentabalans"
 
@@ -1561,7 +1603,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:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "Gulbalans"
 
@@ -1849,11 +1891,6 @@ msgstr "Förbättrat glansig"
 msgid "Add gloss enhancement"
 msgstr "Lägg till glansförbättring"
 
-#: src/main/print-escp2.c:251
-#, fuzzy
-msgid "Ink Set"
-msgstr "Bläcktyp"
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr ""
@@ -1862,14 +1899,6 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1879,7 +1908,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 #, fuzzy
 msgid "Output Order"
 msgstr "Utdatatyp:"
@@ -2264,145 +2293,153 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "Magenta"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 #, fuzzy
 msgid "Quality Enhancement"
 msgstr "Lägg till glansförbättring"
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Pappersstorlek"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ställ in standardvärden"
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "Utskriftsläge"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Vanligt papper"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Finjustering"
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr "Dubbelriktad"
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr "Enkelriktad"
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr "Undvik närmaste granne"
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 #, fuzzy
 msgid "Short Edge(Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, 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:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
@@ -2457,107 +2494,107 @@ 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:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 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:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 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:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 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:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
@@ -2876,24 +2913,17 @@ msgstr "Manuell utan paus"
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr "Inget"
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "Glansig"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr "Textur"
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr "Matt"
 
@@ -2901,32 +2931,32 @@ msgstr "Matt"
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr "Laminatmönster"
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "Svartbalans"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "Justera svartbalansen"
 
@@ -2958,7 +2988,7 @@ msgstr "Snabbtorkande foto"
 msgid "Quick-dry Transparency"
 msgstr "Snabbtorkande genomskinligt"
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "Manuell"
 
@@ -3048,26 +3078,19 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr "Utdrag"
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr "Hög"
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "Foto"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr "Färgpatroner + svarta patroner"
@@ -3097,15 +3120,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "Anpassat"
 
@@ -3113,7 +3136,7 @@ msgstr "Anpassat"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 #, fuzzy
 msgid "Fatal error!"
 msgstr "Fel: Ödesdigert fel\n"
@@ -3123,36 +3146,39 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr "Snabb ekonomi"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr "Ekonomi"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 #, 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:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr "Bästa"
 
@@ -3841,35 +3867,35 @@ msgstr "Skrivare"
 msgid "(Default Printer)"
 msgstr "(Standardskrivare)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "Skrivarfunktioner"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr "Vanlig"
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 msgid "Extra 5"
 msgstr "Extra 5"
 
@@ -3878,86 +3904,86 @@ 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr "Swedish"
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "Mediastorlek:"
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "Jobbläge"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Gråtoner"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "Färg"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY-färg"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 #, fuzzy
 msgid "Color Precision"
 msgstr "Färgjustering"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 #, fuzzy
 msgid "Value"
 msgstr "Blå"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 #, fuzzy
 msgid "Reverse"
 msgstr "Bästa"
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4257,28 +4283,28 @@ msgstr "Läsning från skrivaren fick timeout\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan inte läsa från %s: %s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, fuzzy, c-format
 msgid "Please specify a raw device\n"
 msgstr "Skrivarstatus kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "Okänd flagga %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4287,7 +4313,7 @@ msgstr ""
 "\n"
 "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4298,7 +4324,7 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4340,22 +4366,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr "Fotosvart"
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "Okänt"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4377,83 +4403,83 @@ msgstr "Okänt"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4475,114 +4501,114 @@ msgstr "Ljus cyan"
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr "Ljus svart"
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4624,337 +4650,337 @@ msgstr "Ljus svart"
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr "Matt svart"
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr "Glansoptimerare"
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr "Ljus-ljus svart"
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 #, fuzzy
 msgid "Orange"
 msgstr "Sida"
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr "Status: Fel\n"
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr "Status: Upptagen\n"
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, c-format
 msgid "Status: Waiting\n"
 msgstr "Status: Väntar\n"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr "Status: Overksam\n"
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr "Status: Pausad\n"
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr "Status: Rensar\n"
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr "Status: Stänger ner\n"
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr "Status: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr "Fel: Ödesdigert fel\n"
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr "Fel: Slut på bläck\n"
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr "Fel: Slut på papper\n"
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, fuzzy, c-format
 msgid "Error: Rear cover open\n"
 msgstr "Fel: Slut på papper\n"
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr "Fel: Kortläsningsfel\n"
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, fuzzy, c-format
 msgid "Error: Front cover open\n"
 msgstr "Fel: Ödesdigert fel\n"
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr "Fel: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, fuzzy, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr "Varning: Svart bläcknivå är låg\n"
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, fuzzy, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr "Varning: Svart bläcknivå är låg\n"
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr "Varning: Okänt (%d)\n"
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr "Skriver ut självtest av munstycke\n"
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "Skrivarnamn:"
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr "Bläcknivåer:\n"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "Bläckfärg"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr "Återstående procent"
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr "Jobbnamn: "
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr "bläcknivåer"
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Få tag på %s kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Få tag på bläckinformation kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "Datum"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan inte identifiera skrivarmodellen.\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Rensar huvuden...\n"
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
 "skrivaren.\n"
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5028,7 +5054,7 @@ msgstr ""
 "Det är viktigt att du inte stänger av din skrivare under denna process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5096,17 +5122,17 @@ msgstr ""
 "process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr "Avslutar\n"
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5125,20 +5151,20 @@ msgstr ""
 "Du kommer att få bekräfta ditt val.\n"
 "Vad vill du göra (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n"
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5147,7 +5173,7 @@ msgstr ""
 "OK, din skrivare är justerad, men justeringen har inte sparats.\n"
 "Om du vill spara justeringen måste du upprepa detta förlopp.\n"
 
-#: src/escputil/escputil.c:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5156,12 +5182,12 @@ msgstr ""
 "Bekräfta att du vill upprepa justeringsprocessen genom att\n"
 "ange \"r\" igen:\n"
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Upprepar justeringsprocessen.\n"
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5176,17 +5202,17 @@ msgstr ""
 "Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
 "\"s\" igen:\n"
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "Kommer att spara inställningar..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "misslyckades!\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5195,27 +5221,27 @@ msgstr ""
 "Dina inställningar sparades inte utan problem. Du måste upprepa\n"
 "justeringsproceduren.\n"
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "lyckades!\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Okänt kommando.\n"
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Sista kommandot bekräftades inte.\n"
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, fuzzy, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -5232,12 +5258,12 @@ msgstr ""
 "Placera ett pappersark i skrivaren för att påbörja justeringen\n"
 "av huvudena.\n"
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "Tryck retur för att fortsätta > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5248,42 +5274,42 @@ msgstr ""
 "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
 "proceduren.\n"
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass %d"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Mata in ett nytt pappersark.\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numret är utanför intervallet!\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jag kan inte förstå vad du skrev!\n"
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Försöker ställa in justering..."
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "lyckades.\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5296,11 +5322,20 @@ msgstr ""
 "linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n"
 "att få bästa utskriftskvalitet.\n"
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr "Fel i indata\n"
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/Arkiv/Skriv ut..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "Skriver ut..."
@@ -5569,21 +5604,21 @@ msgstr "Skriver ut..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5612,7 +5647,7 @@ msgstr "Matte-papper"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "Vykort"
 
@@ -5906,29 +5941,29 @@ msgstr "Fotopapper med premiumlyster"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr "Quadtone"
 
@@ -6291,8 +6326,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
@@ -6368,8 +6403,8 @@ msgstr "Sexfärgs foto"
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6382,10 +6417,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6526,6 +6561,7 @@ msgstr "360 DPI hög kvalitet"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6586,6 +6622,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
@@ -6646,6 +6683,7 @@ msgstr "720 × 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6771,7 +6809,8 @@ msgstr "720 DPI hög kvalitet"
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
@@ -6849,6 +6888,7 @@ msgstr "2880 × 720 DPI högsta kvalitet"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
@@ -6885,12 +6925,13 @@ msgstr "1440 × 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr "Mörk gul"
 
@@ -6912,6 +6953,7 @@ msgstr "Mörk gul"
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
@@ -6992,8337 +7034,8980 @@ msgstr "Ljus magenta"
 msgid "Vivid Magenta"
 msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 #, fuzzy
 msgid "Main Tray"
 msgstr "Fack"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "Fotografi"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "Skriv ut till cd"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Fack"
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotosvart"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr "Enfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr "Trefärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr "Fyrfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr "Femfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr "Sexfärgers rå"
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "Fack 3"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "Fack 2"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "Fack 1"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "MIS Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "Fack 1"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "Fack 4"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 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:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 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:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 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:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 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:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sjufärgers förbättrad glansig rå"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "Matt svart"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "Standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 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:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr "Sjufärgers rå"
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 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:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr "Tvåfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr "Åttafärgers foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr "Åttafärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Sexfärgs foto"
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr "Full överlappning"
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr "PÃ¥"
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr "Amerikansk folio"
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr "Europeisk folio"
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr "Large crown quarto"
 
 # får plats
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr "Royal quarto"
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr "Large crown octavo"
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr "Royal octavo"
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr "Liten pocket"
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr "Liten pingvinpocket"
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr "Stor pingvinpocket"
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr "Hagaki-kort"
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr "Oufuku-kort"
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Japanskt långt kuvert 4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Japanskt långt kuvert 4"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Japanskt långt kuvert 3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Japanskt långt kuvert 3"
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr "A2-inbjudan"
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr "Monarkkuvert"
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarkkuvert"
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr "Kort"
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr "Brett vykort"
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr "89 mm rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 mm rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr "PostScript nivå 1"
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr "PostScript nivå 2"
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-6500"
+
+#: src/xml/xmli18n-tmp.h:6833
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon iP4000"
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon iP4000"
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
+msgid "Canon PIXMA mini220"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
-msgstr "Canon iP4000"
+msgid "Canon PIXMA mini360"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
-msgstr "Canon iP4000"
+msgid "Canon PIXMA iP90"
+msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
-msgstr "Canon iP4000"
+msgid "Canon PIXMA iP90v"
+msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
-msgid "Canon PIXMA iP2500"
+msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
-msgid "Canon PIXMA iP2600"
+msgid "Canon PIXMA iP3100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon S100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
-msgid "Canon PIXMA iP3000"
+msgid "Canon PIXMA iP3500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6875
 #, fuzzy
-msgid "Canon PIXMA iP3100"
+msgid "Canon PIXMA iP3600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6880
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6902
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:6946
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6970
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:6930
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
-msgid "Canon i865"
+msgid "Canon i865old"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 #, fuzzy
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 #, fuzzy
 msgid "Brother HL-1430"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 #, fuzzy
 msgid "Brother HL-1450"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 #, fuzzy
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 #, fuzzy
 msgid "Brother HL-1650"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 #, fuzzy
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 #, fuzzy
 msgid "Brother HL-1850"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 #, fuzzy
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 #, fuzzy
 msgid "Brother HL-2030"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 #, fuzzy
 msgid "Brother HL-2035"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 #, fuzzy
 msgid "Brother HL-2460"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 #, fuzzy
 msgid "Brother HL-2460N"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 #, fuzzy
 msgid "Brother HL-5030"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 #, fuzzy
 msgid "Brother HL-5040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 #, fuzzy
 msgid "Brother HL-5050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 #, fuzzy
 msgid "Brother HL-5070N"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 #, fuzzy
 msgid "Brother HL-5140"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 #, fuzzy
 msgid "Brother HL-5150D"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 #, fuzzy
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 #, fuzzy
 msgid "Brother HL-7050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 #, fuzzy
 msgid "Brother HL-7050N"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 msgid "Generic PCL 4 Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 msgid "Generic PCL 5 Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 msgid "Generic PCL 5c Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 msgid "Generic PCL 5e Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 #, fuzzy
 msgid "Gestetner MP1100/DSm7110"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 #, fuzzy
 msgid "Gestetner MP1350/DSm7135"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 #, fuzzy
 msgid "Gestetner MP1600/DSm716"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 #, fuzzy
 msgid "Gestetner MP2000/DSm721d"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 #, fuzzy
 msgid "Gestetner MP2500/DSm625"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 #, fuzzy
 msgid "Gestetner MP3500/DSm735e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 #, fuzzy
 msgid "Gestetner MP4500/DSm745e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 #, fuzzy
 msgid "Gestetner MP5500/DSm755"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 #, fuzzy
 msgid "Gestetner MP6500/DSm765"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 #, fuzzy
 msgid "Gestetner MP7500/DSm775"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 #, fuzzy
 msgid "Gestetner MP9000/DSm790"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 #, fuzzy
 msgid "Gestetner MP 161/DSm416"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 #, fuzzy
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 #, fuzzy
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 #, fuzzy
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 #, fuzzy
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 #, fuzzy
 msgid "Infotec IS2035"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 #, fuzzy
 msgid "Infotec IS2045"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 #, fuzzy
 msgid "Infotec IS2105"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 #, fuzzy
 msgid "Infotec IS 2015"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 #, fuzzy
 msgid "Infotec IS 2018"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 #, fuzzy
 msgid "Infotec IS 2060"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 #, fuzzy
 msgid "Infotec IS 2075"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 #, fuzzy
 msgid "Infotec IS 2122"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 #, fuzzy
 msgid "Infotec IS 2127"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 #, fuzzy
 msgid "Infotec IS 2132"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 #, fuzzy
 msgid "Infotec IS 2135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 #, fuzzy
 msgid "Infotec IS 2145"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 #, fuzzy
 msgid "Infotec IS 2151"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 #, fuzzy
 msgid "Infotec IS 2160"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 #, fuzzy
 msgid "Infotec IS 2175"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 #, fuzzy
 msgid "Infotec IS 2215"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 #, fuzzy
 msgid "Infotec IS 2216"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 #, fuzzy
 msgid "Infotec IS 2220"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 #, fuzzy
 msgid "Infotec IS 2225"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 #, fuzzy
 msgid "Infotec IS 2230"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 #, fuzzy
 msgid "Infotec IS 2235"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 #, fuzzy
 msgid "Infotec IS 2245"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 #, fuzzy
 msgid "Infotec IS 2255"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 #, fuzzy
 msgid "Infotec IS 2265"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 #, fuzzy
 msgid "Infotec IS 2275"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 #, fuzzy
 msgid "Infotec IS 2316"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 #, fuzzy
 msgid "Infotec IS 2320"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 #, fuzzy
 msgid "Infotec IS 2325"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 #, fuzzy
 msgid "Infotec IS 2416"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 #, fuzzy
 msgid "Infotec IS 2425"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 #, fuzzy
 msgid "Infotec IS 2430"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 #, fuzzy
 msgid "Infotec IS 2435"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 #, fuzzy
 msgid "Infotec IS 2445"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 #, fuzzy
 msgid "Infotec IS 3090"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 #, fuzzy
 msgid "Infotec IS 3110"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 #, fuzzy
 msgid "Infotec IS 3135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 #, fuzzy
 msgid "Infotec MP 2550"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 #, fuzzy
 msgid "Infotec MP 3350"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 #, fuzzy
 msgid "Infotec MP 4000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 #, fuzzy
 msgid "Infotec MP 5000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 #, fuzzy
 msgid "Kyocera CS-1815"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 #, fuzzy
 msgid "Kyocera FS-920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 #, fuzzy
 msgid "Kyocera FS-1018MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 #, fuzzy
 msgid "Kyocera FS-1020D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 #, fuzzy
 msgid "Kyocera FS-1030D"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 #, fuzzy
 msgid "Kyocera FS-1118MFP"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 #, fuzzy
 msgid "Kyocera FS-1714M"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 #, fuzzy
 msgid "Kyocera FS-1920"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 #, fuzzy
 msgid "Kyocera FS-2000D"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 #, fuzzy
 msgid "Kyocera FS-3718M"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 #, fuzzy
 msgid "Kyocera FS-3820N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 #, fuzzy
 msgid "Kyocera FS-3830N"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 #, fuzzy
 msgid "Kyocera FS-3900DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 #, fuzzy
 msgid "Kyocera FS-4000DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 #, fuzzy
 msgid "Kyocera FS-6020"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 #, fuzzy
 msgid "Kyocera FS-6026"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 #, fuzzy
 msgid "Kyocera FS-6300"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 #, fuzzy
 msgid "Kyocera FS-6750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 #, fuzzy
 msgid "Kyocera FS-6900"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 #, fuzzy
 msgid "Kyocera FS-6950DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 #, fuzzy
 msgid "Kyocera FS-7028M"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 #, fuzzy
 msgid "Kyocera FS-9130DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 #, fuzzy
 msgid "Kyocera FS-9530DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 #, fuzzy
 msgid "Kyocera KM-1510"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 #, fuzzy
 msgid "Kyocera KM-1815"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 #, fuzzy
 msgid "Kyocera KM-1820"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 #, fuzzy
 msgid "Kyocera KM-3050"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 #, fuzzy
 msgid "Kyocera KM-4050"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 #, fuzzy
 msgid "Kyocera KM-4230/5230"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 #, fuzzy
 msgid "Kyocera KM-5050"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 #, fuzzy
 msgid "Kyocera KM-6030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 #, fuzzy
 msgid "Kyocera KM-8030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 #, fuzzy
 msgid "Lanier MP2500/LD125"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 #, fuzzy
 msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 #, fuzzy
 msgid "Lanier MP 1350/LD1135"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 #, fuzzy
 msgid "Lanier MP 1600/LD316"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 #, fuzzy
 msgid "Lanier MP 161/LD016"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 #, fuzzy
 msgid "Lanier MP 2000/LD320d"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 #, fuzzy
 msgid "Lanier MP 2510/LD325"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 #, fuzzy
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 #, fuzzy
 msgid "Lanier MP 2550/LD425"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 #, fuzzy
 msgid "Lanier MP 3010/LD330"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 #, fuzzy
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 #, fuzzy
 msgid "Lanier MP 3350/LD433"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 #, fuzzy
 msgid "Lanier MP 3500/LD335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 #, fuzzy
 msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 #, fuzzy
 msgid "Lanier MP 4000/LD040"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 #, fuzzy
 msgid "Lanier MP 4500/LD345"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 #, fuzzy
 msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 #, fuzzy
 msgid "Lanier MP 5000/LD050"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 #, fuzzy
 msgid "Lanier MP 5500/LD255"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 #, fuzzy
 msgid "Lanier MP 6500/LD265"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 #, fuzzy
 msgid "Lanier MP 7500/LD275"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 #, fuzzy
 msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 #, fuzzy
 msgid "Oki B4350"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 #, fuzzy
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 #, fuzzy
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 #, fuzzy
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 #, fuzzy
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 #, fuzzy
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 #, fuzzy
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 #, fuzzy
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 #, fuzzy
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 #, fuzzy
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 #, fuzzy
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 #, fuzzy
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 #, fuzzy
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 #, fuzzy
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 #, fuzzy
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 #, fuzzy
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 #, fuzzy
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 #, fuzzy
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 #, fuzzy
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 #, fuzzy
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 #, fuzzy
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 #, fuzzy
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 #, fuzzy
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 #, fuzzy
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 #, fuzzy
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 #, fuzzy
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 #, fuzzy
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 #, fuzzy
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 #, fuzzy
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 #, fuzzy
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 #, fuzzy
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 #, fuzzy
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 #, fuzzy
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 #, fuzzy
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 #, fuzzy
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 #, fuzzy
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 #, fuzzy
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 #, fuzzy
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 #, fuzzy
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 #, fuzzy
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 #, fuzzy
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 #, fuzzy
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 #, fuzzy
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 #, fuzzy
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 #, fuzzy
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 #, fuzzy
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 #, fuzzy
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 #, fuzzy
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 #, fuzzy
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 #, fuzzy
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 #, fuzzy
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 #, fuzzy
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 #, fuzzy
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 #, fuzzy
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 #, fuzzy
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 #, fuzzy
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 #, fuzzy
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 #, fuzzy
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 #, fuzzy
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 #, fuzzy
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 #, fuzzy
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 #, fuzzy
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 #, fuzzy
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 #, fuzzy
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 #, fuzzy
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 #, fuzzy
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 #, fuzzy
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 #, fuzzy
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 #, fuzzy
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 #, fuzzy
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 #, fuzzy
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 #, fuzzy
 msgid "Savin 2535/2235"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 #, fuzzy
 msgid "Savin 2545/2245"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 #, fuzzy
 msgid "Savin 40105"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 #, fuzzy
 msgid "Savin 4035/4135g"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 #, fuzzy
 msgid "Savin 4035e/4135eG"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 #, fuzzy
 msgid "Savin 4045/4145g"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 #, fuzzy
 msgid "Savin 4045e/4145eG"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 #, fuzzy
 msgid "Savin 8035/8035g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 #, fuzzy
 msgid "Savin 8045/8045g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 #, fuzzy
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 #, fuzzy
 msgid "Xerox Phaser 4400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 #, fuzzy
 msgid "Xerox Phaser 4400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 #, fuzzy
 msgid "Xerox Phaser 4500B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 #, fuzzy
 msgid "Xerox Phaser 4500DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 #, fuzzy
 msgid "Xerox Phaser 4500DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 #, fuzzy
 msgid "Xerox Phaser 4500N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 #, fuzzy
 msgid "Xerox Phaser 4510B"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 #, fuzzy
 msgid "Xerox Phaser 4510DT"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 #, fuzzy
 msgid "Xerox Phaser 4510DX"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 #, fuzzy
 msgid "Xerox Phaser 4510N"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 #, fuzzy
 msgid "Xerox Phaser 6130N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 #, fuzzy
 msgid "Xerox Phaser 7400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 #, fuzzy
 msgid "Xerox Phaser 8400B"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 #, fuzzy
 msgid "Xerox Phaser 8400N"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 #, fuzzy
 msgid "Xerox WorkCentre 7345"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:8380
-msgid "Canon SELPHY-CP-400"
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8381
-msgid "Canon SELPHY-CP-500"
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8382
-msgid "Canon SELPHY-CP-510"
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:8383
+#: src/xml/xmli18n-tmp.h:8529
 #, fuzzy
-msgid "Canon SELPHY-CP-520"
+msgid "Canon SELPHY-CP520"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8385
-msgid "Canon SELPHY-CP-600"
-msgstr "Canon SELPHY-CP-600"
-
-#: src/xml/xmli18n-tmp.h:8386
-msgid "Canon SELPHY-CP-710"
-msgstr "Canon SELPHY-CP-710"
-
-#: src/xml/xmli18n-tmp.h:8387
+#: src/xml/xmli18n-tmp.h:8531
 #, fuzzy
-msgid "Canon SELPHY-CP-720"
+msgid "Canon SELPHY-CP710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8388
+#: src/xml/xmli18n-tmp.h:8532
 #, fuzzy
-msgid "Canon SELPHY-CP-730"
+msgid "Canon SELPHY-CP730"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8389
+#: src/xml/xmli18n-tmp.h:8533
 #, fuzzy
-msgid "Canon SELPHY-CP-740"
+msgid "Canon SELPHY-CP740"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:8390
+#: src/xml/xmli18n-tmp.h:8534
 #, fuzzy
-msgid "Canon SELPHY-CP-750"
+msgid "Canon SELPHY-CP750"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:8391
-#, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon SELPHY-CP-400"
-
-#: src/xml/xmli18n-tmp.h:8392
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY ES1"
-msgstr "Canon SELPHY-CP-510"
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8393
+#: src/xml/xmli18n-tmp.h:8536
 #, fuzzy
-msgid "Canon SELPHY ES2"
-msgstr "Canon SELPHY-CP-400"
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8394
+#: src/xml/xmli18n-tmp.h:8537
 #, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon SELPHY-CP-400"
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 #, fuzzy
 msgid "Kodak PD-4000"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr "RÃ… DATA 16-bitar"
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr "RÃ… DATA 8-bitar"
 
 #, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon BJC-85"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon iP4000"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-710"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#, fuzzy
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY-CP-400"
+
+#, fuzzy
 #~ msgid "Color=Yes,Category=Basic Image Adjustment"
 #~ msgstr "Grundläggande bildjustering"
 
@@ -15631,9 +16316,6 @@ msgstr "RÃ… DATA 8-bitar"
 #~ "mer\n"
 #~ "information.\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/Arkiv/Skriv ut..."
-
 #~ msgid ""
 #~ "ijsgutenprint: the version of Gutenprint software installed (%s)\n"
 #~ "  does not match the PPD file (%s).  If you have upgraded your version\n"
diff --git a/po/uk.gmo b/po/uk.gmo
new file mode 100644
index 0000000..82c5765
--- /dev/null
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 0000000..b173c05
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,15158 @@
+# Ukrainian translation for gutenprint.
+# Copyright (C) 2011 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.
+#
+# Yuri Chornoivan <yurchor@ukr.net>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: gutenprint 20110308\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
+"PO-Revision-Date: 2011-07-03 12:40+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/main/dither-main.c:44 src/main/print-color.c:49
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
+msgid "Default"
+msgstr "Типовий"
+
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
+#: 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
+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: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: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 ""
+"Виберіть алгоритм згладжуванн�, �кий буде викори�тано.\n"
+"Викори�танн� адаптивного гібридного алгоритму зазвичай забезпечує найкращу "
+"�кі�ть.\n"
+"EvenTone — новий те�товий алгоритм, �кий ча�то дає чудові результати.\n"
+"Викори�танн� алгоритму «Впор�дкований» пришвидшує обробку і надає змогу "
+"отримувати �кі�ть, близьку до �ко�ті фотографічних відбитків.\n"
+"�лгоритми «Швидкий» і «Дуже швидкий» є значно швидшими за інші, вони добре "
+"працюють дл� тек�ту та штрихових зображень.\n"
+"Викори�танн� алгоритму «Гібридний Флойда-Штайнберга» у загальному випадку "
+"дає доволі погані результати."
+
+#: 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:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
+#: src/main/print-pcl.c:1346 src/main/print-ps.c:74
+msgid "Page Size"
+msgstr "Розмір аркуша"
+
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1347 src/main/print-ps.c:75
+msgid "Size of the paper being printed to"
+msgstr "Розмір аркуша, на �кому буде виконано друк"
+
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
+msgid "Media Type"
+msgstr "Тип но�і�"
+
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
+#: src/main/print-pcl.c:1353
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr "Тип но�і� (звичайний папір, фотопапір тощо)"
+
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
+msgid "Media Source"
+msgstr "Джерело но�і�"
+
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
+#: src/main/print-pcl.c:1359
+msgid "Source (input slot) of the media"
+msgstr "Джерело (вхідний лоток) но�і�"
+
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
+msgid "CD Hub Size"
+msgstr "Внутрішній діаметр CD"
+
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr "Друкувати лише за межами отвору у компакт-ди�ку або в�юди, окрім дірки"
+
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
+msgid "CD Size (Custom)"
+msgstr "Зовнішній діаметр CD (нетиповий)"
+
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr "Коригуванн� зовнішнього діаметра компакт-ди�ка"
+
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
+msgid "CD Hub Size (Custom)"
+msgstr "Внутрішній діаметр CD (нетиповий)"
+
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr "Коригуванн� діаметра отвору компакт-ди�ка"
+
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
+msgid "CD Horizontal Fine Adjustment"
+msgstr "Додаткове горизонтальне коригуванн�"
+
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
+#: src/main/print-escp2.c:211 src/main/print-escp2.c:217
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr "Додаткове коригуванн� горизонтальної позиції друку компакт-ди�ка"
+
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
+msgid "CD Vertical Fine Adjustment"
+msgstr "Додаткове вертикальне коригуванн�"
+
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
+msgid "Resolution"
+msgstr "Роздільні�ть"
+
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
+msgid "Resolution and quality of the print"
+msgstr "Роздільні�ть і �кі�ть друку"
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
+#: src/main/print-pcl.c:1376 src/main/print-raw.c:80
+msgid "Ink Type"
+msgstr "Тип чорнил"
+
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
+#: src/main/print-raw.c:81
+msgid "Type of ink in the printer"
+msgstr "Тип чорнила у принтері"
+
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:324
+#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
+#: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
+msgid "Ink Channels"
+msgstr "Канали чорнил"
+
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
+#: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
+msgid "Printing Mode"
+msgstr "Режим друку"
+
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
+#: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
+msgid "Printing Output Mode"
+msgstr "Режим виводу друку"
+
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr "�абір чорнил"
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "Тип чорнила у принтері"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr "Без рамки"
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr "Друк без рамки"
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
+#: src/main/print-pcl.c:1394
+msgid "Double-Sided Printing"
+msgstr "Дво�торонній друк"
+
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
+#: src/main/print-pcl.c:1395
+msgid "Duplex/Tumble Setting"
+msgstr "Параметр дво�тороннього друку"
+
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:163
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Які�ть друку"
+
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
+msgid "Cyan Density"
+msgstr "Щільні�ть блакитного"
+
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
+msgid "Adjust the cyan density"
+msgstr "Змінити щільні�ть блакитного"
+
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
+msgid "Magenta Density"
+msgstr "Щільні�ть пурпурового"
+
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
+msgid "Adjust the magenta density"
+msgstr "Змінити щільні�ть пурпурового"
+
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
+msgid "Yellow Density"
+msgstr "Щільні�ть жовтого"
+
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
+msgid "Adjust the yellow density"
+msgstr "Змінити щільні�ть жовтого"
+
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
+msgid "Black Density"
+msgstr "Щільні�ть чорного"
+
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
+msgid "Adjust the black density"
+msgstr "Змінити щільні�ть чорного"
+
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
+#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
+#: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
+msgid "Light Cyan Transition"
+msgstr "Світло-бірюзовий перехід"
+
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
+#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
+#: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
+msgid "Light Magenta Transition"
+msgstr "Світло-бузковий перехід"
+
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
+msgid "Light Yellow Transition"
+msgstr "Світло-жовтий перехід"
+
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
+msgid "Off"
+msgstr "Вимкн."
+
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
+#: src/main/print-pcl.c:1684
+msgid "Long Edge (Standard)"
+msgstr "Впродовж довгої �торони (типове)"
+
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
+msgid "Short Edge (Flip)"
+msgstr "Впродовж короткої �торони (з переворотом)"
+
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
+msgid "CD - 5 inch"
+msgstr "CD — 5 дюймів"
+
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
+msgid "CD - 3 inch"
+msgstr "CD — 3 дюйма"
+
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
+msgid "CD - Custom"
+msgstr "CD — нетиповий"
+
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
+msgid "Normal"
+msgstr "Звичайний"
+
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
+msgid "Print To Hub"
+msgstr "Друкувати до отвору"
+
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
+msgid "Black and White"
+msgstr "Чорно-білий"
+
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "В�юди"
+
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
+#: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
+#: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2706 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2747
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2823
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2888 src/xml/xmli18n-tmp.h:2902
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2928
+#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2969 src/xml/xmli18n-tmp.h:2982
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3008
+#: 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:3077 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3176 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3226
+#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3309
+#: src/xml/xmli18n-tmp.h:3321 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:3382
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3588 src/xml/xmli18n-tmp.h:3600
+#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3652
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3701 src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:3749 src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
+msgid "Black"
+msgstr "Чорний"
+
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "Фото"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr "�емає"
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Керуванн� вручну"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+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:1269 src/cups/genppd.c:2361
+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:1300 src/cups/genppd.c:2368
+msgid "CMYK"
+msgstr "CMYK"
+
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
+msgid "KCMY"
+msgstr "KCMY"
+
+#: src/main/print-color.c:165 src/main/print-color.c:454
+msgid "Channel "
+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: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:347
+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: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:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2735 src/xml/xmli18n-tmp.h:2748
+#: src/xml/xmli18n-tmp.h:2760 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2824
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2889 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:2929
+#: src/xml/xmli18n-tmp.h:2943 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:2970 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3009
+#: 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:3078 src/xml/xmli18n-tmp.h:3093
+#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3165
+#: src/xml/xmli18n-tmp.h:3177 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: 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:3383 src/xml/xmli18n-tmp.h:3396
+#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3426
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3456
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3576
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3601
+#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:3641 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3687
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:3731 src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
+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:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2723
+#: src/xml/xmli18n-tmp.h:2736 src/xml/xmli18n-tmp.h:2749
+#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2865 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2904
+#: src/xml/xmli18n-tmp.h:2917 src/xml/xmli18n-tmp.h:2930
+#: src/xml/xmli18n-tmp.h:2944 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3064
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3094
+#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3130 src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3166
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3255 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3283 src/xml/xmli18n-tmp.h:3296
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: 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:3384 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3425
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3487
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3520
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:3590 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3627
+#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3669 src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3730 src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:3757 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3927 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
+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:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
+#: src/xml/xmli18n-tmp.h:2677 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2877
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2918 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3095
+#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3179 src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3361 src/xml/xmli18n-tmp.h:3373
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3398
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3486
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3615 src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3655
+#: src/xml/xmli18n-tmp.h:3665 src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:3704 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3732 src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3849 src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:3875 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
+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:1052 src/escputil/escputil.c:1071
+#: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
+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:1053 src/escputil/escputil.c:1072
+#: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
+msgid "Blue"
+msgstr "Синій (B)"
+
+#: src/main/print-color.c:307
+msgid "Adjust the blue gamma"
+msgstr "Виправити гаму �инього"
+
+#: src/main/print-color.c:315
+msgid "Adjust the black gamma"
+msgstr "Виправити гаму чорного"
+
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
+msgid "Cyan Balance"
+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:2077
+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:2085
+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 ""
+"Коригуванн� на�ичено�ті (балан�у кольорів) відбитка.\n"
+"За нульового значенн� на�ичено�ті відбиток буде чорно-білим."
+
+#: src/main/print-color.c:357
+msgid "Ink Limit"
+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:878
+msgid "GCR Transition"
+msgstr "Перехід GCR"
+
+#: src/main/print-color.c:366 src/main/print-escp2.c:879
+msgid "Adjust the gray component transition rate"
+msgstr "Коригуванн� переходу напівтонів"
+
+#: src/main/print-color.c:373 src/main/print-escp2.c:886
+msgid "GCR Lower Bound"
+msgstr "�ижн� межа GCR"
+
+#: src/main/print-color.c:374 src/main/print-escp2.c:887
+msgid "Lower bound of gray component reduction"
+msgstr "�ижн� межа �прощенн� �ірого компонента"
+
+#: src/main/print-color.c:381 src/main/print-escp2.c:894
+msgid "GCR Upper Bound"
+msgstr "Верхн� межа GCR"
+
+#: src/main/print-color.c:382 src/main/print-escp2.c:895
+msgid "Upper bound of gray component reduction"
+msgstr "Верхн� межа �прощенн� �ірого компонента"
+
+#: src/main/print-color.c:421
+msgid "LUT dump file"
+msgstr "Файл дампу LUT"
+
+#: src/main/print-color.c:421
+msgid "Advanced Output Control"
+msgstr "Додаткове керуванн� над виводом"
+
+#: src/main/print-color.c:422
+msgid "Dump file for LUT for external color adjustment"
+msgstr "Файл дампу таблиці пошуку (LUT) дл� зовнішнього коригуванн� кольорів"
+
+#: src/main/print-color.c:456
+msgid "Curve for raw channel "
+msgstr "Крива каналу raw "
+
+#: src/main/print-color.c:466
+msgid "Cyan Curve"
+msgstr "Крива блакитного"
+
+#: src/main/print-color.c:467
+msgid "Cyan curve"
+msgstr "Крива блакитного"
+
+#: src/main/print-color.c:474
+msgid "Magenta Curve"
+msgstr "Крива пурпурового"
+
+#: src/main/print-color.c:475
+msgid "Magenta curve"
+msgstr "Крива пурпурового"
+
+#: src/main/print-color.c:482
+msgid "Yellow Curve"
+msgstr "Крива жовтого"
+
+#: src/main/print-color.c:483
+msgid "Yellow curve"
+msgstr "Крива жовтого"
+
+#: src/main/print-color.c:490
+msgid "Black Curve"
+msgstr "Крива чорного"
+
+#: src/main/print-color.c:491
+msgid "Black curve"
+msgstr "Крива чорного"
+
+#: src/main/print-color.c:498
+msgid "Red Curve"
+msgstr "Крива червоного"
+
+#: src/main/print-color.c:499
+msgid "Red curve"
+msgstr "Крива червоного"
+
+#: src/main/print-color.c:506
+msgid "Green Curve"
+msgstr "Крива зеленого"
+
+#: src/main/print-color.c:507
+msgid "Green curve"
+msgstr "Крива зеленого"
+
+#: src/main/print-color.c:514
+msgid "Blue Curve"
+msgstr "Крива �инього"
+
+#: src/main/print-color.c:515
+msgid "Blue curve"
+msgstr "Крива �инього"
+
+#: src/main/print-color.c:522
+msgid "White Curve"
+msgstr "Крива білого"
+
+#: src/main/print-color.c:523
+msgid "White curve"
+msgstr "Крива білого"
+
+#: src/main/print-color.c:530
+msgid "Hue Map"
+msgstr "Карта відтінку"
+
+#: src/main/print-color.c:531
+msgid "Hue adjustment curve"
+msgstr "Крива виправленн� відтінку"
+
+#: src/main/print-color.c:538
+msgid "Saturation Map"
+msgstr "Карта на�ичено�ті"
+
+#: src/main/print-color.c:539
+msgid "Saturation adjustment curve"
+msgstr "Крива виправленн� на�ичено�ті"
+
+#: src/main/print-color.c:546
+msgid "Luminosity Map"
+msgstr "Карта о�вітлено�ті"
+
+#: src/main/print-color.c:547
+msgid "Luminosity adjustment curve"
+msgstr "Карта виправленн� о�вітлено�ті"
+
+#: src/main/print-color.c:554
+msgid "Gray Component Reduction"
+msgstr "Спрощенн� �ірого компонента"
+
+#: src/main/print-color.c:555
+msgid "Gray component reduction curve"
+msgstr "Крива �прощенн� �ірого компонента"
+
+#: src/main/print-color.c:1740
+msgid "Traditional Gutenprint color conversion"
+msgstr "Традиційне перетворенн� кольорів Gutenprint"
+
+#: src/main/printers.c:597
+#, c-format
+msgid "Value must be set for %s\n"
+msgstr "Слід в�тановити значенн� %s\n"
+
+#: src/main/printers.c:610 src/main/printers.c:615
+#, c-format
+msgid "`%s' is not a valid %s\n"
+msgstr "«%s» не є коректним %s\n"
+
+#: src/main/printers.c:634
+#, c-format
+msgid "%s must be between %f and %f (is %f)\n"
+msgstr "%s має бути у межах від %f до %f (маємо %f)\n"
+
+#: src/main/printers.c:656 src/main/printers.c:680
+#, c-format
+msgid "%s must be between %d and %d (is %d)\n"
+msgstr "%s має бути у межах від %d до %d (маємо %d)\n"
+
+#: src/main/printers.c:711
+#, c-format
+msgid "%s bounds must be between %f and %f\n"
+msgstr "Межі %s мають бути між %f і %f\n"
+
+#: src/main/printers.c:719
+#, c-format
+msgid "%s wrap mode must be %s\n"
+msgstr "Режимом розбитт� %s має бути %s\n"
+
+#: src/main/printers.c:723
+msgid "no wrap"
+msgstr "без розбитт�"
+
+#: src/main/printers.c:723
+msgid "wrap around"
+msgstr "згортанн�"
+
+#: src/main/printers.c:767
+#, c-format
+msgid "Unknown type parameter %s (%d)\n"
+msgstr "Параметр невідомого типу %s (%d)\n"
+
+#: src/main/printers.c:780 src/main/printers.c:791
+#, c-format
+msgid "%s out of range (value %d, min %d, max %d)\n"
+msgstr "%s поза межами діапазону (значенн�: %d, мінімум: %d, мак�имум: %d)\n"
+
+#: src/main/printers.c:851
+msgid "Page size is not valid\n"
+msgstr "�екоректний розмір �торінки\n"
+
+#: src/main/printers.c:872
+#, c-format
+msgid "Top margin must not be less than %d\n"
+msgstr "Верхнє поле має бути меншим за %d\n"
+
+#: src/main/printers.c:878
+#, c-format
+msgid "Left margin must not be less than %d\n"
+msgstr "Ліве поле має бути меншим за %d\n"
+
+#: src/main/printers.c:884
+msgid "Height must be greater than zero\n"
+msgstr "Ви�ота має бути більшою за нуль\n"
+
+#: src/main/printers.c:890
+msgid "Width must be greater than zero\n"
+msgstr "Ширина має бути більшою за нуль\n"
+
+#: src/main/printers.c:896
+#, c-format
+msgid ""
+"Image is too wide for the page: left margin is %d, width %d, right edge is "
+"%d\n"
+msgstr ""
+"Зображенн� є занадто широким дл� �торінки: ліве поле — %d, ширина %d, правий "
+"край — %d\n"
+
+#: src/main/printers.c:903
+#, c-format
+msgid ""
+"Image is too long for the page: top margin is %d, height %d, bottom edge is "
+"%d\n"
+msgstr ""
+"Зображенн� є занадто довгим дл� �торінки: верхнє поле — %d, ви�ота — %d, "
+"нижній край — %d\n"
+
+#: src/main/print-escp2.c:150
+msgid "Automatic Printing Mode"
+msgstr "Режим автоматичного друку"
+
+#: src/main/print-escp2.c:151
+msgid "Automatic printing mode"
+msgstr "Режим автоматичного друку"
+
+#: src/main/print-escp2.c:222
+msgid "CD Allow Other Media Sizes"
+msgstr "Інші розміри ди�ків"
+
+#: src/main/print-escp2.c:223
+msgid "Allow non-CD media sizes when printing to CD"
+msgstr ""
+"Дозволити викори�танн� розмірів, відмінних від звичайних, під ча� друку на "
+"компакт-ди�ках"
+
+#: src/main/print-escp2.c:229 src/main/print-pcl.c:1371
+msgid "Resolution of the print"
+msgstr "Роздільні�ть друку"
+
+#: src/main/print-escp2.c:245
+msgid "Enhanced Gloss"
+msgstr "Покращений гл�нцевий"
+
+#: src/main/print-escp2.c:246
+msgid "Add gloss enhancement"
+msgstr "Додати покращенн� гл�нц�"
+
+#: src/main/print-escp2.c:257
+msgid "Printing Direction"
+msgstr "�апр�мок друку"
+
+#: src/main/print-escp2.c:258
+msgid "Printing direction (unidirectional is higher quality, but slower)"
+msgstr "�апр�мок друку (�кі�ть однонапр�много вище, але він повільніший)"
+
+#: src/main/print-escp2.c:269
+msgid "Interleave Method"
+msgstr "Метод черезр�дково�ті"
+
+#: src/main/print-escp2.c:270
+msgid "Interleave pattern to use"
+msgstr "Візерунки накладанн�"
+
+#: src/main/print-escp2.c:275 src/main/print-escp2.c:276
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
+msgid "Output Order"
+msgstr "Пор�док виводу"
+
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
+msgid "Alignment Passes"
+msgstr "Кроки ю�туванн�"
+
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
+msgid "Alignment Choices"
+msgstr "Варіанти ю�туванн�"
+
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
+msgid "Ink change command"
+msgstr "Команда зміни чорнила"
+
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
+msgid "Alternate Alignment Passes"
+msgstr "Кроки почергового ю�туванн�"
+
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
+msgid "Alternate Alignment Choices"
+msgstr "Варіанти почергового ю�туванн�"
+
+#: src/main/print-escp2.c:311
+msgid "Supports Packet Mode"
+msgstr "Підтримує пакетний режим"
+
+#: src/main/print-escp2.c:312
+msgid "Supports D4 Packet Mode"
+msgstr "Підтримує пакетний режим D4"
+
+#: src/main/print-escp2.c:317
+msgid "Has Interchangeable Ink Cartridges"
+msgstr "Має взаємозамінні картриджі з чорнилом"
+
+#: src/main/print-escp2.c:318
+msgid "Has multiple choices of ink cartridges"
+msgstr "Має декілька варіантів картриджів з чорнилом"
+
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
+msgid "Raw Channel Names"
+msgstr "�азви про�тих каналів"
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
+msgid "Channel Names"
+msgstr "�азви каналів"
+
+#: src/main/print-escp2.c:348
+msgid "Raw Channel Count"
+msgstr "Кількі�ть про�тих каналів"
+
+#: src/main/print-escp2.c:353
+msgid "Cyan Map"
+msgstr "Карта блакитного"
+
+#: src/main/print-escp2.c:354
+msgid "Adjust the cyan map"
+msgstr "Виправити карту блакитного"
+
+#: src/main/print-escp2.c:359
+msgid "Magenta Map"
+msgstr "Карта пурпурового"
+
+#: src/main/print-escp2.c:360
+msgid "Adjust the magenta map"
+msgstr "Виправити карту пурпурового"
+
+#: src/main/print-escp2.c:365
+msgid "Yellow Map"
+msgstr "Карта жовтого"
+
+#: src/main/print-escp2.c:366
+msgid "Adjust the yellow map"
+msgstr "Виправити карту жовтого"
+
+#: src/main/print-escp2.c:371
+msgid "Blue Map"
+msgstr "Карта �инього"
+
+#: src/main/print-escp2.c:372
+msgid "Adjust the blue map"
+msgstr "Виправити карту �инього"
+
+#: src/main/print-escp2.c:377
+msgid "Orange Map"
+msgstr "Карта помаранчевого"
+
+#: src/main/print-escp2.c:378
+msgid "Adjust the orange map"
+msgstr "Виправити карту помаранчевого"
+
+#: src/main/print-escp2.c:383
+msgid "Red Map"
+msgstr "Карта червоного"
+
+#: src/main/print-escp2.c:384
+msgid "Adjust the red map"
+msgstr "Виправити карту червоного"
+
+#: src/main/print-escp2.c:486
+msgid "Red Density"
+msgstr "Щільні�ть червоного"
+
+#: src/main/print-escp2.c:487
+msgid "Adjust the red density"
+msgstr "Виправити щільні�ть червоного"
+
+#: src/main/print-escp2.c:494
+msgid "Blue Density"
+msgstr "Щільні�ть �инього"
+
+#: src/main/print-escp2.c:495
+msgid "Adjust the blue density"
+msgstr "Виправити щільні�ть �инього"
+
+#: src/main/print-escp2.c:502
+msgid "Orange Density"
+msgstr "Щільні�ть помаранчевого"
+
+#: src/main/print-escp2.c:503
+msgid "Adjust the orange density"
+msgstr "Виправити щільні�ть помаранчевого"
+
+#: src/main/print-escp2.c:510
+msgid "Gloss Level"
+msgstr "Рівень гл�нц�"
+
+#: src/main/print-escp2.c:511
+msgid "Adjust the gloss level"
+msgstr "Виправити рівень гл�нц�"
+
+#: src/main/print-escp2.c:518
+msgid "Drop Size Small"
+msgstr "Малий розмір краплі"
+
+#: src/main/print-escp2.c:519
+msgid "Drop Size 1 (small)"
+msgstr "Розмір краплі 1 (мала)"
+
+#: src/main/print-escp2.c:526
+msgid "Drop Size Medium"
+msgstr "Середній розмір краплі"
+
+#: src/main/print-escp2.c:527
+msgid "Drop Size 2 (medium)"
+msgstr "Розмір краплі 2 (�ередн�)"
+
+#: src/main/print-escp2.c:534
+msgid "Drop Size Large"
+msgstr "Великий розмір краплі"
+
+#: src/main/print-escp2.c:535
+msgid "Drop Size 3 (large)"
+msgstr "Розмір краплі 3 (велика)"
+
+#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+msgid "Light Cyan Value"
+msgstr "Значенн� �вітло-бірюзового"
+
+#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+msgid "Light Cyan Density Scale"
+msgstr "Шкала щільн. �вітло-бірюз."
+
+#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+msgid "Light Magenta Value"
+msgstr "Значенн� �вітло-бузкового"
+
+#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+msgid "Light Magenta Density Scale"
+msgstr "Шкала щільн. �вітло-бузкового"
+
+#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+msgid "Dark Yellow Value"
+msgstr "Значенн� темно-жовтого"
+
+#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
+msgid "Dark Yellow Transition"
+msgstr "Перехід темно-жовтого"
+
+#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
+msgid "Dark Yellow Density Scale"
+msgstr "Шкала щільно�ті темно-жовтого"
+
+#: src/main/print-escp2.c:614 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:638 src/main/print-escp2.c:639
+msgid "Gray Value"
+msgstr "Значенн� �ірого"
+
+#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
+msgid "Gray Transition"
+msgstr "Перехід �ірого"
+
+#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
+msgid "Gray Density Scale"
+msgstr "Шкала щільно�ті �ірого"
+
+#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+msgid "Light Gray Value"
+msgstr "Значенн� �вітло-�ірого"
+
+#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:742 src/main/print-escp2.c:743
+msgid "Light Gray Transition"
+msgstr "Перехід �вітло-�ірого"
+
+#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:750 src/main/print-escp2.c:751
+msgid "Light Gray Density Scale"
+msgstr "Шкала щільно�ті �вітло-�ірого"
+
+#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+msgid "Dark Gray Value"
+msgstr "Значенн� темно-�ірого"
+
+#: src/main/print-escp2.c:694 src/main/print-escp2.c:695
+msgid "Dark Gray Transition"
+msgstr "Перехід темно-�ірого"
+
+#: src/main/print-escp2.c:702 src/main/print-escp2.c:703
+msgid "Dark Gray Density Scale"
+msgstr "Шкала щільно�ті темно-�ірого"
+
+#: src/main/print-escp2.c:710
+msgid "Mid Gray Value"
+msgstr "Значенн� проміжного �ірого"
+
+#: src/main/print-escp2.c:711
+msgid "Medium Gray Value"
+msgstr "Середнє значенн� �ірого"
+
+#: src/main/print-escp2.c:718
+msgid "Mid Gray Transition"
+msgstr "Перехід проміжного �ірого"
+
+#: src/main/print-escp2.c:719
+msgid "Medium Gray Transition"
+msgstr "Перехід проміжного �ірого"
+
+#: src/main/print-escp2.c:726
+msgid "Mid Gray Density Scale"
+msgstr "Шк. щільн. пр. тон. �ір."
+
+#: src/main/print-escp2.c:727
+msgid "Medium Gray Density Scale"
+msgstr "Шкала щільно�ті �ередніх тонів �ірого"
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 Value"
+msgstr "Знач. �ір. 5 у ше�т. друці"
+
+#: src/main/print-escp2.c:759
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr "Значенн� �ірого 5 (найтемнішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 Transition"
+msgstr "Пер. �ір. 5 у ше�т. друці"
+
+#: src/main/print-escp2.c:767
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Перехід �ірого 5 (найтемнішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:774
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Шкала щільн. �ір. 5 у ше�т. друці"
+
+#: src/main/print-escp2.c:775
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Шкала щільно�ті �ірого 5 (найтемнішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:782 src/main/print-escp2.c:783
+msgid "Hextone Gray 4 Value"
+msgstr "Знач. �ір. 4 у ше�т. друці"
+
+#: src/main/print-escp2.c:790 src/main/print-escp2.c:791
+msgid "Hextone Gray 4 Transition"
+msgstr "Пер. �ір. 4 у ше�т. друці"
+
+#: src/main/print-escp2.c:798 src/main/print-escp2.c:799
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Шкала щільн. �ір. 4 у ше�т. друці"
+
+#: src/main/print-escp2.c:806 src/main/print-escp2.c:807
+msgid "Hextone Gray 3 Value"
+msgstr "Знач. �ір. 3 у ше�т. друці"
+
+#: src/main/print-escp2.c:814 src/main/print-escp2.c:815
+msgid "Hextone Gray 3 Transition"
+msgstr "Пер. �ір. 3 у ше�т. друці"
+
+#: src/main/print-escp2.c:822 src/main/print-escp2.c:823
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Шкала щільн. �ір. 3 у ше�т. друці"
+
+#: src/main/print-escp2.c:830 src/main/print-escp2.c:831
+msgid "Hextone Gray 2 Value"
+msgstr "Знач. �ір. 2 у ше�т. друці"
+
+#: src/main/print-escp2.c:838 src/main/print-escp2.c:839
+msgid "Hextone Gray 2 Transition"
+msgstr "Пер. �ір. 2 у ше�т. друці"
+
+#: src/main/print-escp2.c:846 src/main/print-escp2.c:847
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Шкала щільн. �ір. 2 у ше�т. друці"
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 Value"
+msgstr "Знач. �ір. 1 у ше�т. друці"
+
+#: src/main/print-escp2.c:855
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr "Значенн� �ірого 1 (най�вітлішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 Transition"
+msgstr "Пер. �ір. 1 у ше�т. друці"
+
+#: src/main/print-escp2.c:863
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Перехід �ірого 1 (най�вітлішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:870
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Шкала щільн. �ір. 1 у ше�т. друці"
+
+#: src/main/print-escp2.c:871
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Шкала щільно�ті �ірого 1 (най�вітлішого) у ше�титоновому друці"
+
+#: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
+msgid "Drying Time Per Page"
+msgstr "Ча� ви�иханн� однієї �торінки"
+
+#: src/main/print-escp2.c:911
+msgid "Set drying time per page"
+msgstr "В�тановити ча� ви�иханн� однієї �торінки"
+
+#: src/main/print-escp2.c:918
+msgid "Drying Time Per Scan"
+msgstr "Ча� ви�иханн� на �кан."
+
+#: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr "В�тановити ча� ви�иханн� дл� одного �кануванн�"
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr "Мін. ча� ви�их. на �кануванн�"
+
+#: src/main/print-escp2.c:927
+msgid "Set minimum drying time per scan"
+msgstr "В�тановити мінімальний ча� ви�иханн� на одне �кануванн�"
+
+#: src/main/print-escp2.c:942
+msgid "Quality Enhancement"
+msgstr "Покращенн� �ко�ті"
+
+#: src/main/print-escp2.c:943
+msgid "Enhance print quality by additional passes"
+msgstr "Покращити �кі�ть друку додатковими проходами"
+
+#: src/main/print-escp2.c:950
+msgid "Paper Thickness"
+msgstr "Товщина паперу"
+
+#: src/main/print-escp2.c:951
+msgid "Set printer paper thickness"
+msgstr "В�тановити товщину паперу принтера"
+
+#: src/main/print-escp2.c:958
+msgid "Vacuum Intensity"
+msgstr "Потужні�ть вт�гуванн�"
+
+#: src/main/print-escp2.c:959
+msgid "Set vacuum intensity (printer-specific)"
+msgstr "В�тановити потужні�ть вт�гуванн� (дл� певного принтера)"
+
+#: src/main/print-escp2.c:966
+msgid "Feed Sequence"
+msgstr "По�лідовні�ть подаванн�"
+
+#: src/main/print-escp2.c:967
+msgid "Set paper feed sequence (printer-specific)"
+msgstr "В�тановити по�лідовні�ть подаванн� паперу (дл� певного принтера)"
+
+#: src/main/print-escp2.c:974
+msgid "Print Method"
+msgstr "Спо�іб друку"
+
+#: src/main/print-escp2.c:975
+msgid "Set print method (printer-specific)"
+msgstr "В�тановити �по�іб друку (дл� певного принтера)"
+
+#: src/main/print-escp2.c:982
+msgid "Platen Gap"
+msgstr "Зазор"
+
+#: src/main/print-escp2.c:983
+msgid "Set platen gap (printer-specific)"
+msgstr "В�тановити зазор (дл� певного принтера)"
+
+#: src/main/print-escp2.c:990
+msgid "Feed Adjustment"
+msgstr "Виправленн� подаванн�"
+
+#: src/main/print-escp2.c:992
+#, no-c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr "В�тановити виправленн� подаванн� паперу (у одиниц�х 0,01%)"
+
+#: src/main/print-escp2.c:2214
+msgid "Full Manual Control"
+msgstr "Керуванн� лише вручну"
+
+#: src/main/print-escp2.c:2216
+msgid "Automatic Setting Control"
+msgstr "�втоматичне керуванн� параметрами"
+
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
+msgid "Automatic"
+msgstr "�втоматично"
+
+#: src/main/print-escp2.c:2439
+msgid "Bidirectional"
+msgstr "Двонапр�мний"
+
+#: src/main/print-escp2.c:2441
+msgid "Unidirectional"
+msgstr "Однонапр�мний"
+
+#: src/main/print-escp2.c:2472
+msgid "Alternate Fill"
+msgstr "Почергове заливанн�"
+
+#: src/main/print-escp2.c:2474
+msgid "Ascending Fill"
+msgstr "Ви�хідне заливанн�"
+
+#: src/main/print-escp2.c:2476
+msgid "Descending Fill"
+msgstr "Спадне заливанн�"
+
+#: src/main/print-escp2.c:2478
+msgid "Ascending Double"
+msgstr "Ви�хідне подвійне"
+
+#: src/main/print-escp2.c:2480
+msgid "Nearest Neighbor Avoidance"
+msgstr "�айближче �у�іднє виключенн�"
+
+#: src/main/print-escp2.c:2516
+msgid "Short Edge(Flip)"
+msgstr "Впродовж короткої �торони (з переворотом)"
+
+#: src/main/print-escp2.c:3134
+#, c-format
+msgid "This printer does not support raw printer output at depth %d\n"
+msgstr "У цьому принтері не передбачено про�тий друк з глибиною кольору %d\n"
+
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
+#: src/main/print-raw.c:218
+msgid "Print options not verified; cannot print.\n"
+msgstr "Параметри друку не пройшли перевірки; друк неможливий.\n"
+
+#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
+msgid "300 DPI x 600 DPI"
+msgstr "300⨯600 т/д"
+
+#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
+msgid "600 DPI"
+msgstr "600 т/д"
+
+#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
+msgid "600 DPI high quality"
+msgstr "600 т/д ви�око�кі�ний"
+
+#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
+msgid "600 DPI Unidirectional"
+msgstr "600 т/д однонапр�мний"
+
+#: src/main/print-lexmark.c:581 src/main/print-lexmark.c:657
+msgid "1200 DPI"
+msgstr "1200 т/д"
+
+#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
+msgid "1200 DPI high quality"
+msgstr "1220 т/д ви�око�кі�ний"
+
+#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
+msgid "1200 DPI highest quality"
+msgstr "1200 т/д найвищої �ко�ті"
+
+#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
+msgid "1200 DPI  Unidirectional"
+msgstr "1200 т/д однонапр�мний"
+
+#: src/main/print-lexmark.c:585
+msgid "2400 DPI x 1200 DPI"
+msgstr "2400⨯1200 т/д"
+
+#: src/main/print-lexmark.c:586
+msgid "2400 DPI x 1200 DPI high quality"
+msgstr "2400⨯1200 т/д ви�окої �ко�ті"
+
+#: src/main/print-lexmark.c:587
+msgid "2400 DPI x 1200 DPI highest quality"
+msgstr "2400⨯1200 т/д найвищої �ко�ті"
+
+#: 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:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
+msgid "Four Color Standard"
+msgstr "Чотирикольоровий �тандарт"
+
+#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
+msgid "Three Color Composite"
+msgstr "Трикольоровий композит"
+
+#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
+msgid "Six Color Photo"
+msgstr "Ше�тикольорове фото"
+
+#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
+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:469
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:927 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1712
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2054 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2177 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2546
+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:374 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:825 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:933 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1152 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1596
+#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1837
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2063 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2552
+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:379
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:897 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1601 src/xml/xmli18n-tmp.h:1682
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1771
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:2020 src/xml/xmli18n-tmp.h:2066
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2186
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2518 src/xml/xmli18n-tmp.h:2554
+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:384
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:757 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1497
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2189
+#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2317
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2556
+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:394
+#: src/xml/xmli18n-tmp.h:504 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1509
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1726 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2075
+#: src/xml/xmli18n-tmp.h:2135 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2325
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2524 src/xml/xmli18n-tmp.h:2560
+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:409
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1962
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2333
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2564
+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:414
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1527
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2566
+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:419
+#: src/xml/xmli18n-tmp.h:529 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:647 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1168
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2341
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2568
+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:424
+#: src/xml/xmli18n-tmp.h:534 src/xml/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1337
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1758 src/xml/xmli18n-tmp.h:1795
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2150 src/xml/xmli18n-tmp.h:2210
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2534 src/xml/xmli18n-tmp.h:2570
+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:439
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:656 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1702
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1801
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2216
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2574
+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:449
+#: src/xml/xmli18n-tmp.h:559 src/xml/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:797 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1352
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1656 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1746 src/xml/xmli18n-tmp.h:1810
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1992
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2433 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2576
+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:454
+#: src/xml/xmli18n-tmp.h:564 src/xml/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:921 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1706 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1902
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2048
+#: src/xml/xmli18n-tmp.h:2108 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2578
+msgid "Ilford Heavy Paper"
+msgstr "Важкий папір Ilford"
+
+#: 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:464
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2114
+#: src/xml/xmli18n-tmp.h:2174 src/xml/xmli18n-tmp.h:2234
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2445 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2582
+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:280
+msgid "Coated"
+msgstr "Крейдований"
+
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
+msgid "Glossy"
+msgstr "Гл�нцевий"
+
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
+msgid "Texture"
+msgstr "Тек�турований"
+
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
+msgid "Matte"
+msgstr "Матовий"
+
+#. TRANSLATORS: Some dye sublimation printers are able to 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:2034 src/main/print-olympus.c:2035
+msgid "Laminate Pattern"
+msgstr "Стиль ламінуванн�"
+
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
+msgid "Output Level Adjustment"
+msgstr "Виправленн� вихідних рівнів"
+
+#: src/main/print-olympus.c:2070
+msgid "Adjust the cyan balance"
+msgstr "Виправити балан� блакитного"
+
+#: src/main/print-olympus.c:2078
+msgid "Adjust the magenta balance"
+msgstr "Виправити балан� пурпурового"
+
+#: src/main/print-olympus.c:2086
+msgid "Adjust the yellow balance"
+msgstr "Виправити балан� жовтого"
+
+#: src/main/print-olympus.c:2093
+msgid "Black Balance"
+msgstr "Балан� чорного"
+
+#: src/main/print-olympus.c:2094
+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:238 src/xml/xmli18n-tmp.h:6653
+msgid "Manual"
+msgstr "Вручну"
+
+#: src/main/print-pcl.c:239
+msgid "Manual - Movable Guides"
+msgstr "Вручну — рухомі напр�мні"
+
+#: src/main/print-pcl.c:241
+msgid "Tray 1 - Movable Guides"
+msgstr "Лоток 1 — рухомі напр�мні"
+
+#: src/main/print-pcl.c:242
+msgid "Tray 1"
+msgstr "Лоток 1"
+
+#: src/main/print-pcl.c:243
+msgid "Tray 2 - Movable Guides"
+msgstr "Лоток 2 — рухомі напр�мні"
+
+#: src/main/print-pcl.c:244 src/main/print-pcl.c:252
+msgid "Tray 2"
+msgstr "Лоток 2"
+
+#: src/main/print-pcl.c:245
+msgid "Tray 3 - Movable Guides"
+msgstr "Лоток 3 — рухомі напр�мні"
+
+#: src/main/print-pcl.c:246
+msgid "Tray 3"
+msgstr "Лоток 3"
+
+#: src/main/print-pcl.c:247
+msgid "Tray 4 - Movable Guides"
+msgstr "Лоток 4 — рухомі напр�мні"
+
+#: src/main/print-pcl.c:248
+msgid "Tray 4"
+msgstr "Лоток 4"
+
+#: src/main/print-pcl.c:249
+msgid "Portable Sheet Feeder"
+msgstr "Портативний подавальник аркушів"
+
+#: src/main/print-pcl.c:250
+msgid "Desktop Sheet Feeder"
+msgstr "�а�тільний подавальник аркушів"
+
+#: src/main/print-pcl.c:251
+msgid "Tray"
+msgstr "Лоток"
+
+#: src/main/print-pcl.c:253
+msgid "Optional Source"
+msgstr "�еобов'�зкове джерело"
+
+#: src/main/print-pcl.c:254
+msgid "Autoselect"
+msgstr "�втовибір"
+
+#: src/main/print-pcl.c:268
+msgid "150x150 DPI"
+msgstr "150⨯150 т/д"
+
+#: src/main/print-pcl.c:269
+msgid "300x300 DPI"
+msgstr "300⨯300 т/д"
+
+#: src/main/print-pcl.c:270
+msgid "600x300 DPI"
+msgstr "600⨯300 т/д"
+
+#: src/main/print-pcl.c:271
+msgid "600x600 DPI monochrome"
+msgstr "600⨯600 т/д чорно-білий"
+
+#: src/main/print-pcl.c:272
+msgid "600x600 DPI"
+msgstr "600⨯600 т/д"
+
+#: src/main/print-pcl.c:273
+msgid "1200x600 DPI"
+msgstr "1200⨯600 т/д"
+
+#: src/main/print-pcl.c:274
+msgid "2400x600 DPI"
+msgstr "2400⨯600 т/д"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
+msgid "Draft"
+msgstr "Чернетка"
+
+#: src/main/print-pcl.c:282 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
+msgid "High"
+msgstr "Ви�ока"
+
+#: src/main/print-pcl.c:1671
+msgid "Color + Black Cartridges"
+msgstr "Кольоровий та чорно-білий картриджі"
+
+#: src/main/print-pcl.c:1672
+msgid "Color + Photo Cartridges"
+msgstr "Кольоровий та фотокартриджі"
+
+#: src/main/print-ps.c:68
+msgid "PPDFile"
+msgstr "Файл PPD"
+
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
+msgid "PPD File"
+msgstr "Файл PPD"
+
+#: src/main/print-ps.c:80
+msgid "Model Name"
+msgstr "�азва моделі"
+
+#: src/main/print-ps.c:81
+msgid "PPD File Model Name"
+msgstr "�азва моделі файла PPD"
+
+#: 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:6631
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
+msgid "Custom"
+msgstr "�етиповий"
+
+#: src/main/print-raw.c:225
+msgid "Image dimensions must match paper dimensions"
+msgstr "Розмірні�ть зображенн� має збігати�� з розмірні�тю аркуша"
+
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
+msgid "Fatal error!"
+msgstr "Критична помилка!"
+
+#: src/main/print-weave.c:1528
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+"Будь ла�ка, повідомте наведені вище дані за адре�ою gimp-print-devel@lists."
+"sourceforge.net"
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
+msgid "Fast Economy"
+msgstr "Швидкий економний друк"
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
+msgid "Economy"
+msgstr "Економний друк"
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
+msgid "Super Photo"
+msgstr "Які�на фотографічна"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
+msgid "Ultra Photo"
+msgstr "�ад�кі�на фотографічна"
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
+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
+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 "Мінімум за X"
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr "Мінімальне можливе значенн� дл� X"
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr "Мак�имум за X"
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr "Мак�имальне можливе значенн� за X"
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr "Мінімум за Y"
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr "Мінімальне можливе значенн� дл� Y"
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr "Мак�имум за Y"
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr "Мінімальне можливе значенн� дл� Y"
+
+#: src/gutenprintui2/gammacurve.c:408
+msgid "Gamma"
+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 "В�тановити базовою одиницею виміру пункт (1/72 дюйма)"
+
+#: 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 "В�тановити базовою одиницею виміру цицеро (1/12 дюйма)"
+
+#: 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
+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 ""
+"Розташуванн� зображенн� на �торінці.\n"
+"Дл� визначенн� розташуванн� нати�ніть і перет�гніть зображенн� за допомогою "
+"о�новної кнопки.\n"
+"Точніше розташуванн� можна визначити нати�канн�м і перет�гуванн�м за "
+"допомогою другої кнопки; кожна одиниц� руху пере�уває зображенн� на одну "
+"точку (1/72 дюйма)\n"
+"Пере�уванн� зображенн� на о�нові від�откових одиниць розміру зображенн� "
+"можна здій�нити нати�канн�м і перет�гуванн�м третьою (�ередньою) кнопкою.\n"
+"Утримуванн� нати�нутою клавіші Shift під ча� перет�гуванн� обмежить рух "
+"зображенн� лише горизонтальним чи вертикальним напр�мом.\n"
+"Якщо під ча� перет�гуванн� мишею ви нати�нете іншу кнопку, зображенн� буде "
+"повернуто до початкового розташуванн�."
+
+#: 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 "Вкажіть кількі�ть копій дл� друку, значенн� у діапазоні від 1 до 100"
+
+#: 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: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 "Вкажіть належну назву файла PPD дл� вашого принтера"
+
+#: 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 "Виберіть відповідну назву файла PPD дл� вашого принтера"
+
+#: 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 ""
+"Виберіть модель принтера, файл PPD та команду, �ку буде викори�тано дл� "
+"друку на цьому принтері"
+
+#: 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 "пк/дюйм"
+
+#: 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 "Berkeley lpd (/etc/lpc)"
+
+#: src/gutenprintui2/plist.c:107
+msgid "Berkeley lpd (/usr/bsd/lpc)"
+msgstr "Berkeley lpd (/usr/bsd/lpc)"
+
+#: src/gutenprintui2/plist.c:110
+msgid "Berkeley lpd (/usr/etc/lpc"
+msgstr "Berkeley lpd (/usr/etc/lpc"
+
+#: src/gutenprintui2/plist.c:113
+msgid "Berkeley lpd (/usr/libexec/lpc)"
+msgstr "Berkeley lpd (/usr/libexec/lpc)"
+
+#: src/gutenprintui2/plist.c:116
+msgid "Berkeley lpd (/usr/sbin/lpc)"
+msgstr "Berkeley lpd (/usr/sbin/lpc)"
+
+#: src/gutenprintui2/plist.c:1060
+msgid "Printer"
+msgstr "Принтер"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr "(Типовий принтер)"
+
+#: src/cups/genppd.c:154
+msgid "Printer Features"
+msgstr "Можливо�ті принтера"
+
+#: src/cups/genppd.c:155
+msgid "Output Control"
+msgstr "Керуванн� виводом"
+
+#: src/cups/genppd.c:160
+msgid "Common"
+msgstr "Типовий"
+
+#: src/cups/genppd.c:161
+msgid "Extra 1"
+msgstr "Додатковий 1"
+
+#: src/cups/genppd.c:162
+msgid "Extra 2"
+msgstr "Додатковий 2"
+
+#: src/cups/genppd.c:163
+msgid "Extra 3"
+msgstr "Додатковий 3"
+
+#: src/cups/genppd.c:164
+msgid "Extra 4"
+msgstr "Додатковий 4"
+
+#: src/cups/genppd.c:165
+msgid "Extra 5"
+msgstr "Додатковий 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
+msgid "English"
+msgstr "Ukrainian"
+
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
+msgid "Media Size"
+msgstr "Розмір но�і�"
+
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
+msgid "Color Model"
+msgstr "Модель кольорів"
+
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
+msgid "Inverted Grayscale"
+msgstr "Інвертовані тони �ірого"
+
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
+msgid "RGB Color"
+msgstr "Кольори RGB"
+
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
+msgid "CMY Color"
+msgstr "Кольори CMY"
+
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
+msgid "Color Precision"
+msgstr "Точні�ть відтворенн� кольорів"
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
+msgid "Yes"
+msgstr "Так"
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
+msgid "No"
+msgstr "�і"
+
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
+msgid "Value"
+msgstr "Значенн�"
+
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
+msgid "Fine Adjustment"
+msgstr "Точне налашт."
+
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
+#, c-format
+msgid "%.1f mm"
+msgstr "%.1f мм"
+
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
+msgid "Reverse"
+msgstr "Зворотний"
+
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
+msgid "2-Sided Printing"
+msgstr "Дво�торонній друк"
+
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr "Сти�кати �тор., �кщо потрібно дл� вміщенн�"
+
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
+msgid "Shrink (print the whole page)"
+msgstr "Сти�нути (надрукувати в�ю �торінку)"
+
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
+msgid "Crop (preserve dimensions)"
+msgstr "Обрізати (зберегти розміри)"
+
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
+msgid "Expand (use maximum page area)"
+msgstr "Розт�гнути (мак�имально викори�тати площу)"
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr "Вер�і� escputil "
+
+#: 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 ""
+"© Robert Krawitz (rlk@alum.mit.edu), 2000–2006\n"
+"\n"
+"Ц� програма є відкритим програмним забезпеченн�м. Дозвол�єть�� поширювати\n"
+"її та змінювати на умовах ліцензії GNU 2 або �таршої вер�ії, що видана Free\n"
+"Software Foundation.\n"
+"\n"
+"Ц� програма поширюєть�� БЕЗ БУДЬ-ЯКИХ Г�Р��ТІЙ, у тому чи�лі не "
+"гарантуєть��\n"
+"її придатні�ть до певної мети. Докладнішу інформацію дивіть�� у ліцензії "
+"GNU.\n"
+"\n"
+"Копі� ліцензії надаєть�� з цією програмою. Якщо ви не отримали копію "
+"ліцензії,\n"
+"повідомте про це Free Software Foundation, Inc. за адре�ою 59 Temple Place,\n"
+"Suite 330, Boston, MA 02111-1307 USA.\n"
+
+#: src/escputil/escputil.c:119
+msgid ""
+"Usage: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P printer | -r device] [-u] [-q] [-m model] [ -S ]\n"
+"                [-C choices] [-p patterns]\n"
+"Perform maintenance on EPSON Stylus (R) printers.\n"
+"Examples: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Commands:\n"
+"    -c|--clean-head    Clean the print head.\n"
+"    -n|--nozzle-check  Print a nozzle test pattern.\n"
+"                       Dirty or clogged nozzles will show as gaps in the\n"
+"                       pattern.  If you see any gaps, you should clean\n"
+"                       the print head.\n"
+"    -a|--align-head    Align the print head.  CAUTION: Misuse of this\n"
+"                       utility may result in poor print quality and/or\n"
+"                       damage to the printer.\n"
+"    -s|--status        Retrieve printer status.\n"
+"    -i|--ink-level     Obtain the ink level from the printer.  This "
+"requires\n"
+"                       read/write access to the raw printer device.\n"
+"    -e|--extended-ink-info     Obtain the extended ink information from the\n"
+"                       printer.  This requires read/write access to the raw\n"
+"                       printer device.\n"
+"    -d|--identify      Query the printer for make and model information.\n"
+"                       This requires read/write access to the raw printer\n"
+"                       device.\n"
+"    -l|--license       Display the license/warranty terms of this program.\n"
+"    -M|--list-models   List the available printer models.\n"
+"    -h|--help          Print this help message.\n"
+"  Options:\n"
+"    -P|--printer-name  Specify the name of the printer queue to operate on.\n"
+"                       Default is the default system printer.\n"
+"    -r|--raw-device    Specify the name of the device to write to directly\n"
+"                       rather than going through a printer queue.\n"
+"    -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 ""
+"Викори�танн�: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P принтер | -r при�трій] [-u] [-q] [-m модель] [ -S ]\n"
+"                [-C варіанти] [-p шаблони]\n"
+"Виконанн� дій з об�луговуванн� принтерів EPSON Stylus (R).\n"
+"Приклади: escputil --ink-level --raw-device /dev/usb/lp0\n"
+"          escputil --clean-head --new --printer-name MyQueue\n"
+"\n"
+"  Команди:\n"
+"    -c|--clean-head    очи�тити головки принтера.\n"
+"    -n|--nozzle-check  надрукувати шаблон перевірки �опел.\n"
+"                       Лінії брудних або забитих �опел буде пропущено\n"
+"                       під ча� друку. Якщо ви помітили такі пропу�ки, �лід\n"
+"                       очи�тити голівку принтера.\n"
+"    -a|--align-head    ю�тувати голівку принтера. ПОПЕРЕДЖЕ��Я: помилкове\n"
+"                       викори�танн� цієї процедури може призве�ти до\n"
+"                       погіршенн� �ко�ті друку і/або пошкодженн� принтера.\n"
+"    -s|--status        отримати дані щодо �тану принтера.\n"
+"    -i|--ink-level     отримати дані щодо рівн� чорнил у принтері. Дл� "
+"виконанн�\n"
+"                       дії потрібен до�туп на читанн�/запи� до принтера.\n"
+"    -e|--extended-ink-info     отримати додаткові дані щодо чорнил від\n"
+"                       принтера. Дл� виконанн� цієї дії потрібен до�туп\n"
+"                       на читанн�/запи� до принтера.\n"
+"    -d|--identify      опитати принтер щодо даних виробника та моделі.\n"
+"                       Дл� виконанн� цієї дії потрібен до�туп\n"
+"                       на читанн�/запи� до принтера.\n"
+"    -l|--license       показати ліцензійні та гарантійні умови викори�танн� "
+"програми.\n"
+"    -M|--list-models   показати �пи�ок можливих моделей принтерів.\n"
+"    -h|--help          показати це довідкове повідомленн�.\n"
+"  Параметри:\n"
+"    -P|--printer-name  вказати назву черги дій друку, �ку �лід обробл�ти.\n"
+"                       Типовою є черга типового принтера �и�теми.\n"
+"    -r|--raw-device    вказати назву при�трою дл� безпо�ереднього запи�у,\n"
+"                       без викори�танн� черги дій друку.\n"
+"    -m|--model         вказати модель принтера.\n"
+"    -u|--new           вказати, що принтер є новим (Stylus Color 740 або\n"
+"                       новішим). Викори�товуєть�� лише, �кщо ви кори�туєте�� "
+"не\n"
+"                       про�тим принтером і не вказали модель �вно.\n"
+"    -q|--quiet         не показувати шапки повідомлень.\n"
+"    -S|--short-name    виве�ти �корочену назву принтера у відповідь на --"
+"identify.\n"
+"    -C|--choices       вказати кількі�ть варіантів шаблону дл� ю�туванн�\n"
+"    -p|--patterns      вказати кількі�ть наборів шаблонів дл� ю�туванн�\n"
+
+#: 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 ""
+"Викори�танн�: escputil [П�Р�МЕТРИ] [КОМ��Д�]\n"
+"Викори�танн�: escputil [-c | -n | -a | -i | -e | -s | -d | -l | -M]\n"
+"                [-P принтер | -r при�трій] [-u] [-q] [-m модель] [ -S ]\n"
+"                [-C варіанти] [-p шаблони]\n"
+"Виконанн� дій з об�луговуванн� принтерів EPSON Stylus (R).\n"
+"Приклади: escputil -i -r /dev/usb/lp0\n"
+"          escputil -c -u -P MyQueue\n"
+"\n"
+"  Команди:\n"
+"    -c очи�тити головки принтера.\n"
+"    -n надрукувати шаблон перевірки �опел.\n"
+"          Лінії брудних або забитих �опел буде пропущено\n"
+"          під ча� друку. Якщо ви помітили такі пропу�ки, �лід\n"
+"          очи�тити голівку принтера.\n"
+"    -a ю�тувати голівку принтера. ПОПЕРЕДЖЕ��Я: помилкове\n"
+"          викори�танн� цієї процедури може призве�ти до\n"
+"          погіршенн� �ко�ті друку і/або пошкодженн� принтера.\n"
+"    -s отримати дані щодо �тану принтера.\n"
+"    -i отримати дані щодо рівн� чорнил у принтері. Дл� виконанн�\n"
+"          дії потрібен до�туп на читанн�/запи� до принтера.\n"
+"    -e отримати додаткові дані щодо чорнил від\n"
+"          принтера. Дл� виконанн� цієї дії потрібен до�туп\n"
+"          на читанн�/запи� до принтера.\n"
+"    -d опитати принтер щодо даних виробника та моделі.\n"
+"          Дл� виконанн� цієї дії потрібен до�туп\n"
+"          на читанн�/запи� до принтера.\n"
+"    -l показати ліцензійні та гарантійні умови викори�танн� програми.\n"
+"    -M показати �пи�ок можливих моделей принтерів.\n"
+"    -h показати це довідкове повідомленн�.\n"
+"  Параметри:\n"
+"    -P вказати назву черги дій друку, �ку �лід обробл�ти.\n"
+"          Типовою є черга типового принтера �и�теми.\n"
+"    -r вказати назву при�трою дл� безпо�ереднього запи�у,\n"
+"          без викори�танн� черги дій друку.\n"
+"    -m вказати модель принтера.\n"
+"    -u вказати, що принтер є новим (Stylus Color 740 або\n"
+"          новішим). Викори�товуєть�� лише, �кщо ви кори�туєте�� не\n"
+"          про�тим принтером і не вказали модель �вно.\n"
+"    -q не показувати шапки повідомлень.\n"
+"    -S виве�ти �корочену назву принтера у відповідь на --identify.\n"
+"    -C вказати кількі�ть варіантів шаблону дл� ю�туванн�\n"
+"    -p вказати кількі�ть наборів шаблонів дл� ю�туванн�\n"
+
+#: 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 "Варіантів ю�туванн� має бути принаймні 1."
+
+#: src/escputil/escputil.c:389
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr "Кроків ю�туванн� має бути принаймні 1."
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Unknown option %c\n"
+msgstr "�евідомий параметр %c\n"
+
+#: src/escputil/escputil.c:403
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr "Викори�танн�: %s [П�Р�МЕТРИ] команда\n"
+
+#: src/escputil/escputil.c:405
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr "Віддайте команду «%s --help», щоб дізнати�� більше.\n"
+
+#: src/escputil/escputil.c:407
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr "Віддайте команду «%s -h», щоб дізнати�� більше.\n"
+
+#: src/escputil/escputil.c:473
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr "�е вдало�� відкрити при�трій %s: %s\n"
+
+#: src/escputil/escputil.c:496
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr "�е вдало�� виконати друк на принтері %s за допомогою %s\n"
+
+#: src/escputil/escputil.c:512 src/escputil/escputil.c:522
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr "�е вдало�� наді�лати команду на принтер\n"
+
+#: src/escputil/escputil.c:582
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr "Перевищенн� очікуванн� на читанн� даних від принтера\n"
+
+#: src/escputil/escputil.c:587
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr "�е вдало�� виконати читанн� з %s: %s\n"
+
+#: src/escputil/escputil.c:769
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr "Будь ла�ка, вкажіть про�тий при�трій\n"
+
+#: src/escputil/escputil.c:776
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr "�е вдало�� відкрити %s дл� читанн�/запи�у: %s\n"
+
+#: src/escputil/escputil.c:823
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr "�евідомий принтер %s!\n"
+
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr "�е вдало�� виконати запи� до %s: %s\n"
+
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+"\n"
+"�е вдало�� виконати запи� до %s: %s\n"
+
+#: src/escputil/escputil.c:972
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+"\n"
+"�е вдало�� визначити тип принтера.\n"
+"Скори�тайте�� параметром -m, щоб вказати модель принтера.\n"
+
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:639 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:663 src/xml/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:687 src/xml/xmli18n-tmp.h:690
+#: 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:1763
+#: src/xml/xmli18n-tmp.h:1766 src/xml/xmli18n-tmp.h:1769
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:1778 src/xml/xmli18n-tmp.h:1781
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1793
+#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1811
+#: src/xml/xmli18n-tmp.h:1814 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:1820 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:2265 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2274
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
+msgid "Photo Black"
+msgstr "фотографічний чорний"
+
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
+msgid "Unknown"
+msgstr "�евідомо"
+
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
+#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2932
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3204
+#: src/xml/xmli18n-tmp.h:3218 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3257
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3535
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3684 src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
+msgid "Light Cyan"
+msgstr "�вітло-бірюзовий"
+
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2987
+#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3067 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3231
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3258
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3351
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3685 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
+msgid "Light Magenta"
+msgstr "�вітло-бузковий"
+
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
+#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
+msgid "Light Black"
+msgstr "�вітло-чорний"
+
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:640 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:646 src/xml/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:691
+#: 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:1764
+#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1782
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1797 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1812
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2245
+#: src/xml/xmli18n-tmp.h:2248 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2260 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2269
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2275
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2284 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
+msgid "Matte Black"
+msgstr "матовий чорний"
+
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
+msgid "Gloss Optimizer"
+msgstr "Оптимізаці� гл�нц�"
+
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
+#: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
+msgid "Light Light Black"
+msgstr "�вітло-�вітло чорний"
+
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
+msgid "Orange"
+msgstr "помаранчевий"
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Status: Error\n"
+msgstr "Стан: помилка\n"
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr "Стан: автономний друк\n"
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Стан: зайн�то\n"
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Стан: очікуванн�\n"
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Стан: безді�льні�ть\n"
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Стан: призупинка\n"
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr "Стан: чищенн�\n"
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr "Стан: по�тачанн�\n"
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr "Стан: завершенн� роботи\n"
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Стан: невідомий (%d)\n"
+
+#: src/escputil/escputil.c:1125
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Помилка: критична помилка\n"
+
+#: src/escputil/escputil.c:1128
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr "Помилка: вибрано інший інтерфей�\n"
+
+#: src/escputil/escputil.c:1131
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr "Помилка: відкрито кришку\n"
+
+#: src/escputil/escputil.c:1134
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Помилка: за�тр�г папір\n"
+
+#: src/escputil/escputil.c:1137
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Помилка: завершили�� чорнила\n"
+
+#: src/escputil/escputil.c:1140
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Помилка: завершив�� папір\n"
+
+#: src/escputil/escputil.c:1143
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr "Помилка: помилка невідповідно�ті паперу\n"
+
+#: src/escputil/escputil.c:1146
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr "Помилка: переповненн� картриджа об�луговуванн�\n"
+
+#: src/escputil/escputil.c:1149
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr "Помилка: очікуванн� поверненн� з позиції розриву\n"
+
+#: src/escputil/escputil.c:1152
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr "Помилка: подвійне подаванн�\n"
+
+#: src/escputil/escputil.c:1155
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+"Помилка: підн�то важіль кріпленн� картриджа з чорнилом\n"
+"\n"
+
+#: src/escputil/escputil.c:1158
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr "Помилка: критична помилка на різаку\n"
+
+#: src/escputil/escputil.c:1161
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr "Помилка: виправте зам’�тт� на різаку\n"
+
+#: src/escputil/escputil.c:1164
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr "Помилка: не ви�влено картриджа об�луговуванн�\n"
+
+#: src/escputil/escputil.c:1167
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Помилка: відкрито задню кришку\n"
+
+#: src/escputil/escputil.c:1170
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr "Помилка: відкрито лоток CD\n"
+
+#: src/escputil/escputil.c:1173
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr "Помилка: помилка завантаженн� картки\n"
+
+#: src/escputil/escputil.c:1176
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr "Помилка: відкрито кришку лотка\n"
+
+#: src/escputil/escputil.c:1179
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr "Помилка: відкрито кришку картриджа\n"
+
+#: src/escputil/escputil.c:1182
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr "Помилка: відкрито передню кришку\n"
+
+#: src/escputil/escputil.c:1185
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr "Помилка: запит щодо об�луговуванн�\n"
+
+#: src/escputil/escputil.c:1188
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr "Помилка: невідома (%d)\n"
+
+#: src/escputil/escputil.c:1200
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr "Попередженн�: мало чорнила кольору %s\n"
+
+#: src/escputil/escputil.c:1203
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr "Попередженн�: мало чорнила на каналі %d\n"
+
+#: src/escputil/escputil.c:1209
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr "Попередженн�: чищенн� %s вимкнено\n"
+
+#: src/escputil/escputil.c:1212
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr "Попередженн�: чищенн� каналу %d\n"
+
+#: src/escputil/escputil.c:1219
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr "Попередженн�: картридж об�луговуванн� майже повний\n"
+
+#: src/escputil/escputil.c:1222
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr "Попередженн�: запит щодо об�луговуванн� у черзі дій\n"
+
+#: src/escputil/escputil.c:1225
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr "Попередженн�: невідоме (%d)\n"
+
+#: src/escputil/escputil.c:1237
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr "Самоперевірка �опел друку\n"
+
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr "�азва принтера: %s\n"
+
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
+#, c-format
+msgid "Ink Levels:\n"
+msgstr "Рівні чорнил:\n"
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+msgid "Ink color"
+msgstr "Колір чорнила"
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Percent remaining"
+msgstr "Залишило�� (у %)"
+
+#: src/escputil/escputil.c:1439
+#, c-format
+msgid "Job Name: "
+msgstr "�азва завданн�: "
+
+#: src/escputil/escputil.c:1469
+msgid "ink levels"
+msgstr "рівні чорнила"
+
+#: src/escputil/escputil.c:1472
+msgid "status"
+msgstr "�тан"
+
+#: src/escputil/escputil.c:1477
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr "Дл� отриманн� %s �лід вказати про�тий при�трій.\n"
+
+#: src/escputil/escputil.c:1563
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+"Дл� отриманн� додаткових даних щодо чорнил �лід вказати про�тий при�трій.\n"
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Ink cartridge"
+msgstr "Картридж з чорнилом"
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Part number"
+msgstr "�омер ча�тини"
+
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
+msgid "Date"
+msgstr "Дата"
+
+#: src/escputil/escputil.c:1783
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+"Дл� отриманн� даних щодо ідентифікації принтера �лід вказати про�тий "
+"при�трій.\n"
+
+#: src/escputil/escputil.c:1801
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr "�е вдало�� визначити модель принтера.\n"
+
+#: src/escputil/escputil.c:1823
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr "Чищенн� голівок…\n"
+
+#: src/escputil/escputil.c:1840
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr "Перевірка �опел, будь ла�ка, в�тавте у принтер папір.\n"
+
+#: src/escputil/escputil.c:1844
+#, 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 ""
+"Будь ла�ка, ретельно ознайомте�� з цими на�тановами, перш ніж ді�ти.\n"
+"\n"
+"За допомогою цієї програми ви можете виконати ю�туванн� голівки\n"
+"�труминного принтера Epson Stylus. �еналежне викори�танн� програми може\n"
+"призве�ти до погіршенн� �ко�ті друку або пошкодженн� принтера. Робота\n"
+"цієї програми не перевір�ла�� інженерами компанії Seiko Epson на\n"
+"коректні�ть, ні�ких гарантій щодо її працездатно�ті не надаєть��. В��\n"
+"відповідальні�ть за можливі на�лідки її роботи покладаєть�� на ва�.\n"
+"\n"
+"Програмою буде надруковано %d те�тових шаблонів. В�і шаблони вигл�дають\n"
+"подібно один до одного. Шаблон �кладаєть�� з по�лідовно�ті пар вертикальних\n"
+"ліній, �кі перекривають��. Під кожною парою ліній буде вказано чи�ло від %d\n"
+"до %d.\n"
+"\n"
+"Під ча� перевірки пар ліній вам �лід визначити пару, �ку найкраще ю�товано,\n"
+"тобто пару, �ка �кладаєть�� у найкращий відповідник вертикальної лінії.\n"
+"До визначенн� відповідної пари �лід по�тавити�� дуже відповідально.\n"
+"Рекомендуємо вам дл� перевірки �кори�тати�� збільшувальним �клом.\n"
+"Також дл� те�туванн� варто викори�товувати �кі�ний папір, на �кому в�і\n"
+"лінії будуть чіткими і не розпливатимуть��. Пі�л� визначенн� номера\n"
+"найкращої пари поверніть папір до вхідного лотка до продовженн� друку.\n"
+"\n"
+"Шаблони подібні один до одного, але у кінцевій ча�тині викори�тано\n"
+"дрібніші крапки дл� точнішого ю�туванн�. Вам �лід виконати в�і кроки\n"
+"ю�туванн� дл� належного налаштуванн� принтера. Пі�л� виконанн� в�іх\n"
+"кроків ю�туванн� шаблони буде надруковано ще раз. Вам �лід буде "
+"переконати��,\n"
+"що �ередн� пара (№%d з %d) є найкращою дл� в�іх шаблонів.\n"
+"\n"
+"Пі�л� повторного друку кроків ю�туванн� програма запропонує вам зробити\n"
+"вибір: (s) зберегти результати на принтері, (r) повторити процедуру\n"
+"або (q) завершити роботу без збереженн�. Завершенн� роботи не призведе до\n"
+"відновленн� початкових значень параметрів, �лід вимкнути і увімкнути ваш\n"
+"принтер. Якщо роботу програми буде завершено без збереженн�, на�тупного "
+"разу\n"
+"процедуру ю�туванн� доведеть�� виконати з початку. Під ча� виконанн� "
+"процедури\n"
+"важливо не вимикати принтер.\n"
+"\n"
+
+#: src/escputil/escputil.c:1879
+#, 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 ""
+"Будь ла�ка, ретельно ознайомте�� з цими на�тановами, перш ніж ді�ти.\n"
+"\n"
+"За допомогою цієї програми ви можете виконати ю�туванн� голівки\n"
+"�труминного принтера Epson Stylus. �еналежне викори�танн� програми може\n"
+"призве�ти до погіршенн� �ко�ті друку або пошкодженн� принтера. Робота\n"
+"цієї програми не перевір�ла�� інженерами компанії Seiko Epson на\n"
+"коректні�ть, ні�ких гарантій щодо її працездатно�ті не надаєть��. В��\n"
+"відповідальні�ть за можливі на�лідки її роботи покладаєть�� на ва�.\n"
+"\n"
+"Програмою буде надруковано те�товий шаблон, �кий �кладаєть�� з\n"
+"по�лідовно�ті  пар вертикальних ліній, �кі перекривають��. Під кожною\n"
+"парою ліній буде вказано чи�ло від %d до %d.\n"
+"\n"
+"Під ча� перевірки пар ліній вам �лід визначити пару, �ку найкраще ю�товано,\n"
+"тобто пару, �ка �кладаєть�� у найкращий відповідник вертикальної лінії.\n"
+"До визначенн� відповідної пари �лід по�тавити�� дуже відповідально.\n"
+"Рекомендуємо вам дл� перевірки �кори�тати�� збільшувальним �клом.\n"
+"Також дл� те�туванн� варто викори�товувати �кі�ний папір, на �кому в�і\n"
+"лінії будуть чіткими і не розпливатимуть��. Пі�л� визначенн� номера\n"
+"найкращої пари поверніть папір до вхідного лотка до продовженн� друку.\n"
+"\n"
+"Пі�л� обробки шаблона ю�туванн� шаблон буде надруковано ще раз. Вам �лід\n"
+"буде переконати��, що �ередн� пара (№%d з %d) є найкращою дл� в�іх\n"
+"шаблонів. Пі�л� повторного друку кроків ю�туванн� програма запропонує вам\n"
+"зробити вибір: (s) зберегти результати на принтері, (r) повторити процедуру\n"
+"або (q) завершити роботу без збереженн�. Завершенн� роботи не призведе до\n"
+"відновленн� початкових значень параметрів, �лід вимкнути і увімкнути ваш\n"
+"принтер.\n"
+"Якщо роботу програми буде завершено без збереженн�, на�тупного разу\n"
+"процедуру ю�туванн� доведеть�� виконати з початку. Під ча� виконанн� "
+"процедури\n"
+"важливо не вимикати принтер.\n"
+"\n"
+
+#: src/escputil/escputil.c:1923
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr "�е вдало�� наді�лати команду на принтер, завершуємо роботу.\n"
+
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
+#, c-format
+msgid "Exiting\n"
+msgstr "Вихід\n"
+
+#: src/escputil/escputil.c:1940
+#, 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 ""
+"Ретельно перевірте о�таточний результат, щоб переконати��\n"
+"у належному ю�туванні принтера. Ви можете:\n"
+"  (s) зберегти результати на принтері,\n"
+"  (q) завершити роботу без збереженн� результатів або\n"
+"  (r) повторити процедуру з початку.\n"
+"Пі�л� вибору програма попро�ить ва� ще раз підтвердити дію.\n"
+"Що �лід робити (s, q, r)?\n"
+
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
+msgid "> "
+msgstr "> "
+
+#: src/escputil/escputil.c:1955
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+"Будь ла�ка, підтвердьте вихід без збереженн� параметрів повторним "
+"нати�канн�м «q»:\n"
+
+#: src/escputil/escputil.c:1962
+#, 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 ""
+"Гаразд, ю�туванн� принтера виконано, але параметри не збережено.\n"
+"Якщо ви хочете зберегти параметри ю�туванн�, вам доведеть�� повторити цю "
+"процедуру.\n"
+
+#: src/escputil/escputil.c:1969
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+"Будь ла�ка, підтвердьте повторенн� процедури ю�туванн� повторним нати�канн�м "
+"«r»:\n"
+
+#: src/escputil/escputil.c:1977
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr "Повторенн� процедури ю�туванн�.\n"
+
+#: src/escputil/escputil.c:1983
+#, 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 ""
+"У результаті виконанн� цієї дії буде змінено налаштуванн� вашого принтера.\n"
+"ПОПЕРЕДЖЕ��Я: подібні дії не рекомендуєть�� виконувати Seiko Epson, вони\n"
+"можуть призве�ти до пошкодженн� вашого принтера. Продовжити?\n"
+"Будь ла�ка, підтвердьте повторним нати�канн�м «s», що ви хочете зберегти\n"
+"значенн� параметрів на вашому принтері:\n"
+
+#: src/escputil/escputil.c:1995
+#, c-format
+msgid "About to save settings..."
+msgstr "Приготуванн� до збереженн� параметрів…"
+
+#: src/escputil/escputil.c:2001
+#, c-format
+msgid "failed!\n"
+msgstr "невдало.\n"
+
+#: src/escputil/escputil.c:2002
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+"Значенн� параметрів не вдало�� зберегти. Вам �лід повторити\n"
+"процедуру ю�туванн�.\n"
+
+#: src/escputil/escputil.c:2006
+#, c-format
+msgid "succeeded!\n"
+msgstr "у�пішно.\n"
+
+#: src/escputil/escputil.c:2007
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr "Значенн� параметрів ю�туванн� було збережено.\n"
+
+#: src/escputil/escputil.c:2012
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr "�евідома команда.\n"
+
+#: src/escputil/escputil.c:2015
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr "О�танню команду не було підтверджено.\n"
+
+#: src/escputil/escputil.c:2020
+#, 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 ""
+"Програма припу�катиме, що вашим принтером є %s.\n"
+"Якщо ви маєте принтер іншої моделі, нати�ніть Ctrl-C і\n"
+"виберіть модель вашого принтера.\n"
+"\n"
+"В�тавте аркуш паперу до принтера, щоб розпочати дію\n"
+"з ю�туванн� головок.\n"
+
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
+msgid "Press enter to continue > "
+msgstr "�ати�ніть Enter, щоб продовжити > "
+
+#: src/escputil/escputil.c:2096
+#, 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 ""
+"Ознайомте�� з відбитком і виберіть найкращу пару ліній у кожному наборі.\n"
+"Введіть номер пари, «?», щоб отримати довідку, або «r», щоб повторити "
+"процедуру.\n"
+
+#: src/escputil/escputil.c:2109
+#, c-format
+msgid "Pass #%d"
+msgstr "Крок №%d"
+
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr "В�тавте чи�тий аркуш паперу.\n"
+
+#: src/escputil/escputil.c:2136
+#, c-format
+msgid "Number out of range!\n"
+msgstr "Чи�ло поза межами діапазону можливих значень!\n"
+
+#: src/escputil/escputil.c:2141
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr "�е можу зрозуміти ваші команди!\n"
+
+#: src/escputil/escputil.c:2147
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr "�омер найкращої пари має належати діапазону від 1 до %d.\n"
+
+#: src/escputil/escputil.c:2154
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr "Спроба в�тановити ю�туванн�…"
+
+#: src/escputil/escputil.c:2157
+#, c-format
+msgid "succeeded.\n"
+msgstr "у�пішно.\n"
+
+#: src/escputil/escputil.c:2158
+#, 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 ""
+"Переконайте��, що ю�туванн� виконано належним чином. Пі�л� повторного\n"
+"друку шаблонів переконайте��, що найкращим шаблоном дл� кожної лінії "
+"на�правді\n"
+"є шаблон %d. Якщо це не так, вам �лід повторити процедуру дл� отриманн�\n"
+"друку найвищої �ко�ті.\n"
+
+#: src/escputil/escputil.c:2204
+#, c-format
+msgid "Error in input\n"
+msgstr "Помилка у вхідних даних\n"
+
+#: src/gimp2/print-gutenprint.c:47
+#, fuzzy
+msgid "_Print with Gutenprint..."
+msgstr "Друк без рамки"
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+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:365
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:390 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:430 src/xml/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:450 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:510 src/xml/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:540 src/xml/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:560 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:570 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:584 src/xml/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:588 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:596 src/xml/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:600 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:608 src/xml/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:616 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:762
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:774 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:798 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:830 src/xml/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:942
+#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:954
+#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:964 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: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:1343 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1358
+#: src/xml/xmli18n-tmp.h:1363 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1388
+#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1418
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1438
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1448
+#: 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:1474 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1498 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1522 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1627
+#: 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:1679 src/xml/xmli18n-tmp.h:1681
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1689
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1693
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1701
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1707 src/xml/xmli18n-tmp.h:1709
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1715 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1727 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1741
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1745
+#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1749
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1753
+#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1868
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1938
+#: src/xml/xmli18n-tmp.h:1943 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1998
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2015
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2023
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2037 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2047
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2051
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2298
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2322
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2370
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2394
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2521
+#: src/xml/xmli18n-tmp.h:2523 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2537
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2547 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
+msgid "EPSON Standard Inks"
+msgstr "Стандартні чорнила EPSON"
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:474
+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:369
+#: src/xml/xmli18n-tmp.h:479 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:745 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1031
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1479
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1765
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2060
+#: src/xml/xmli18n-tmp.h:2120 src/xml/xmli18n-tmp.h:2180
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:6635
+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:389
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:632 src/xml/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1043
+#: src/xml/xmli18n-tmp.h:1103 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1503
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2558
+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:399
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:638 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1109 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1317
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1621 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1783
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1957
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2562
+msgid "Matte Paper Heavyweight"
+msgstr "Матовий тов�тий папір"
+
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:514
+msgid "Premium Presentation Paper Matte"
+msgstr "Ви�око�кі�н. мат. папір дл� презент."
+
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:539
+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:434
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1342
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1738 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2425 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2572
+msgid "Premium Semigloss Photo Paper"
+msgstr "Ви�око�кі�ний напівгл�нцевий фотопапір"
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:554
+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:459
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:671 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:805 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1178
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2365
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2506
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2580
+msgid "ColorLife Paper"
+msgstr "Папір ColorLife"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Ви�око�кі�ний гл�нцевий фотопапір (170)"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Ви�око�кі�ний гл�нцевий фотопапір (250)"
+
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr "Ви�око�кі�ний напівгл�нцевий фотопапір (170)"
+
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Ви�око�кі�ний напівгл�нцевий фотопапір (250)"
+
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Гл�нцевий фотопапір найвищої �ко�ті (250)"
+
+#: 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:361
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:406 src/xml/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:426 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:486 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:516 src/xml/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:546 src/xml/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:566 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:576 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:759 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:799 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:823 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:831 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:887 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:1344
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1354
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1364
+#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1394
+#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1424
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1481 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1553 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1577 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1628 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:1824 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1864 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1919
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1939
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1979
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1994 src/xml/xmli18n-tmp.h:1999
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2009
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2319
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2327
+#: src/xml/xmli18n-tmp.h:2331 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2343
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2355 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2367
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2379 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2403 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
+#: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
+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:362
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:377 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:397 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:437 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:467 src/xml/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:487 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:517 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:547 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:577 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:760 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1225
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1265
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1295
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1305
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1325
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1360 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1445
+#: 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:1476
+#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1536
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1548
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1584
+#: src/xml/xmli18n-tmp.h:1589 src/xml/xmli18n-tmp.h:1594
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1604
+#: src/xml/xmli18n-tmp.h:1609 src/xml/xmli18n-tmp.h:1614
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1629 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:1825 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1855 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1875 src/xml/xmli18n-tmp.h:1880
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1890
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1920
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1980
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1995 src/xml/xmli18n-tmp.h:2000
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2344
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2368
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2416
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2436 src/xml/xmli18n-tmp.h:2440
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2448
+msgid "MISQuadtone"
+msgstr "MIS, чотиритоновий"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1187
+#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1714 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2548
+msgid "Plain Paper Fast Load"
+msgstr "Звичайний папір, швидке завантаженн�"
+
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:373 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:383 src/xml/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:403 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:473 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:523 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:553 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:578
+#: 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:1341
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1356 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1396 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1431
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1446 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:1472 src/xml/xmli18n-tmp.h:1477
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1513
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1543
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1555
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1567
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1579
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1826
+#: src/xml/xmli18n-tmp.h:1831 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1911 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1941 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1956
+#: src/xml/xmli18n-tmp.h:1961 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1971 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2006
+#: src/xml/xmli18n-tmp.h:2011
+msgid "MIS Hextone"
+msgstr "MIS, ше�титоновий"
+
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2494
+msgid "Archival Matte Paper"
+msgstr "�рхівний матовий папір"
+
+#: src/xml/xmli18n-tmp.h:662 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1133 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2497
+msgid "Watercolor Paper - Radiant White"
+msgstr "�кварельний папір — �вітлий білий"
+
+#: 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:1017
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1023
+#: src/xml/xmli18n-tmp.h:1026 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1035
+#: src/xml/xmli18n-tmp.h:1038 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1044 src/xml/xmli18n-tmp.h:1047
+#: src/xml/xmli18n-tmp.h:1050 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1056 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1062 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1071
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1077
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1086 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1095
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1101
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1107
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1131
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1146 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2061
+#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2067
+#: src/xml/xmli18n-tmp.h:2070 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2109
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2124 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2133
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2142 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2157
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2163
+#: src/xml/xmli18n-tmp.h:2166 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2181
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2187
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2199
+#: 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:2450 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2477
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
+msgid "UltraChrome Photo Black"
+msgstr "Чорний фотографічний ультрахромовий"
+
+#: 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:1138
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1144
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2089 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2119 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2146
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2164
+#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2460
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2472
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
+msgid "UltraChrome Matte Black"
+msgstr "Матовий чорний ультрахромований"
+
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1590
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1620
+#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
+msgid "Hextone"
+msgstr "Ше�титоновий"
+
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
+#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2696
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3180
+#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3671
+#: src/xml/xmli18n-tmp.h:3688 src/xml/xmli18n-tmp.h:3896
+msgid "360 x 90 DPI Fast Economy"
+msgstr "360⨯90 т/д швидкий, економі�"
+
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2726 src/xml/xmli18n-tmp.h:2739
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2855 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2948
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3002
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3109
+#: src/xml/xmli18n-tmp.h:3122 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3301
+msgid "180 DPI Economy"
+msgstr "180 т/д, економі�"
+
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2740
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2990 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3110
+#: src/xml/xmli18n-tmp.h:3123 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3232
+#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3432 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3508
+#: src/xml/xmli18n-tmp.h:3523 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3656
+#: src/xml/xmli18n-tmp.h:3672 src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:3733 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:3803 src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3930 src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:3991 src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:4007 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:4047 src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:4071 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4095 src/xml/xmli18n-tmp.h:4101
+msgid "360 x 180 DPI Draft"
+msgstr "360⨯180 т/д чорновий"
+
+#: src/xml/xmli18n-tmp.h:2591 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3183
+msgid "360 DPI High Quality"
+msgstr "360 т/д ви�око�кі�ний"
+
+#: src/xml/xmli18n-tmp.h:2592 src/xml/xmli18n-tmp.h:2605
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2684
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2716
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2765
+#: src/xml/xmli18n-tmp.h:2779 src/xml/xmli18n-tmp.h:2793
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2896
+#: src/xml/xmli18n-tmp.h:2909 src/xml/xmli18n-tmp.h:2922
+#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2978
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3004
+#: src/xml/xmli18n-tmp.h:3014 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3070 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3233
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3289
+#: src/xml/xmli18n-tmp.h:3303 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3388
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3418
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3448
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3509
+#: src/xml/xmli18n-tmp.h:3524 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3618 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3673 src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:3734 src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:3788 src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3852 src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:3976 src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:4032 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
+msgid "360 DPI"
+msgstr "360 т/д"
+
+#: src/xml/xmli18n-tmp.h:2593 src/xml/xmli18n-tmp.h:2606
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2643 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2701 src/xml/xmli18n-tmp.h:2717
+#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2743
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2766
+#: src/xml/xmli18n-tmp.h:2780 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2843
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2897
+#: src/xml/xmli18n-tmp.h:2910 src/xml/xmli18n-tmp.h:2923
+#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2951
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3056
+#: src/xml/xmli18n-tmp.h:3071 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3113
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3290
+#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3328 src/xml/xmli18n-tmp.h:3340
+#: src/xml/xmli18n-tmp.h:3352 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3404 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3449
+#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3478
+#: src/xml/xmli18n-tmp.h:3496 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3525 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3558 src/xml/xmli18n-tmp.h:3582
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3634
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:3736 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3773 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:3882 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3917 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:3977 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
+msgid "720 x 360 DPI"
+msgstr "720⨯360 т/д"
+
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2607
+#: src/xml/xmli18n-tmp.h:2620 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2718
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2755 src/xml/xmli18n-tmp.h:2767
+#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2898
+#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2924
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2952
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2993 src/xml/xmli18n-tmp.h:3006
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3087
+#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3114
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3171 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3291
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3316
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3366
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3390
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3435 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3544
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3635
+#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3659
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:3709 src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:3738 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:3790 src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:3822 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:3883 src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:3918 src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:3978 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3994 src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:4010 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
+msgid "720 DPI"
+msgstr "720 т/д"
+
+#: src/xml/xmli18n-tmp.h:2600 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2934
+#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3025
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3068
+#: src/xml/xmli18n-tmp.h:3083 src/xml/xmli18n-tmp.h:3096
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3156
+#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3416
+#: src/xml/xmli18n-tmp.h:3446 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3555 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3616 src/xml/xmli18n-tmp.h:3631
+#: src/xml/xmli18n-tmp.h:3705 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3817 src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:3851 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3965
+msgid "360 x 120 DPI Economy"
+msgstr "360⨯120 т/д, економі�"
+
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2895 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:3013 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3069
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3146 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3326
+#: src/xml/xmli18n-tmp.h:3363 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3402 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3460
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3593 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3617 src/xml/xmli18n-tmp.h:3632
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3866
+msgid "360 x 240 DPI Draft"
+msgstr "360⨯240 т/д чорновий"
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2645
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2756 src/xml/xmli18n-tmp.h:2768
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:3101
+#: src/xml/xmli18n-tmp.h:3150 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:3739 src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3936 src/xml/xmli18n-tmp.h:3954
+msgid "720 DPI High Quality"
+msgstr "720 т/д ви�око�кі�ний"
+
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2646
+#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2900
+#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2926
+#: src/xml/xmli18n-tmp.h:2940 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2994 src/xml/xmli18n-tmp.h:3007
+#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3030
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3073 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3127
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3162
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3236 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3264 src/xml/xmli18n-tmp.h:3277
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3307
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3480 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3560
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3609
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3648 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3676 src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:3710 src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:3740 src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:3764 src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:3783 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3807 src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:3841 src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:3901 src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3969 src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:4003 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
+msgid "1440 x 720 DPI"
+msgstr "1440⨯720 т/д"
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2746 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2835
+#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2887 src/xml/xmli18n-tmp.h:2901
+#: src/xml/xmli18n-tmp.h:2914 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2955
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3059
+#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3637
+msgid "1440 x 720 DPI Highest Quality"
+msgstr "1440⨯720 т/д найвищої �ко�ті"
+
+#: src/xml/xmli18n-tmp.h:2720 src/xml/xmli18n-tmp.h:2733
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:3151
+msgid "720 DPI Highest Quality"
+msgstr "720 т/д найвищої �ко�ті"
+
+#: 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:3075 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3318 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3661
+msgid "2880 x 720 DPI"
+msgstr "2880⨯720 т/д"
+
+#: 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:3076 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3639
+msgid "2880 x 720 DPI Highest Quality"
+msgstr "2880⨯720 т/д найвищої �ко�ті"
+
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3279 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3380 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3422 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3452 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3514 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3650
+#: src/xml/xmli18n-tmp.h:3662 src/xml/xmli18n-tmp.h:3677
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:3752 src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:3776 src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3825 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:3980 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3996 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
+msgid "1440 x 1440 DPI"
+msgstr "1440⨯1440 т/д"
+
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3237 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3293 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3586
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3610
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3651
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3678
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3727 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3753 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3777 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3793 src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:3997 src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
+msgid "2880 x 1440 DPI"
+msgstr "2880⨯1440 т/д"
+
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Dark Yellow"
+msgstr "Темно-жовтий"
+
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3440 src/xml/xmli18n-tmp.h:3484
+#: src/xml/xmli18n-tmp.h:3502 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:3786 src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:3811 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3845 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
+msgid "2880 x 2880 DPI"
+msgstr "2880⨯2880 т/д"
+
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3454
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3574 src/xml/xmli18n-tmp.h:3587
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3611
+#: src/xml/xmli18n-tmp.h:3624 src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:4108
+msgid "5760 x 1440 DPI"
+msgstr "5760⨯1440 т/д"
+
+#: src/xml/xmli18n-tmp.h:3441 src/xml/xmli18n-tmp.h:3485
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3532
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:3860 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3906 src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:3974 src/xml/xmli18n-tmp.h:4110
+msgid "5760 x 2880 DPI"
+msgstr "5760⨯2880 т/д"
+
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3751
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440⨯720 т/д, тран�понований"
+
+#: src/xml/xmli18n-tmp.h:3692 src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3838 src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:3952
+msgid "720 x 360 DPI Enhanced"
+msgstr "720⨯360 т/д, покращений"
+
+#: src/xml/xmli18n-tmp.h:3728 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:3943
+msgid "Black 1"
+msgstr "Чорний 1"
+
+#: src/xml/xmli18n-tmp.h:3729 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:3944
+msgid "Black 2"
+msgstr "Чорний 2"
+
+#: src/xml/xmli18n-tmp.h:3735 src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:3950
+msgid "360 DPI Enhanced"
+msgstr "360 т/д, покращений"
+
+#: src/xml/xmli18n-tmp.h:3765
+msgid "1440 x 720 DPI High Quality"
+msgstr "1400⨯720 т/д, ви�окої �ко�ті"
+
+#: src/xml/xmli18n-tmp.h:3908
+msgid "Vivid Light Magenta"
+msgstr "Я�кравий �вітло-бузковий"
+
+#: src/xml/xmli18n-tmp.h:3913
+msgid "Vivid Magenta"
+msgstr "Я�кравий бузковий"
+
+#: src/xml/xmli18n-tmp.h:4125
+msgid "Main Tray"
+msgstr "О�новний лоток"
+
+#: src/xml/xmli18n-tmp.h:4126
+msgid "Photo Tray"
+msgstr "Фотолоток"
+
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
+msgid "Print to CD"
+msgstr "Друк на CD"
+
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
+msgid "Rear Tray"
+msgstr "Задній лоток"
+
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
+msgid "Front Tray"
+msgstr "Передній лоток"
+
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
+msgid "Manual Feed"
+msgstr "Подаванн� вручну"
+
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
+msgid "Roll Feed (cut each page)"
+msgstr "З рулону (різати кожну �торінку)"
+
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
+msgid "Roll Feed (do not cut)"
+msgstr "З рулону (без відрізанн�)"
+
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
+msgid "Roll Feed"
+msgstr "Подаванн� з рулону"
+
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
+msgid "Manual Sheet Guide"
+msgstr "Спр�мовуванн� аркушів вручну"
+
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
+msgid "Manual Feed (Front)"
+msgstr "Подача вручну (�переду)"
+
+#: src/xml/xmli18n-tmp.h:4152
+msgid "Roll Feed (borderless with single cut)"
+msgstr "Вальцьоване (без меж, з один. обр.)"
+
+#: src/xml/xmli18n-tmp.h:4153
+msgid "Roll Feed (borderless with double cut)"
+msgstr "Вальцьоване (без меж, з подв. обр.)"
+
+#: src/xml/xmli18n-tmp.h:4175
+msgid "Photo Board"
+msgstr "Фотодошка"
+
+#: src/xml/xmli18n-tmp.h:4176
+msgid "Cut Sheet Bin 1"
+msgstr "Контейнер різаних аркушів 1"
+
+#: src/xml/xmli18n-tmp.h:4177
+msgid "Cut Sheet Bin 2"
+msgstr "Контейнер різаних аркушів 2"
+
+#: src/xml/xmli18n-tmp.h:4178
+msgid "Cut Sheet Autoselect"
+msgstr "�втовибір контейнера різаних аркушів"
+
+#: src/xml/xmli18n-tmp.h:4179
+msgid "Manual Selection"
+msgstr "Вибір вручну"
+
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
+msgid "One Color Raw"
+msgstr "Про�тий однокольоровий"
+
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
+msgid "Three Color Raw"
+msgstr "Про�тий трикольоровий"
+
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
+msgid "Four Color Raw"
+msgstr "Про�тий чотирикольоровий"
+
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
+msgid "Five Color Raw"
+msgstr "Про�тий п’�тикольоровий"
+
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
+msgid "Six Color Raw"
+msgstr "Про�тий ше�тикольоровий"
+
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
+msgid "Gray 3"
+msgstr "Сірий 3"
+
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
+msgid "Gray 2"
+msgstr "Сірий 2"
+
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
+msgid "Gray 1"
+msgstr "Сірий 1"
+
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
+msgid "MIS Quadtone"
+msgstr "MIS, чотиритоновий"
+
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
+msgid "MIS Six Tone"
+msgstr "MIS, ше�титоновий"
+
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
+msgid "Gray 5"
+msgstr "Сірий 5"
+
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
+msgid "Gray 4"
+msgstr "Сірий 4"
+
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
+msgid "One Color Raw Enhanced Gloss"
+msgstr "Однокольоровий про�тий покращений гл�нцевий"
+
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
+msgid "Three Color Raw Gloss"
+msgstr "Про�тий трикольоровий гл�нцевий"
+
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+msgid "Four Color Raw Gloss"
+msgstr "Про�тий чотирикольоровий гл�нцевий"
+
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
+msgid "Six Color Enhanced Gloss Raw"
+msgstr "Ше�тикольоровий покращений гл�нцевий про�тий"
+
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr "Семикольоровий покращений гл�нцевий про�тий"
+
+#: src/xml/xmli18n-tmp.h:4603
+msgid "MatteBlack"
+msgstr "Матовий чорний"
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Default Black"
+msgstr "Типовий чорний"
+
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
+msgid "Seven Color Photo"
+msgstr "Семикольоровий фотографічний"
+
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Six Color Enhanced Composite"
+msgstr "Ше�тикольоровий покращений"
+
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
+msgid "Seven Color Raw"
+msgstr "Про�тий �емиколірний"
+
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
+msgid "Two Level Grayscale"
+msgstr "Дворівневі градації �ірого"
+
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
+msgid "Two Color Raw"
+msgstr "Про�тий двоколірний"
+
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
+msgid "Eight Color Photo"
+msgstr "Во�ьмиколірний фотографічний"
+
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
+msgid "Eight Color Raw"
+msgstr "Про�тий во�ьмиколірний"
+
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
+msgid "Four Color Photo"
+msgstr "Чотириколірний фотографічний"
+
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
+msgid "Interleave"
+msgstr "�акладанн�"
+
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
+msgid "Full Overlap"
+msgstr "Повне перекритт�"
+
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
+msgid "Four Pass"
+msgstr "Чотирипрохідний"
+
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
+msgid "Full Overlap 2"
+msgstr "Повне перекритт� 2"
+
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
+msgid "Interleave 2"
+msgstr "�акладанн� 2"
+
+#: src/xml/xmli18n-tmp.h:6577
+msgid "Eight Pass"
+msgstr "Во�ьмипрохідний"
+
+#: src/xml/xmli18n-tmp.h:6579
+msgid "On"
+msgstr "Увімкнено"
+
+#: src/xml/xmli18n-tmp.h:6632
+msgid "Legal"
+msgstr "Legal"
+
+#: src/xml/xmli18n-tmp.h:6633
+msgid "Tabloid"
+msgstr "Tabloid"
+
+#: src/xml/xmli18n-tmp.h:6634
+msgid "Executive"
+msgstr "Executive"
+
+#: src/xml/xmli18n-tmp.h:6639
+msgid "3x5"
+msgstr "3⨯5"
+
+#: src/xml/xmli18n-tmp.h:6640
+msgid "3 1/2 x5"
+msgstr "3 1/2 ⨯5"
+
+#: src/xml/xmli18n-tmp.h:6641
+msgid "L"
+msgstr "L"
+
+#: src/xml/xmli18n-tmp.h:6642
+msgid "4x6"
+msgstr "4⨯6"
+
+#: src/xml/xmli18n-tmp.h:6643
+msgid "KG"
+msgstr "KG"
+
+#: src/xml/xmli18n-tmp.h:6644
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr "Фотопапір Epson 4⨯6 (з фігурними кра�ми)"
+
+#: src/xml/xmli18n-tmp.h:6645
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Фотопапір Epson L (з фігурними кра�ми)"
+
+#: src/xml/xmli18n-tmp.h:6646
+msgid "4x8"
+msgstr "4⨯8"
+
+#: src/xml/xmli18n-tmp.h:6647
+msgid "5x7"
+msgstr "5⨯7"
+
+#: src/xml/xmli18n-tmp.h:6648
+msgid "2L"
+msgstr "2L"
+
+#: src/xml/xmli18n-tmp.h:6649
+msgid "5x8"
+msgstr "5⨯8"
+
+#: src/xml/xmli18n-tmp.h:6650
+msgid "6x8"
+msgstr "6⨯8"
+
+#: src/xml/xmli18n-tmp.h:6651
+msgid "8x10"
+msgstr "8⨯10"
+
+#: src/xml/xmli18n-tmp.h:6652
+msgid "Rokukire"
+msgstr "Rokukire"
+
+#: src/xml/xmli18n-tmp.h:6654
+msgid "12x18"
+msgstr "12⨯18"
+
+#: src/xml/xmli18n-tmp.h:6655
+msgid "Super B 13x19"
+msgstr "Super B 13⨯19"
+
+#: src/xml/xmli18n-tmp.h:6656
+msgid "Engineering C 17x22"
+msgstr "Engineering C 17⨯22"
+
+#: src/xml/xmli18n-tmp.h:6657
+msgid "8x12"
+msgstr "8⨯12"
+
+#: src/xml/xmli18n-tmp.h:6658
+msgid "YonKire"
+msgstr "YonKire"
+
+#: src/xml/xmli18n-tmp.h:6659
+msgid "11x14"
+msgstr "11⨯14"
+
+#: src/xml/xmli18n-tmp.h:6660
+msgid "HanKire"
+msgstr "HanKire"
+
+#: src/xml/xmli18n-tmp.h:6661
+msgid "16x20"
+msgstr "16⨯20"
+
+#: src/xml/xmli18n-tmp.h:6662
+msgid "16x24"
+msgstr "16⨯24"
+
+#: src/xml/xmli18n-tmp.h:6663
+msgid "20x24"
+msgstr "20⨯24"
+
+#: src/xml/xmli18n-tmp.h:6664
+msgid "20x30"
+msgstr "20⨯30"
+
+#: src/xml/xmli18n-tmp.h:6665
+msgid "22x30"
+msgstr "22⨯30"
+
+#: src/xml/xmli18n-tmp.h:6666
+msgid "24x30"
+msgstr "24⨯30"
+
+#: src/xml/xmli18n-tmp.h:6667
+msgid "Super A1 24x36"
+msgstr "Super A1 24⨯36"
+
+#: src/xml/xmli18n-tmp.h:6668
+msgid "30x40"
+msgstr "30⨯40"
+
+#: src/xml/xmli18n-tmp.h:6669
+msgid "4A"
+msgstr "4A"
+
+#: src/xml/xmli18n-tmp.h:6670
+msgid "2A"
+msgstr "2A"
+
+#: src/xml/xmli18n-tmp.h:6671
+msgid "Super A0"
+msgstr "Super A0"
+
+#: src/xml/xmli18n-tmp.h:6672
+msgid "A0"
+msgstr "A0"
+
+#: src/xml/xmli18n-tmp.h:6673
+msgid "A1"
+msgstr "A1"
+
+#: src/xml/xmli18n-tmp.h:6674
+msgid "A2"
+msgstr "A2"
+
+#: src/xml/xmli18n-tmp.h:6675
+msgid "A3"
+msgstr "A3"
+
+#: src/xml/xmli18n-tmp.h:6677
+msgid "A5"
+msgstr "A5"
+
+#: src/xml/xmli18n-tmp.h:6678
+msgid "A6"
+msgstr "A6"
+
+#: src/xml/xmli18n-tmp.h:6679
+msgid "A7"
+msgstr "A7"
+
+#: src/xml/xmli18n-tmp.h:6680
+msgid "A8"
+msgstr "A8"
+
+#: src/xml/xmli18n-tmp.h:6681
+msgid "A9"
+msgstr "A9"
+
+#: src/xml/xmli18n-tmp.h:6682
+msgid "A10"
+msgstr "A10"
+
+#: src/xml/xmli18n-tmp.h:6683
+msgid "RA0"
+msgstr "RA0"
+
+#: src/xml/xmli18n-tmp.h:6684
+msgid "RA1"
+msgstr "RA1"
+
+#: src/xml/xmli18n-tmp.h:6685
+msgid "RA2"
+msgstr "RA2"
+
+#: src/xml/xmli18n-tmp.h:6686
+msgid "RA3"
+msgstr "RA3"
+
+#: src/xml/xmli18n-tmp.h:6687
+msgid "RA4"
+msgstr "RA4"
+
+#: src/xml/xmli18n-tmp.h:6688
+msgid "SRA0"
+msgstr "SRA0"
+
+#: src/xml/xmli18n-tmp.h:6689
+msgid "SRA1"
+msgstr "SRA1"
+
+#: src/xml/xmli18n-tmp.h:6690
+msgid "SRA2"
+msgstr "SRA2"
+
+#: src/xml/xmli18n-tmp.h:6691
+msgid "SRA3"
+msgstr "SRA3"
+
+#: src/xml/xmli18n-tmp.h:6692
+msgid "SRA4"
+msgstr "SRA4"
+
+#: src/xml/xmli18n-tmp.h:6693
+msgid "4B ISO"
+msgstr "4B ISO"
+
+#: src/xml/xmli18n-tmp.h:6694
+msgid "2B ISO"
+msgstr "2B ISO"
+
+#: src/xml/xmli18n-tmp.h:6695
+msgid "B0 ISO"
+msgstr "B0 ISO"
+
+#: src/xml/xmli18n-tmp.h:6696
+msgid "B1 ISO"
+msgstr "B1 ISO"
+
+#: src/xml/xmli18n-tmp.h:6697
+msgid "B2 ISO"
+msgstr "B2 ISO"
+
+#: src/xml/xmli18n-tmp.h:6698
+msgid "B3 ISO"
+msgstr "B3 ISO"
+
+#: src/xml/xmli18n-tmp.h:6699
+msgid "B4 ISO"
+msgstr "B4 ISO"
+
+#: src/xml/xmli18n-tmp.h:6700
+msgid "B5 ISO"
+msgstr "B5 ISO"
+
+#: src/xml/xmli18n-tmp.h:6701
+msgid "B6 ISO"
+msgstr "B6 ISO"
+
+#: src/xml/xmli18n-tmp.h:6702
+msgid "B7 ISO"
+msgstr "B7 ISO"
+
+#: src/xml/xmli18n-tmp.h:6703
+msgid "B8 ISO"
+msgstr "B8 ISO"
+
+#: src/xml/xmli18n-tmp.h:6704
+msgid "B9 ISO"
+msgstr "B9 ISO"
+
+#: src/xml/xmli18n-tmp.h:6705
+msgid "B10 ISO"
+msgstr "B10 ISO"
+
+#: src/xml/xmli18n-tmp.h:6706
+msgid "Super B0 JIS"
+msgstr "Super B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:6707
+msgid "B0 JIS"
+msgstr "B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:6708
+msgid "B1 JIS"
+msgstr "B1 JIS"
+
+#: src/xml/xmli18n-tmp.h:6709
+msgid "B2 JIS"
+msgstr "B2 JIS"
+
+#: src/xml/xmli18n-tmp.h:6710
+msgid "B3 JIS"
+msgstr "B3 JIS"
+
+#: src/xml/xmli18n-tmp.h:6711
+msgid "B4 JIS"
+msgstr "B4 JIS"
+
+#: src/xml/xmli18n-tmp.h:6712
+msgid "B5 JIS"
+msgstr "B5 JIS"
+
+#: src/xml/xmli18n-tmp.h:6713
+msgid "B6 JIS"
+msgstr "B6 JIS"
+
+#: src/xml/xmli18n-tmp.h:6714
+msgid "B7 JIS"
+msgstr "B7 JIS"
+
+#: src/xml/xmli18n-tmp.h:6715
+msgid "B8 JIS"
+msgstr "B8 JIS"
+
+#: src/xml/xmli18n-tmp.h:6716
+msgid "B9 JIS"
+msgstr "B9 JIS"
+
+#: src/xml/xmli18n-tmp.h:6717
+msgid "B10 JIS"
+msgstr "B10 JIS"
+
+#: src/xml/xmli18n-tmp.h:6718
+msgid "C0"
+msgstr "C0"
+
+#: src/xml/xmli18n-tmp.h:6719
+msgid "C0 landscape"
+msgstr "C0 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6720
+msgid "C1"
+msgstr "C1"
+
+#: src/xml/xmli18n-tmp.h:6721
+msgid "C1 landscape"
+msgstr "C1 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6722
+msgid "C2"
+msgstr "C2"
+
+#: src/xml/xmli18n-tmp.h:6723
+msgid "C2 landscape"
+msgstr "C2 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6724
+msgid "C3"
+msgstr "C3"
+
+#: src/xml/xmli18n-tmp.h:6725
+msgid "C3 landscape"
+msgstr "C3 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6726
+msgid "C4"
+msgstr "C4"
+
+#: src/xml/xmli18n-tmp.h:6727
+msgid "C4 landscape"
+msgstr "C4 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6728
+msgid "C5"
+msgstr "C5"
+
+#: src/xml/xmli18n-tmp.h:6729
+msgid "C5 landscape"
+msgstr "C5 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6730
+msgid "B6-C4"
+msgstr "B6-C4"
+
+#: src/xml/xmli18n-tmp.h:6731
+msgid "B6-C4 landscape"
+msgstr "B6-C4 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6732
+msgid "C6"
+msgstr "C6"
+
+#: src/xml/xmli18n-tmp.h:6733
+msgid "C6 landscape"
+msgstr "C6 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6734
+msgid "DL"
+msgstr "DL"
+
+#: src/xml/xmli18n-tmp.h:6735
+msgid "DL landscape"
+msgstr "DL (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6736
+msgid "C7-6"
+msgstr "C7-6"
+
+#: src/xml/xmli18n-tmp.h:6737
+msgid "C7-6 landscape"
+msgstr "C7-6 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6738
+msgid "C7"
+msgstr "C7"
+
+#: src/xml/xmli18n-tmp.h:6739
+msgid "C7 landscape"
+msgstr "C7 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6740
+msgid "C8"
+msgstr "C8"
+
+#: src/xml/xmli18n-tmp.h:6741
+msgid "C8 landscape"
+msgstr "C8 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6742
+msgid "C9"
+msgstr "C9"
+
+#: src/xml/xmli18n-tmp.h:6743
+msgid "C9 landscape"
+msgstr "C9 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6744
+msgid "C10"
+msgstr "C10"
+
+#: src/xml/xmli18n-tmp.h:6745
+msgid "C10 landscape"
+msgstr "C10 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6746
+msgid "EA5"
+msgstr "EA5"
+
+#: src/xml/xmli18n-tmp.h:6747
+msgid "EA5 landscape"
+msgstr "EA5 (альбомна)"
+
+#: src/xml/xmli18n-tmp.h:6748
+msgid "ArchA"
+msgstr "ArchA"
+
+#: src/xml/xmli18n-tmp.h:6749
+msgid "ArchA transposed"
+msgstr "ArchA (тран�понований)"
+
+#: src/xml/xmli18n-tmp.h:6750
+msgid "ArchB"
+msgstr "ArchB"
+
+#: src/xml/xmli18n-tmp.h:6751
+msgid "ArchB transposed"
+msgstr "ArchB (тран�понований)"
+
+#: src/xml/xmli18n-tmp.h:6752
+msgid "ArchC"
+msgstr "ArchC"
+
+#: src/xml/xmli18n-tmp.h:6753
+msgid "ArchC transposed"
+msgstr "ArchC (тран�понований)"
+
+#: src/xml/xmli18n-tmp.h:6754
+msgid "ArchD"
+msgstr "ArchD"
+
+#: src/xml/xmli18n-tmp.h:6755
+msgid "ArchD transposed"
+msgstr "ArchD (тран�понований)"
+
+#: src/xml/xmli18n-tmp.h:6756
+msgid "ArchE"
+msgstr "ArchE"
+
+#: src/xml/xmli18n-tmp.h:6757
+msgid "ArchE transposed"
+msgstr "ArchE (тран�понований)"
+
+#: src/xml/xmli18n-tmp.h:6758
+msgid "American foolscap"
+msgstr "American foolscap"
+
+#: src/xml/xmli18n-tmp.h:6759
+msgid "European foolscap"
+msgstr "European foolscap"
+
+#: src/xml/xmli18n-tmp.h:6760
+msgid "Crown Quarto"
+msgstr "Crown Quarto"
+
+#: src/xml/xmli18n-tmp.h:6761
+msgid "Large Crown Quarto"
+msgstr "Large Crown Quarto"
+
+#: src/xml/xmli18n-tmp.h:6762
+msgid "Demy Quarto"
+msgstr "Demy Quarto"
+
+#: src/xml/xmli18n-tmp.h:6763
+msgid "Royal Quarto"
+msgstr "Royal Quarto"
+
+#: src/xml/xmli18n-tmp.h:6764
+msgid "Crown Octavo"
+msgstr "Crown Octavo"
+
+#: src/xml/xmli18n-tmp.h:6765
+msgid "Large Crown Octavo"
+msgstr "Large Crown Octavo"
+
+#: src/xml/xmli18n-tmp.h:6766
+msgid "Demy Octavo"
+msgstr "Demy Octavo"
+
+#: src/xml/xmli18n-tmp.h:6767
+msgid "Royal Octavo"
+msgstr "Royal Octavo"
+
+#: src/xml/xmli18n-tmp.h:6768
+msgid "Small paperback"
+msgstr "Мала м’�ка обкладинка"
+
+#: src/xml/xmli18n-tmp.h:6769
+msgid "Penguin small paperback"
+msgstr "Мала м’�ка обкладинка Penguin"
+
+#: src/xml/xmli18n-tmp.h:6770
+msgid "Penguin large paperback"
+msgstr "Велика м’�ка обкладинка Penguin"
+
+#: src/xml/xmli18n-tmp.h:6771
+msgid "10cm x 15cm"
+msgstr "10⨯15 �м"
+
+#: src/xml/xmli18n-tmp.h:6772
+msgid "Hagaki Card"
+msgstr "Картка Hagaki"
+
+#: src/xml/xmli18n-tmp.h:6773
+msgid "Oufuku Card"
+msgstr "Картка Oufuku"
+
+#: src/xml/xmli18n-tmp.h:6774
+msgid "Japanese long envelope #3"
+msgstr "Довгий �пон�ький конверт #3"
+
+#: src/xml/xmli18n-tmp.h:6775
+msgid "Japanese long envelope #3 landscape"
+msgstr "Довгий �пон�ький конверт #3, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6776
+msgid "Japanese long envelope #4"
+msgstr "Довгий �пон�ький конверт #4"
+
+#: src/xml/xmli18n-tmp.h:6777
+msgid "Japanese long envelope #4 landscape"
+msgstr "Довгий �пон�ький конверт #4, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6778
+#, fuzzy
+msgid "Japanese Western-style envelope #4"
+msgstr "Довгий �пон�ький конверт #4"
+
+#: src/xml/xmli18n-tmp.h:6779
+#, fuzzy
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr "Довгий �пон�ький конверт #4, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6780
+#, fuzzy
+msgid "Japanese Western-style envelope #6"
+msgstr "Довгий �пон�ький конверт #3"
+
+#: src/xml/xmli18n-tmp.h:6781
+#, fuzzy
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr "Довгий �пон�ький конверт #3, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6782
+msgid "Japanese Kaku envelope #4"
+msgstr "Конверт Japanese Kaku #4"
+
+#: src/xml/xmli18n-tmp.h:6783
+msgid "Japanese Kaku envelope #4 landscape"
+msgstr "Япон�ький конверт каку #4, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6784
+msgid "Commercial 10"
+msgstr "Commercial 10"
+
+#: src/xml/xmli18n-tmp.h:6785
+msgid "Commercial 10 landscape"
+msgstr "Commercial 10 , альбомна"
+
+#: src/xml/xmli18n-tmp.h:6786
+msgid "A2 Invitation"
+msgstr "Запрошенн� A2"
+
+#: src/xml/xmli18n-tmp.h:6787
+msgid "Monarch Envelope"
+msgstr "Конверт Monarch"
+
+#: src/xml/xmli18n-tmp.h:6788
+msgid "Monarch Envelope landscape"
+msgstr "Конверт Monarch, альбомна"
+
+#: src/xml/xmli18n-tmp.h:6789
+msgid "4x5 3/8"
+msgstr "4⨯5 3/8"
+
+#: src/xml/xmli18n-tmp.h:6790
+msgid "4x7"
+msgstr "4⨯7"
+
+#: src/xml/xmli18n-tmp.h:6791
+msgid "Wide 101.6x180.6"
+msgstr "Широкий 101,6⨯180,6"
+
+#: src/xml/xmli18n-tmp.h:6792
+msgid "CP_L"
+msgstr "CP_L"
+
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
+msgid "Card"
+msgstr "Картка"
+
+#: src/xml/xmli18n-tmp.h:6795
+msgid "Wide Postcard"
+msgstr "Широка ли�тівка"
+
+#: src/xml/xmli18n-tmp.h:6796
+msgid "Chilean Office"
+msgstr "Чилій�ький офі�ний"
+
+#: src/xml/xmli18n-tmp.h:6797
+msgid "Chilean Double Letter"
+msgstr "Чилій�ький подвійний дл� ли�тів"
+
+#: src/xml/xmli18n-tmp.h:6798
+msgid "Chilean Double Office"
+msgstr "Чилій�ький подвійний офі�ний"
+
+#: src/xml/xmli18n-tmp.h:6799
+msgid "A3+"
+msgstr "A3+"
+
+#: src/xml/xmli18n-tmp.h:6801
+msgid "89 mm Roll Paper"
+msgstr "Рулон 89 мм"
+
+#: src/xml/xmli18n-tmp.h:6802
+msgid "4 Inch Roll Paper"
+msgstr "Рулон 4 дюйми"
+
+#: src/xml/xmli18n-tmp.h:6803
+msgid "5 Inch Roll Paper"
+msgstr "Рулон 5 дюймів"
+
+#: src/xml/xmli18n-tmp.h:6804
+msgid "210 mm Roll Paper"
+msgstr "Рулон 210 мм"
+
+#: src/xml/xmli18n-tmp.h:6805
+msgid "13 Inch Roll Paper"
+msgstr "Рулон 13 дюймів"
+
+#: src/xml/xmli18n-tmp.h:6806
+msgid "17 Inch Roll Paper"
+msgstr "Рулон 17 дюймів"
+
+#: src/xml/xmli18n-tmp.h:6807
+msgid "22 Inch Roll Paper"
+msgstr "Рулон 22 дюйми"
+
+#: src/xml/xmli18n-tmp.h:6808
+msgid "24 Inch Roll Paper"
+msgstr "Рулон 24 дюйми"
+
+#: src/xml/xmli18n-tmp.h:6809
+msgid "36 Inch Roll Paper"
+msgstr "Рулон 36 дюймів"
+
+#: src/xml/xmli18n-tmp.h:6810
+msgid "44 Inch Roll Paper"
+msgstr "Рулон 44 дюйми"
+
+#: src/xml/xmli18n-tmp.h:6811
+msgid "60 Inch Roll Paper"
+msgstr "Рулон 60 дюймів"
+
+#: src/xml/xmli18n-tmp.h:6812
+msgid "64 Inch Roll Paper"
+msgstr "Рулон 64 дюйма"
+
+#: src/xml/xmli18n-tmp.h:6813
+msgid "PostScript Level 1"
+msgstr "PostScript рівень 1"
+
+#: src/xml/xmli18n-tmp.h:6814
+msgid "PostScript Level 2"
+msgstr "PostScript рівень 2"
+
+#: src/xml/xmli18n-tmp.h:6815
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
+
+#: src/xml/xmli18n-tmp.h:6816
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
+
+#: src/xml/xmli18n-tmp.h:6817
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
+
+#: src/xml/xmli18n-tmp.h:6818
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
+
+#: src/xml/xmli18n-tmp.h:6819
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
+
+#: src/xml/xmli18n-tmp.h:6820
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
+
+#: src/xml/xmli18n-tmp.h:6821
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
+
+#: src/xml/xmli18n-tmp.h:6822
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
+
+#: src/xml/xmli18n-tmp.h:6823
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
+
+#: src/xml/xmli18n-tmp.h:6824
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
+
+#: src/xml/xmli18n-tmp.h:6825
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
+
+#: src/xml/xmli18n-tmp.h:6826
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
+
+#: src/xml/xmli18n-tmp.h:6827
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
+
+#: src/xml/xmli18n-tmp.h:6828
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
+
+#: src/xml/xmli18n-tmp.h:6829
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
+
+#: src/xml/xmli18n-tmp.h:6830
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
+
+#: src/xml/xmli18n-tmp.h:6831
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
+
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6833
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-5100"
+
+#: src/xml/xmli18n-tmp.h:6834
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6835
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
+
+#: src/xml/xmli18n-tmp.h:6836
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
+
+#: src/xml/xmli18n-tmp.h:6837
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
+
+#: src/xml/xmli18n-tmp.h:6838
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
+
+#: src/xml/xmli18n-tmp.h:6839
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
+
+#: src/xml/xmli18n-tmp.h:6840
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
+
+#: src/xml/xmli18n-tmp.h:6841
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
+
+#: src/xml/xmli18n-tmp.h:6842
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-8500"
+
+#: src/xml/xmli18n-tmp.h:6843
+msgid "Canon S100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6844
+msgid "Canon S200"
+msgstr "Canon S200"
+
+#: src/xml/xmli18n-tmp.h:6845
+msgid "Canon S300"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6847
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6848
+msgid "Canon S450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6849
+msgid "Canon S500"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6852
+msgid "Canon S600"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:6853
+msgid "Canon S630"
+msgstr "Canon S630"
+
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
+msgid "Canon S800"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6861
+#, fuzzy
+msgid "Canon SELPHY DS700"
+msgstr "Canon SELPHY ES20"
+
+#: src/xml/xmli18n-tmp.h:6862
+#, fuzzy
+msgid "Canon SELPHY DS810"
+msgstr "Canon SELPHY ES1"
+
+#: src/xml/xmli18n-tmp.h:6863
+#, fuzzy
+msgid "Canon PIXMA mini220"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6864
+#, fuzzy
+msgid "Canon PIXMA mini320"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6865
+#, fuzzy
+msgid "Canon PIXMA mini360"
+msgstr "Canon PIXMA MP360"
+
+#: src/xml/xmli18n-tmp.h:6866
+#, fuzzy
+msgid "Canon PIXMA iP90"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6867
+#, fuzzy
+msgid "Canon PIXMA iP90v"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6868
+#, fuzzy
+msgid "Canon PIXMA iP100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6870
+#, fuzzy
+msgid "Canon PIXMA iP2700"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6873
+#, fuzzy
+msgid "Canon PIXMA iP3300"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6874
+#, fuzzy
+msgid "Canon PIXMA iP3500"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6875
+#, fuzzy
+msgid "Canon PIXMA iP3600"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6876
+msgid "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6878
+msgid "Canon PIXMA iP4100"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6880
+msgid "Canon PIXMA iP4200"
+msgstr "Canon PIXMA iP4200"
+
+#: src/xml/xmli18n-tmp.h:6881
+msgid "Canon PIXMA iP4300"
+msgstr "Canon PIXMA iP4300"
+
+#: src/xml/xmli18n-tmp.h:6882
+msgid "Canon PIXMA iP4500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6883
+msgid "Canon PIXMA iP4600"
+msgstr "Canon PIXMA iP4600"
+
+#: src/xml/xmli18n-tmp.h:6884
+msgid "Canon PIXMA iP4700"
+msgstr "Canon PIXMA iP4700"
+
+#: src/xml/xmli18n-tmp.h:6885
+#, fuzzy
+msgid "Canon PIXMA iP4800"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6887
+msgid "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iP5000"
+
+#: src/xml/xmli18n-tmp.h:6888
+msgid "Canon PIXMA iP5200"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6890
+msgid "Canon PIXMA iP5300"
+msgstr "Canon PIXMA iP5300"
+
+#: src/xml/xmli18n-tmp.h:6891
+msgid "Canon PIXMA iP6000D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6892
+#, fuzzy
+msgid "Canon PIXMA iP6100D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6897
+#, fuzzy
+msgid "Canon PIXMA iP6600D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6898
+msgid "Canon PIXMA iP6700"
+msgstr "Canon PIXMA iP6700"
+
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon PIXMA iP1900"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6902
+msgid "Canon PIXMA iP8500"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6905
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iX4000"
+
+#: src/xml/xmli18n-tmp.h:6906
+msgid "Canon PIXMA iX5000"
+msgstr "Canon PIXMA iX5000"
+
+#: src/xml/xmli18n-tmp.h:6907
+#, fuzzy
+msgid "Canon PIXMA iX6500"
+msgstr "Canon PIXMA iX5000"
+
+#: src/xml/xmli18n-tmp.h:6908
+#, fuzzy
+msgid "Canon PIXMA iX7000"
+msgstr "Canon PIXMA iX4000"
+
+#: src/xml/xmli18n-tmp.h:6909
+#, fuzzy
+msgid "Canon PIXMA Pro9000"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6910
+#, fuzzy
+msgid "Canon PIXMA Pro9000mk2"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6911
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6912
+#, fuzzy
+msgid "Canon PIXMA Pro9500mk2"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6914
+msgid "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6915
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6916
+msgid "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6917
+msgid "Canon PIXMA MP180"
+msgstr "Canon PIXMA MP180"
+
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6920
+msgid "Canon PIXMA MP220"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6922
+msgid "Canon PIXMA MP250"
+msgstr "Canon PIXMA MP250"
+
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6924
+msgid "Canon PIXMA MP270"
+msgstr "Canon PIXMA MP270"
+
+#: src/xml/xmli18n-tmp.h:6925
+msgid "Canon PIXMA MP280"
+msgstr "Canon PIXMA MP280"
+
+#: src/xml/xmli18n-tmp.h:6926
+msgid "Canon PIXMA MP360"
+msgstr "Canon PIXMA MP360"
+
+#: src/xml/xmli18n-tmp.h:6927
+msgid "Canon PIXMA MP370"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon PIXMA MP370"
+
+#: src/xml/xmli18n-tmp.h:6929
+msgid "Canon PIXMA MP390"
+msgstr "Canon PIXMA MP390"
+
+#: src/xml/xmli18n-tmp.h:6930
+msgid "Canon PIXMA MP450"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6931
+msgid "Canon PIXMA MP460"
+msgstr "Canon PIXMA MP460"
+
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon PIXMA MP450"
+
+#: src/xml/xmli18n-tmp.h:6933
+msgid "Canon PIXMA MP480"
+msgstr "Canon PIXMA MP480"
+
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6935
+#, fuzzy
+msgid "Canon PIXMA MP493"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6936
+msgid "Canon PIXMA MP495"
+msgstr "Canon PIXMA MP495"
+
+#: src/xml/xmli18n-tmp.h:6937
+msgid "Canon PIXMA MP500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6938
+msgid "Canon PIXMA MP510"
+msgstr "Canon PIXMA MP510"
+
+#: src/xml/xmli18n-tmp.h:6939
+msgid "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6941
+msgid "Canon PIXMA MP540"
+msgstr "Canon PIXMA MP540"
+
+#: src/xml/xmli18n-tmp.h:6942
+msgid "Canon PIXMA MP550"
+msgstr "Canon PIXMA MP550"
+
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6944
+msgid "Canon PIXMA MP600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6946
+msgid "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6947
+#, fuzzy
+msgid "Canon PIXMA MP620"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6948
+#, fuzzy
+msgid "Canon PIXMA MP630"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6949
+#, fuzzy
+msgid "Canon PIXMA MP640"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:6950
+msgid "Canon PIXMA MP700"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6951
+msgid "Canon PIXMA MP710"
+msgstr "Canon PIXMA MP710"
+
+#: src/xml/xmli18n-tmp.h:6952
+msgid "Canon PIXMA MP730"
+msgstr "Canon PIXMA MP730"
+
+#: src/xml/xmli18n-tmp.h:6953
+msgid "Canon PIXMA MP740"
+msgstr "Canon PIXMA MP740"
+
+#: src/xml/xmli18n-tmp.h:6954
+msgid "Canon PIXMA MP750"
+msgstr "Canon PIXMA MP750"
+
+#: src/xml/xmli18n-tmp.h:6955
+msgid "Canon PIXMA MP760"
+msgstr "Canon PIXMA MP760"
+
+#: src/xml/xmli18n-tmp.h:6956
+msgid "Canon PIXMA MP770"
+msgstr "Canon PIXMA MP770"
+
+#: src/xml/xmli18n-tmp.h:6957
+msgid "Canon PIXMA MP780"
+msgstr "Canon PIXMA MP780"
+
+#: src/xml/xmli18n-tmp.h:6958
+msgid "Canon PIXMA MP790"
+msgstr "Canon PIXMA MP790"
+
+#: src/xml/xmli18n-tmp.h:6959
+#, fuzzy
+msgid "Canon PIXMA MP800"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6961
+#, fuzzy
+msgid "Canon PIXMA MP810"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6962
+msgid "Canon PIXMA MP830"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6964
+msgid "Canon PIXMA MP950"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6965
+msgid "Canon PIXMA MP960"
+msgstr "Canon PIXMA MP960"
+
+#: src/xml/xmli18n-tmp.h:6966
+msgid "Canon PIXMA MP970"
+msgstr "Canon PIXMA MP970"
+
+#: src/xml/xmli18n-tmp.h:6967
+#, fuzzy
+msgid "Canon PIXMA MP980"
+msgstr "Canon PIXMA MP950"
+
+#: src/xml/xmli18n-tmp.h:6968
+msgid "Canon PIXMA MP990"
+msgstr "Canon PIXMA MP990"
+
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr "Canon PIXUS iP2700"
+
+#: src/xml/xmli18n-tmp.h:6970
+msgid "Canon PIXUS iP3100"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6971
+msgid "Canon PIXUS iP4100"
+msgstr "Canon PIXUS iP4100"
+
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6975
+msgid "Canon PIXMA MG5100"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6976
+msgid "Canon PIXMA MG5200"
+msgstr "Canon PIXMA MG5200"
+
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon PIXMA MG5100"
+
+#: src/xml/xmli18n-tmp.h:6978
+msgid "Canon PIXMA MG6100"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon PIXMA MG6100"
+
+#: src/xml/xmli18n-tmp.h:6980
+msgid "Canon PIXMA MG8100"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon PIXMA MG8100"
+
+#: src/xml/xmli18n-tmp.h:6982
+msgid "Canon PIXMA MX300"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6983
+msgid "Canon PIXMA MX310"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6985
+msgid "Canon PIXMA MX330"
+msgstr "Canon PIXMA MX330"
+
+#: src/xml/xmli18n-tmp.h:6986
+msgid "Canon PIXMA MX340"
+msgstr "Canon PIXMA MX340"
+
+#: src/xml/xmli18n-tmp.h:6987
+msgid "Canon PIXMA MX350"
+msgstr "Canon PIXMA MX350"
+
+#: src/xml/xmli18n-tmp.h:6988
+#, fuzzy
+msgid "Canon PIXMA MX360"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon PIXMA MX300"
+
+#: src/xml/xmli18n-tmp.h:6990
+#, fuzzy
+msgid "Canon PIXMA MX410"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6991
+#, fuzzy
+msgid "Canon PIXMA MX420"
+msgstr "Canon PIXMA MX340"
+
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon PIXMA MX310"
+
+#: src/xml/xmli18n-tmp.h:6994
+msgid "Canon PIXMA MX700"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon PIXMA MX700"
+
+#: src/xml/xmli18n-tmp.h:6996
+msgid "Canon PIXMA MX850"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:6997
+msgid "Canon PIXMA MX860"
+msgstr "Canon PIXMA MX860"
+
+#: src/xml/xmli18n-tmp.h:6998
+msgid "Canon PIXMA MX870"
+msgstr "Canon PIXMA MX870"
+
+#: src/xml/xmli18n-tmp.h:6999
+#, fuzzy
+msgid "Canon PIXMA MX880"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon PIXMA MX850"
+
+#: src/xml/xmli18n-tmp.h:7001
+msgid "Canon PIXMA MX7600"
+msgstr "Canon PIXMA MX7600"
+
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon PIXMA MP600"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7024
+msgid "Canon i80"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7033
+msgid "Canon i560"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7036
+msgid "Canon i850"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7038
+msgid "Canon i860"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7039
+#, fuzzy
+msgid "Canon i865old"
+msgstr "Canon i865"
+
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:7052
+msgid "Epson Artisan 50"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7053
+msgid "Epson Artisan 700"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:7054
+msgid "Epson Artisan 710"
+msgstr "Epson Artisan 710"
+
+#: src/xml/xmli18n-tmp.h:7055
+msgid "Epson Artisan 800"
+msgstr "Epson Artisan 800"
+
+#: src/xml/xmli18n-tmp.h:7056
+msgid "Epson Artisan 810"
+msgstr "Epson Artisan 810"
+
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Epson Artisan 50"
+
+#: src/xml/xmli18n-tmp.h:7058
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:7059
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:7060
+msgid "Epson B-310"
+msgstr "Epson B-310"
+
+#: src/xml/xmli18n-tmp.h:7061
+msgid "Epson B-310N"
+msgstr "Epson B-310N"
+
+#: src/xml/xmli18n-tmp.h:7062
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:7063
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:7064
+msgid "Epson B-510DN"
+msgstr "Epson B-510DN"
+
+#: src/xml/xmli18n-tmp.h:7065
+msgid "Epson Stylus C20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:7066
+msgid "Epson Stylus C20SX"
+msgstr "Epson Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:7067
+msgid "Epson Stylus C20UX"
+msgstr "Epson Stylus C20UX"
+
+#: src/xml/xmli18n-tmp.h:7068
+msgid "Epson Stylus C40"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:7069
+msgid "Epson Stylus C40SX"
+msgstr "Epson Stylus C40SX"
+
+#: src/xml/xmli18n-tmp.h:7070
+msgid "Epson Stylus C40UX"
+msgstr "Epson Stylus C40UX"
+
+#: src/xml/xmli18n-tmp.h:7071
+msgid "Epson Stylus C41"
+msgstr "Epson Stylus C41"
+
+#: src/xml/xmli18n-tmp.h:7072
+msgid "Epson Stylus C41SX"
+msgstr "Epson Stylus C41SX"
+
+#: src/xml/xmli18n-tmp.h:7073
+msgid "Epson Stylus C41UX"
+msgstr "Epson Stylus C41UX"
+
+#: src/xml/xmli18n-tmp.h:7074
+msgid "Epson Stylus C42"
+msgstr "Epson Stylus C42"
+
+#: src/xml/xmli18n-tmp.h:7075
+msgid "Epson Stylus C42SX"
+msgstr "Epson Stylus C42SX"
+
+#: src/xml/xmli18n-tmp.h:7076
+msgid "Epson Stylus C42UX"
+msgstr "Epson Stylus C42UX"
+
+#: src/xml/xmli18n-tmp.h:7077
+msgid "Epson Stylus C43"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:7078
+msgid "Epson Stylus C43SX"
+msgstr "Epson Stylus C43SX"
+
+#: src/xml/xmli18n-tmp.h:7079
+msgid "Epson Stylus C43UX"
+msgstr "Epson Stylus C43UX"
+
+#: src/xml/xmli18n-tmp.h:7080
+msgid "Epson Stylus C44"
+msgstr "Epson Stylus C44"
+
+#: src/xml/xmli18n-tmp.h:7081
+msgid "Epson Stylus C44SX"
+msgstr "Epson Stylus C44SX"
+
+#: src/xml/xmli18n-tmp.h:7082
+msgid "Epson Stylus C44UX"
+msgstr "Epson Stylus C44UX"
+
+#: src/xml/xmli18n-tmp.h:7083
+msgid "Epson Stylus C45"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:7084
+msgid "Epson Stylus C46"
+msgstr "Epson Stylus C46"
+
+#: src/xml/xmli18n-tmp.h:7085
+msgid "Epson Stylus C48"
+msgstr "Epson Stylus C48"
+
+#: src/xml/xmli18n-tmp.h:7086
+msgid "Epson Stylus C50"
+msgstr "Epson Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:7087
+msgid "Epson Stylus C60"
+msgstr "Epson Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7088
+msgid "Epson Stylus C61"
+msgstr "Epson Stylus C61"
+
+#: src/xml/xmli18n-tmp.h:7089
+msgid "Epson Stylus C62"
+msgstr "Epson Stylus C62"
+
+#: src/xml/xmli18n-tmp.h:7090
+msgid "Epson Stylus C63"
+msgstr "Epson Stylus C63"
+
+#: src/xml/xmli18n-tmp.h:7091
+msgid "Epson Stylus C64"
+msgstr "Epson Stylus C64"
+
+#: src/xml/xmli18n-tmp.h:7092
+msgid "Epson Stylus C65"
+msgstr "Epson Stylus C65"
+
+#: src/xml/xmli18n-tmp.h:7093
+msgid "Epson Stylus C66"
+msgstr "Epson Stylus C66"
+
+#: src/xml/xmli18n-tmp.h:7094
+msgid "Epson Stylus C68"
+msgstr "Epson Stylus C68"
+
+#: src/xml/xmli18n-tmp.h:7095
+msgid "Epson Stylus C70"
+msgstr "Epson Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:7096
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C79"
+
+#: src/xml/xmli18n-tmp.h:7097
+msgid "Epson Stylus C80"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:7098
+msgid "Epson Stylus C82"
+msgstr "Epson Stylus C82"
+
+#: src/xml/xmli18n-tmp.h:7099
+msgid "Epson Stylus C83"
+msgstr "Epson Stylus C83"
+
+#: src/xml/xmli18n-tmp.h:7100
+msgid "Epson Stylus C84"
+msgstr "Epson Stylus C84"
+
+#: src/xml/xmli18n-tmp.h:7101
+msgid "Epson Stylus C85"
+msgstr "Epson Stylus C85"
+
+#: src/xml/xmli18n-tmp.h:7102
+msgid "Epson Stylus C86"
+msgstr "Epson Stylus C86"
+
+#: src/xml/xmli18n-tmp.h:7103
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C87"
+
+#: src/xml/xmli18n-tmp.h:7104
+msgid "Epson Stylus C88"
+msgstr "Epson Stylus C88"
+
+#: src/xml/xmli18n-tmp.h:7105
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C110"
+
+#: src/xml/xmli18n-tmp.h:7106
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C120"
+
+#: src/xml/xmli18n-tmp.h:7107
+msgid "Epson Stylus Color"
+msgstr "Epson Stylus Color"
+
+#: src/xml/xmli18n-tmp.h:7108
+msgid "Epson Stylus Color I"
+msgstr "Epson Stylus Color I"
+
+#: src/xml/xmli18n-tmp.h:7109
+msgid "Epson Stylus Color II"
+msgstr "Epson Stylus Color II"
+
+#: src/xml/xmli18n-tmp.h:7110
+msgid "Epson Stylus Color IIs"
+msgstr "Epson Stylus Color IIs"
+
+#: src/xml/xmli18n-tmp.h:7111
+msgid "Epson Stylus Color PRO"
+msgstr "Epson Stylus Color PRO"
+
+#: src/xml/xmli18n-tmp.h:7112
+msgid "Epson Stylus Pro XL"
+msgstr "Epson Stylus Pro XL"
+
+#: src/xml/xmli18n-tmp.h:7113
+msgid "Epson Stylus Color 400"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7114
+msgid "Epson Stylus Color 440"
+msgstr "Epson Stylus Color 440"
+
+#: src/xml/xmli18n-tmp.h:7115
+msgid "Epson Stylus Color 460"
+msgstr "Epson Stylus Color 460"
+
+#: src/xml/xmli18n-tmp.h:7116
+msgid "Epson Stylus Color 480"
+msgstr "Epson Stylus Color 480"
+
+#: src/xml/xmli18n-tmp.h:7117
+msgid "Epson Stylus Color 500"
+msgstr "Epson Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7118
+msgid "Epson Stylus Color 580"
+msgstr "Epson Stylus Color 580"
+
+#: src/xml/xmli18n-tmp.h:7119
+msgid "Epson Stylus Color 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7120
+msgid "Epson Stylus Color 640"
+msgstr "Epson Stylus Color 640"
+
+#: src/xml/xmli18n-tmp.h:7121
+msgid "Epson Stylus Color 660"
+msgstr "Epson Stylus Color 660"
+
+#: src/xml/xmli18n-tmp.h:7122
+msgid "Epson Stylus Color 670"
+msgstr "Epson Stylus Color 670"
+
+#: src/xml/xmli18n-tmp.h:7123
+msgid "Epson Stylus Color 680"
+msgstr "Epson Stylus Color 680"
+
+#: src/xml/xmli18n-tmp.h:7124
+msgid "Epson Stylus Color 740"
+msgstr "Epson Stylus Color 740"
+
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Epson Stylus Color 760"
+msgstr "Epson Stylus Color 760"
+
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Epson Stylus Color 777"
+msgstr "Epson Stylus Color 777"
+
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Epson Stylus Color 800"
+msgstr "Epson Stylus Color 800"
+
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Epson Stylus Color 850"
+msgstr "Epson Stylus Color 850"
+
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Epson Stylus Color 860"
+msgstr "Epson Stylus Color 860"
+
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Epson Stylus Color 880"
+msgstr "Epson Stylus Color 880"
+
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Epson Stylus Color 8 3"
+msgstr "Epson Stylus Color 8 3"
+
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Epson Stylus Color 900"
+msgstr "Epson Stylus Color 900"
+
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Epson Stylus Color 980"
+msgstr "Epson Stylus Color 980"
+
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Epson Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
+
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Epson Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
+
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Epson Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
+
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Epson Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
+
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus Office B33"
+
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus Office B40W"
+
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Epson Stylus Office B1100"
+msgstr "Epson Stylus Office B1100"
+
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus Office T30"
+
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus Office T33"
+
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus Office T40W"
+
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Epson Stylus Office T1100"
+msgstr "Epson Stylus Office T1100"
+
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Epson Stylus Office T1110"
+msgstr "Epson Stylus Office T1110"
+
+#: src/xml/xmli18n-tmp.h:7147
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus Office BX300F"
+
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:7149
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:7152
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus Office SX600FW"
+
+#: src/xml/xmli18n-tmp.h:7153
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
+
+#: src/xml/xmli18n-tmp.h:7154
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:7156
+msgid "Epson Stylus Photo"
+msgstr "Epson Stylus Photo"
+
+#: src/xml/xmli18n-tmp.h:7157
+msgid "Epson Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:7158
+msgid "Epson Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
+
+#: src/xml/xmli18n-tmp.h:7159
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
+
+#: src/xml/xmli18n-tmp.h:7160
+msgid "Epson Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
+
+#: src/xml/xmli18n-tmp.h:7161
+msgid "Epson Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
+
+#: src/xml/xmli18n-tmp.h:7162
+msgid "Epson Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
+
+#: src/xml/xmli18n-tmp.h:7163
+msgid "Epson Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
+
+#: src/xml/xmli18n-tmp.h:7164
+msgid "Epson Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
+
+#: src/xml/xmli18n-tmp.h:7165
+msgid "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
+
+#: src/xml/xmli18n-tmp.h:7166
+msgid "Epson Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
+
+#: src/xml/xmli18n-tmp.h:7167
+msgid "Epson Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
+
+#: src/xml/xmli18n-tmp.h:7168
+msgid "Epson Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
+
+#: src/xml/xmli18n-tmp.h:7169
+msgid "Epson Stylus Photo 830U"
+msgstr "Epson Stylus Photo 830U"
+
+#: src/xml/xmli18n-tmp.h:7170
+msgid "Epson Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
+
+#: src/xml/xmli18n-tmp.h:7171
+msgid "Epson Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
+
+#: src/xml/xmli18n-tmp.h:7172
+msgid "Epson Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
+
+#: src/xml/xmli18n-tmp.h:7173
+msgid "Epson Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
+
+#: src/xml/xmli18n-tmp.h:7174
+msgid "Epson Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
+
+#: src/xml/xmli18n-tmp.h:7175
+msgid "Epson Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
+
+#: src/xml/xmli18n-tmp.h:7176
+msgid "Epson Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
+
+#: src/xml/xmli18n-tmp.h:7177
+msgid "Epson Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
+
+#: src/xml/xmli18n-tmp.h:7178
+msgid "Epson Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
+
+#: src/xml/xmli18n-tmp.h:7179
+msgid "Epson Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
+
+#: src/xml/xmli18n-tmp.h:7180
+msgid "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:7181
+msgid "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/xml/xmli18n-tmp.h:7182
+msgid "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:7183
+msgid "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:7184
+msgid "Epson Stylus Photo 1290s"
+msgstr "Epson Stylus Photo 1290s"
+
+#: src/xml/xmli18n-tmp.h:7185
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1400"
+
+#: src/xml/xmli18n-tmp.h:7186
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 1410"
+
+#: src/xml/xmli18n-tmp.h:7187
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
+
+#: src/xml/xmli18n-tmp.h:7188
+msgid "Epson Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
+
+#: src/xml/xmli18n-tmp.h:7189
+msgid "Epson Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
+
+#: src/xml/xmli18n-tmp.h:7190
+msgid "Epson Stylus Photo P50"
+msgstr "Epson Stylus Photo P50"
+
+#: src/xml/xmli18n-tmp.h:7191
+msgid "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7192
+msgid "Epson Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
+
+#: src/xml/xmli18n-tmp.h:7193
+msgid "Epson Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
+
+#: src/xml/xmli18n-tmp.h:7194
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R230"
+
+#: src/xml/xmli18n-tmp.h:7195
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R240"
+
+#: src/xml/xmli18n-tmp.h:7196
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo R245"
+
+#: src/xml/xmli18n-tmp.h:7197
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R260"
+
+#: src/xml/xmli18n-tmp.h:7198
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo R265"
+
+#: src/xml/xmli18n-tmp.h:7199
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo R270"
+
+#: src/xml/xmli18n-tmp.h:7200
+msgid "Epson Stylus Photo R280"
+msgstr "Epson Stylus Photo R280"
+
+#: src/xml/xmli18n-tmp.h:7201
+msgid "Epson Stylus Photo R285"
+msgstr "Epson Stylus Photo R285"
+
+#: src/xml/xmli18n-tmp.h:7202
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo R290"
+
+#: src/xml/xmli18n-tmp.h:7203
+msgid "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
+
+#: src/xml/xmli18n-tmp.h:7204
+msgid "Epson Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
+
+#: src/xml/xmli18n-tmp.h:7205
+msgid "Epson Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
+
+#: src/xml/xmli18n-tmp.h:7206
+msgid "Epson Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
+
+#: src/xml/xmli18n-tmp.h:7207
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R350"
+
+#: src/xml/xmli18n-tmp.h:7208
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R360"
+
+#: src/xml/xmli18n-tmp.h:7209
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R380"
+
+#: src/xml/xmli18n-tmp.h:7210
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R390"
+
+#: src/xml/xmli18n-tmp.h:7211
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:7212
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:7213
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:7216
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:7217
+msgid "Epson Stylus Photo R3000"
+msgstr "Epson Stylus Photo R3000"
+
+#: src/xml/xmli18n-tmp.h:7218
+msgid "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/xml/xmli18n-tmp.h:7219
+msgid "Epson Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
+
+#: src/xml/xmli18n-tmp.h:7220
+msgid "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/xml/xmli18n-tmp.h:7221
+msgid "Epson Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
+
+#: src/xml/xmli18n-tmp.h:7222
+msgid "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/xml/xmli18n-tmp.h:7223
+msgid "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:7224
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:7225
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX580"
+
+#: src/xml/xmli18n-tmp.h:7226
+msgid "Epson Stylus Photo RX585"
+msgstr "Epson Stylus Photo RX585"
+
+#: src/xml/xmli18n-tmp.h:7227
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX590"
+
+#: src/xml/xmli18n-tmp.h:7228
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX595"
+
+#: src/xml/xmli18n-tmp.h:7229
+msgid "Epson Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7230
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX610"
+
+#: src/xml/xmli18n-tmp.h:7231
+msgid "Epson Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
+
+#: src/xml/xmli18n-tmp.h:7232
+msgid "Epson Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
+
+#: src/xml/xmli18n-tmp.h:7233
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX640"
+
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
+msgid "Epson Stylus Photo RX680"
+msgstr "Epson Stylus Photo RX680"
+
+#: src/xml/xmli18n-tmp.h:7236
+msgid "Epson Stylus Photo RX685"
+msgstr "Epson Stylus Photo RX685"
+
+#: src/xml/xmli18n-tmp.h:7237
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX690"
+
+#: src/xml/xmli18n-tmp.h:7238
+msgid "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
+
+#: src/xml/xmli18n-tmp.h:7239
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo TX700W"
+
+#: src/xml/xmli18n-tmp.h:7240
+msgid "Epson Stylus Photo TX710W"
+msgstr "Epson Stylus Photo TX710W"
+
+#: src/xml/xmli18n-tmp.h:7241
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
+
+#: src/xml/xmli18n-tmp.h:7242
+msgid "Epson Stylus Photo TX810FW"
+msgstr "Epson Stylus Photo TX810FW"
+
+#: src/xml/xmli18n-tmp.h:7243
+msgid "Epson Stylus Pro 3800"
+msgstr "Epson Stylus Pro 3800"
+
+#: src/xml/xmli18n-tmp.h:7244
+msgid "Epson Stylus Pro 3880"
+msgstr "Epson Stylus Pro 3880"
+
+#: src/xml/xmli18n-tmp.h:7245
+msgid "Epson Stylus Pro 3885"
+msgstr "Epson Stylus Pro 3885"
+
+#: src/xml/xmli18n-tmp.h:7246
+msgid "Epson Stylus Pro 4000"
+msgstr "Epson Stylus Pro 4000"
+
+#: src/xml/xmli18n-tmp.h:7247
+msgid "Epson Stylus Pro 4800/4880 Back Compatible"
+msgstr "Epson Stylus Pro 4800/4880 Back Compatible"
+
+#: src/xml/xmli18n-tmp.h:7248
+msgid "Epson Stylus Pro 4800"
+msgstr "Epson Stylus Pro 4800"
+
+#: src/xml/xmli18n-tmp.h:7249
+msgid "Epson Stylus Pro 4880"
+msgstr "Epson Stylus Pro 4880"
+
+#: src/xml/xmli18n-tmp.h:7250
+msgid "Epson Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
+
+#: src/xml/xmli18n-tmp.h:7251
+msgid "Epson Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
+
+#: src/xml/xmli18n-tmp.h:7252
+msgid "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7253
+msgid "Epson Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
+
+#: src/xml/xmli18n-tmp.h:7254
+msgid "Epson Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
+
+#: src/xml/xmli18n-tmp.h:7255
+msgid "Epson Stylus Pro 7700"
+msgstr "Epson Stylus Pro 7700"
+
+#: src/xml/xmli18n-tmp.h:7256
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:7257
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:7258
+msgid "Epson Stylus Pro 7890"
+msgstr "Epson Stylus Pro 7890"
+
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
+msgid "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7261
+msgid "Epson Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
+
+#: src/xml/xmli18n-tmp.h:7262
+msgid "Epson Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
+
+#: src/xml/xmli18n-tmp.h:7263
+msgid "Epson Stylus Pro 9700"
+msgstr "Epson Stylus Pro 9700"
+
+#: src/xml/xmli18n-tmp.h:7264
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:7265
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:7266
+msgid "Epson Stylus Pro 9890"
+msgstr "Epson Stylus Pro 9890"
+
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
+msgid "Epson Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:7269
+msgid "Epson Stylus Pro 11800/11880 Back Compatible"
+msgstr "Epson Stylus Pro 11800/11880 Back Compatible"
+
+#: src/xml/xmli18n-tmp.h:7270
+msgid "Epson Stylus Pro 11800"
+msgstr "Epson Stylus Pro 11800"
+
+#: src/xml/xmli18n-tmp.h:7271
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:7272
+msgid "Epson Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
+
+#: src/xml/xmli18n-tmp.h:7273
+msgid "Epson Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
+
+#: src/xml/xmli18n-tmp.h:7274
+msgid "Epson Stylus CX1500"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7275
+msgid "Epson Stylus CX3100"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7276
+msgid "Epson Stylus CX3200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:7277
+msgid "Epson Stylus CX3500"
+msgstr "Epson Stylus CX3500"
+
+#: src/xml/xmli18n-tmp.h:7278
+msgid "Epson Stylus CX3600"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7279
+msgid "Epson Stylus CX3650"
+msgstr "Epson Stylus CX3650"
+
+#: src/xml/xmli18n-tmp.h:7280
+msgid "Epson Stylus CX3700"
+msgstr "Epson Stylus CX3700"
+
+#: src/xml/xmli18n-tmp.h:7281
+msgid "Epson Stylus CX3800"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:7282
+msgid "Epson Stylus CX3805"
+msgstr "Epson Stylus CX3805"
+
+#: src/xml/xmli18n-tmp.h:7283
+msgid "Epson Stylus CX3810"
+msgstr "Epson Stylus CX3810"
+
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
+msgid "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:7286
+msgid "Epson Stylus CX4200"
+msgstr "Epson Stylus CX4200"
+
+#: src/xml/xmli18n-tmp.h:7287
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4400"
+
+#: src/xml/xmli18n-tmp.h:7288
+msgid "Epson Stylus CX4500"
+msgstr "Epson Stylus CX4500"
+
+#: src/xml/xmli18n-tmp.h:7289
+msgid "Epson Stylus CX4600"
+msgstr "Epson Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:7290
+msgid "Epson Stylus CX4700"
+msgstr "Epson Stylus CX4700"
+
+#: src/xml/xmli18n-tmp.h:7291
+msgid "Epson Stylus CX4800"
+msgstr "Epson Stylus CX4800"
+
+#: src/xml/xmli18n-tmp.h:7292
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4900"
+
+#: src/xml/xmli18n-tmp.h:7293
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX5000"
+
+#: src/xml/xmli18n-tmp.h:7294
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX5000F"
+
+#: src/xml/xmli18n-tmp.h:7295
+msgid "Epson Stylus CX5100"
+msgstr "Epson Stylus CX5100"
+
+#: src/xml/xmli18n-tmp.h:7296
+msgid "Epson Stylus CX5200"
+msgstr "Epson Stylus CX5200"
+
+#: src/xml/xmli18n-tmp.h:7297
+msgid "Epson Stylus CX5300"
+msgstr "Epson Stylus CX5300"
+
+#: src/xml/xmli18n-tmp.h:7298
+msgid "Epson Stylus CX5400"
+msgstr "Epson Stylus CX5400"
+
+#: src/xml/xmli18n-tmp.h:7299
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX5500"
+
+#: src/xml/xmli18n-tmp.h:7300
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX5600"
+
+#: src/xml/xmli18n-tmp.h:7301
+msgid "Epson Stylus CX5700"
+msgstr "Epson Stylus CX5700"
+
+#: src/xml/xmli18n-tmp.h:7302
+msgid "Epson Stylus CX5800"
+msgstr "Epson Stylus CX5800"
+
+#: src/xml/xmli18n-tmp.h:7303
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX6000"
+
+#: src/xml/xmli18n-tmp.h:7304
+msgid "Epson Stylus CX6300"
+msgstr "Epson Stylus CX6300"
+
+#: src/xml/xmli18n-tmp.h:7305
+msgid "Epson Stylus CX6400"
+msgstr "Epson Stylus CX6400"
+
+#: src/xml/xmli18n-tmp.h:7306
+msgid "Epson Stylus CX6500"
+msgstr "Epson Stylus CX6500"
+
+#: src/xml/xmli18n-tmp.h:7307
+msgid "Epson Stylus CX6600"
+msgstr "Epson Stylus CX6600"
+
+#: src/xml/xmli18n-tmp.h:7308
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX7000F"
+
+#: src/xml/xmli18n-tmp.h:7309
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX7400"
+
+#: src/xml/xmli18n-tmp.h:7310
+msgid "Epson Stylus CX7700"
+msgstr "Epson Stylus CX7700"
+
+#: src/xml/xmli18n-tmp.h:7311
+msgid "Epson Stylus CX7800"
+msgstr "Epson Stylus CX7800"
+
+#: src/xml/xmli18n-tmp.h:7312
+msgid "Epson Stylus CX8300"
+msgstr "Epson Stylus CX8300"
+
+#: src/xml/xmli18n-tmp.h:7313
+msgid "Epson Stylus CX8400"
+msgstr "Epson Stylus CX8400"
+
+#: src/xml/xmli18n-tmp.h:7314
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX9300F"
+
+#: src/xml/xmli18n-tmp.h:7315
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:7316
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400F"
+
+#: src/xml/xmli18n-tmp.h:7317
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus CX9475F"
+
+#: src/xml/xmli18n-tmp.h:7318
+msgid "Epson Stylus D68"
+msgstr "Epson Stylus D68"
+
+#: src/xml/xmli18n-tmp.h:7319
+msgid "Epson Stylus D88"
+msgstr "Epson Stylus D88"
+
+#: src/xml/xmli18n-tmp.h:7320
+msgid "Epson Stylus D92"
+msgstr "Epson Stylus D92"
+
+#: src/xml/xmli18n-tmp.h:7321
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus D120"
+
+#: src/xml/xmli18n-tmp.h:7322
+msgid "Epson Stylus DX3800"
+msgstr "Epson Stylus DX3800"
+
+#: src/xml/xmli18n-tmp.h:7323
+msgid "Epson Stylus DX3850"
+msgstr "Epson Stylus DX3850"
+
+#: src/xml/xmli18n-tmp.h:7324
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:7325
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:7326
+msgid "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:7327
+msgid "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4250"
+
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Epson Stylus DX4400"
+msgstr "Epson Stylus DX4400"
+
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Epson Stylus DX4450"
+msgstr "Epson Stylus DX4450"
+
+#: src/xml/xmli18n-tmp.h:7330
+msgid "Epson Stylus DX4800"
+msgstr "Epson Stylus DX4800"
+
+#: src/xml/xmli18n-tmp.h:7331
+msgid "Epson Stylus DX4850"
+msgstr "Epson Stylus DX4850"
+
+#: src/xml/xmli18n-tmp.h:7332
+msgid "Epson Stylus DX7000F"
+msgstr "Epson Stylus DX7000F"
+
+#: src/xml/xmli18n-tmp.h:7333
+msgid "Epson Stylus DX7400"
+msgstr "Epson Stylus DX7400"
+
+#: src/xml/xmli18n-tmp.h:7334
+msgid "Epson Stylus DX7450"
+msgstr "Epson Stylus DX7450"
+
+#: src/xml/xmli18n-tmp.h:7335
+msgid "Epson Stylus DX8400"
+msgstr "Epson Stylus DX8400"
+
+#: src/xml/xmli18n-tmp.h:7336
+msgid "Epson Stylus DX8450"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:7337
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus DX9400F"
+
+#: src/xml/xmli18n-tmp.h:7338
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus NX100"
+
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Epson Stylus NX105"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Epson Stylus NX115"
+msgstr "Epson Stylus NX115"
+
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus NX200"
+
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Epson Stylus NX215"
+msgstr "Epson Stylus NX215"
+
+#: src/xml/xmli18n-tmp.h:7343
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7344
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7345
+msgid "Epson Stylus NX415"
+msgstr "Epson Stylus NX415"
+
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:7347
+msgid "Epson Stylus NX515"
+msgstr "Epson Stylus NX515"
+
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:7350
+msgid "Epson Stylus Photo PX650"
+msgstr "Epson Stylus Photo PX650"
+
+#: src/xml/xmli18n-tmp.h:7351
+msgid "Epson Stylus Photo PX700W"
+msgstr "Epson Stylus Photo PX700W"
+
+#: src/xml/xmli18n-tmp.h:7352
+msgid "Epson Stylus Photo PX710W"
+msgstr "Epson Stylus Photo PX710W"
+
+#: src/xml/xmli18n-tmp.h:7353
+msgid "Epson Stylus Photo PX800FW"
+msgstr "Epson Stylus Photo PX800FW"
+
+#: src/xml/xmli18n-tmp.h:7354
+msgid "Epson Stylus Photo PX810FW"
+msgstr "Epson Stylus Photo PX810FW"
+
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus S20"
+
+#: src/xml/xmli18n-tmp.h:7356
+msgid "Epson Stylus S21"
+msgstr "Epson Stylus S21"
+
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Epson Stylus S50"
+msgstr "Epson Stylus S50"
+
+#: src/xml/xmli18n-tmp.h:7358
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus SX100"
+
+#: src/xml/xmli18n-tmp.h:7359
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:7360
+msgid "Epson Stylus SX110"
+msgstr "Epson Stylus SX110"
+
+#: src/xml/xmli18n-tmp.h:7361
+msgid "Epson Stylus SX115"
+msgstr "Epson Stylus SX115"
+
+#: src/xml/xmli18n-tmp.h:7362
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus SX200"
+
+#: src/xml/xmli18n-tmp.h:7363
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus SX205"
+
+#: src/xml/xmli18n-tmp.h:7364
+msgid "Epson Stylus SX210"
+msgstr "Epson Stylus SX210"
+
+#: src/xml/xmli18n-tmp.h:7365
+msgid "Epson Stylus SX215"
+msgstr "Epson Stylus SX215"
+
+#: src/xml/xmli18n-tmp.h:7366
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7367
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus SX405"
+
+#: src/xml/xmli18n-tmp.h:7368
+msgid "Epson Stylus SX410"
+msgstr "Epson Stylus SX410"
+
+#: src/xml/xmli18n-tmp.h:7369
+msgid "Epson Stylus SX415"
+msgstr "Epson Stylus SX415"
+
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:7371
+msgid "Epson Stylus SX510W"
+msgstr "Epson Stylus SX510W"
+
+#: src/xml/xmli18n-tmp.h:7372
+msgid "Epson Stylus SX515"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "Epson Stylus SX515"
+
+#: src/xml/xmli18n-tmp.h:7375
+msgid "Epson Stylus SX600FW"
+msgstr "Epson Stylus SX600FW"
+
+#: src/xml/xmli18n-tmp.h:7376
+msgid "Epson Stylus SX610FW"
+msgstr "Epson Stylus SX610FW"
+
+#: src/xml/xmli18n-tmp.h:7377
+msgid "Epson Stylus SX615"
+msgstr "Epson Stylus SX615"
+
+#: src/xml/xmli18n-tmp.h:7378
+msgid "Epson Stylus SX650"
+msgstr "Epson Stylus SX650"
+
+#: src/xml/xmli18n-tmp.h:7379
+#, fuzzy
+msgid "Epson Stylus T13"
+msgstr "Epson Stylus TX103"
+
+#: src/xml/xmli18n-tmp.h:7380
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus T20"
+
+#: src/xml/xmli18n-tmp.h:7381
+msgid "Epson Stylus T21"
+msgstr "Epson Stylus T21"
+
+#: src/xml/xmli18n-tmp.h:7382
+#, fuzzy
+msgid "Epson Stylus T22"
+msgstr "Epson Stylus T20"
+
+#: src/xml/xmli18n-tmp.h:7383
+#, fuzzy
+msgid "Epson Stylus T22E"
+msgstr "Epson Stylus T20"
+
+#: src/xml/xmli18n-tmp.h:7384
+msgid "Epson Stylus T26"
+msgstr "Epson Stylus T26"
+
+#: src/xml/xmli18n-tmp.h:7385
+msgid "Epson Stylus T30"
+msgstr "Epson Stylus T30"
+
+#: src/xml/xmli18n-tmp.h:7386
+msgid "Epson Stylus T40W"
+msgstr "Epson Stylus T40W"
+
+#: src/xml/xmli18n-tmp.h:7387
+msgid "Epson Stylus T50"
+msgstr "Epson Stylus T50"
+
+#: src/xml/xmli18n-tmp.h:7388
+msgid "Epson Stylus T59"
+msgstr "Epson Stylus T59"
+
+#: src/xml/xmli18n-tmp.h:7389
+msgid "Epson Stylus T60"
+msgstr "Epson Stylus T60"
+
+#: src/xml/xmli18n-tmp.h:7390
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus TX100"
+
+#: src/xml/xmli18n-tmp.h:7391
+msgid "Epson Stylus TX101"
+msgstr "Epson Stylus TX101"
+
+#: src/xml/xmli18n-tmp.h:7392
+msgid "Epson Stylus TX102"
+msgstr "Epson Stylus TX102"
+
+#: src/xml/xmli18n-tmp.h:7393
+msgid "Epson Stylus TX103"
+msgstr "Epson Stylus TX103"
+
+#: src/xml/xmli18n-tmp.h:7394
+msgid "Epson Stylus TX104"
+msgstr "Epson Stylus TX104"
+
+#: src/xml/xmli18n-tmp.h:7395
+msgid "Epson Stylus TX105"
+msgstr "Epson Stylus TX105"
+
+#: src/xml/xmli18n-tmp.h:7396
+msgid "Epson Stylus TX106"
+msgstr "Epson Stylus TX106"
+
+#: src/xml/xmli18n-tmp.h:7397
+msgid "Epson Stylus TX109"
+msgstr "Epson Stylus TX109"
+
+#: src/xml/xmli18n-tmp.h:7398
+msgid "Epson Stylus TX110"
+msgstr "Epson Stylus TX110"
+
+#: src/xml/xmli18n-tmp.h:7399
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus TX200"
+
+#: src/xml/xmli18n-tmp.h:7400
+msgid "Epson Stylus TX210"
+msgstr "Epson Stylus TX210"
+
+#: src/xml/xmli18n-tmp.h:7401
+msgid "Epson Stylus TX300F"
+msgstr "Epson Stylus TX300F"
+
+#: src/xml/xmli18n-tmp.h:7402
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7403
+msgid "Epson Stylus TX410"
+msgstr "Epson Stylus TX410"
+
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:7405
+msgid "Epson Stylus TX510FN"
+msgstr "Epson Stylus TX510FN"
+
+#: src/xml/xmli18n-tmp.h:7406
+msgid "Epson Stylus TX550W"
+msgstr "Epson Stylus TX550W"
+
+#: src/xml/xmli18n-tmp.h:7407
+msgid "Epson Stylus TX610FW"
+msgstr "Epson Stylus TX610FW"
+
+#: src/xml/xmli18n-tmp.h:7408
+msgid "Epson Stylus TX615"
+msgstr "Epson Stylus TX615"
+
+#: src/xml/xmli18n-tmp.h:7409
+msgid "Epson Stylus TX650"
+msgstr "Epson Stylus TX650"
+
+#: src/xml/xmli18n-tmp.h:7410
+msgid "Epson Stylus TX659"
+msgstr "Epson Stylus TX659"
+
+#: src/xml/xmli18n-tmp.h:7411
+msgid "Epson PictureMate"
+msgstr "Epson PictureMate"
+
+#: src/xml/xmli18n-tmp.h:7412
+msgid "Epson PictureMate Dash"
+msgstr "Epson PictureMate Dash"
+
+#: src/xml/xmli18n-tmp.h:7413
+msgid "Epson PictureMate Deluxe"
+msgstr "Epson PictureMate Deluxe"
+
+#: src/xml/xmli18n-tmp.h:7414
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate Flash"
+
+#: src/xml/xmli18n-tmp.h:7415
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate Pal"
+
+#: src/xml/xmli18n-tmp.h:7416
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate Snap"
+
+#: src/xml/xmli18n-tmp.h:7417
+msgid "Epson PictureMate 100"
+msgstr "Epson PictureMate 100"
+
+#: src/xml/xmli18n-tmp.h:7418
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate 200"
+
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:7420
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 215"
+
+#: src/xml/xmli18n-tmp.h:7421
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate 240"
+
+#: src/xml/xmli18n-tmp.h:7422
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate 250"
+
+#: src/xml/xmli18n-tmp.h:7423
+msgid "Epson PictureMate 260"
+msgstr "Epson PictureMate 260"
+
+#: src/xml/xmli18n-tmp.h:7424
+msgid "Epson PictureMate 270"
+msgstr "Epson PictureMate 270"
+
+#: src/xml/xmli18n-tmp.h:7425
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate 280"
+
+#: src/xml/xmli18n-tmp.h:7426
+msgid "Epson PictureMate 290"
+msgstr "Epson PictureMate 290"
+
+#: src/xml/xmli18n-tmp.h:7427
+msgid "Epson PictureMate 500"
+msgstr "Epson PictureMate 500"
+
+#: src/xml/xmli18n-tmp.h:7428
+msgid "Epson PictureMate 2005"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:7429
+msgid "Epson WorkForce 30"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7430
+msgid "Epson WorkForce 40"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7431
+msgid "Epson WorkForce 310"
+msgstr "Epson WorkForce 310"
+
+#: src/xml/xmli18n-tmp.h:7432
+msgid "Epson WorkForce 315"
+msgstr "Epson WorkForce 315"
+
+#: src/xml/xmli18n-tmp.h:7433
+msgid "Epson WorkForce 500"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:7435
+msgid "Epson WorkForce 600"
+msgstr "Epson WorkForce 600"
+
+#: src/xml/xmli18n-tmp.h:7436
+msgid "Epson WorkForce 610"
+msgstr "Epson WorkForce 610"
+
+#: src/xml/xmli18n-tmp.h:7437
+msgid "Epson WorkForce 615"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "Epson WorkForce 615"
+
+#: src/xml/xmli18n-tmp.h:7441
+msgid "Epson WorkForce 1100"
+msgstr "Epson WorkForce 1100"
+
+#: src/xml/xmli18n-tmp.h:7442
+msgid "Epson CL 700"
+msgstr "Epson CL 700"
+
+#: src/xml/xmli18n-tmp.h:7443
+msgid "Epson CL 750"
+msgstr "Epson CL 750"
+
+#: src/xml/xmli18n-tmp.h:7444
+msgid "Epson CL 760"
+msgstr "Epson CL 760"
+
+#: src/xml/xmli18n-tmp.h:7445
+msgid "Epson E 100"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:7446
+msgid "Epson E 150"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:7447
+msgid "Epson E 200"
+msgstr "Epson E 200"
+
+#: src/xml/xmli18n-tmp.h:7448
+msgid "Epson E 300"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:7449
+msgid "Epson E 500"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:7450
+msgid "Epson E 520"
+msgstr "Epson E 520"
+
+#: src/xml/xmli18n-tmp.h:7451
+msgid "Epson E 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:7452
+msgid "Epson E 720"
+msgstr "Epson E 720"
+
+#: src/xml/xmli18n-tmp.h:7453
+msgid "Epson EM 900C"
+msgstr "Epson EM 900C"
+
+#: src/xml/xmli18n-tmp.h:7454
+msgid "Epson EM 930C"
+msgstr "Epson EM 930C"
+
+#: src/xml/xmli18n-tmp.h:7455
+msgid "Epson EP 302"
+msgstr "Epson EP 302"
+
+#: src/xml/xmli18n-tmp.h:7456
+msgid "Epson EP 702A"
+msgstr "Epson EP 702A"
+
+#: src/xml/xmli18n-tmp.h:7457
+msgid "Epson EP 801A"
+msgstr "Epson EP 801A"
+
+#: src/xml/xmli18n-tmp.h:7458
+msgid "Epson EP 901A"
+msgstr "Epson EP 901A"
+
+#: src/xml/xmli18n-tmp.h:7459
+msgid "Epson EP 901F"
+msgstr "Epson EP 901F"
+
+#: src/xml/xmli18n-tmp.h:7460
+msgid "Epson MC 2000"
+msgstr "Epson MC 2000"
+
+#: src/xml/xmli18n-tmp.h:7461
+msgid "Epson MC 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:7462
+msgid "Epson MC 7000"
+msgstr "Epson MC 7000"
+
+#: src/xml/xmli18n-tmp.h:7463
+msgid "Epson MC 9000"
+msgstr "Epson MC 9000"
+
+#: src/xml/xmli18n-tmp.h:7464
+msgid "Epson MC 10000"
+msgstr "Epson MC 10000"
+
+#: src/xml/xmli18n-tmp.h:7465
+msgid "Epson ME 300"
+msgstr "Epson ME 300"
+
+#: src/xml/xmli18n-tmp.h:7466
+msgid "Epson ME 320"
+msgstr "Epson ME 320"
+
+#: src/xml/xmli18n-tmp.h:7467
+msgid "Epson ME Office 70"
+msgstr "Epson ME Office 70"
+
+#: src/xml/xmli18n-tmp.h:7468
+msgid "Epson ME Office 80W"
+msgstr "Epson ME Office 80W"
+
+#: src/xml/xmli18n-tmp.h:7469
+msgid "Epson ME Office 360"
+msgstr "Epson ME Office 360"
+
+#: src/xml/xmli18n-tmp.h:7470
+msgid "Epson ME Office 600F"
+msgstr "Epson ME Office 600F"
+
+#: src/xml/xmli18n-tmp.h:7471
+msgid "Epson ME Office 620F"
+msgstr "Epson ME Office 620F"
+
+#: src/xml/xmli18n-tmp.h:7472
+msgid "Epson ME Office 700FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:7474
+msgid "Epson ME Office 1100"
+msgstr "Epson ME Office 1100"
+
+#: src/xml/xmli18n-tmp.h:7475
+msgid "Epson MJ 930C"
+msgstr "Epson MJ 930C"
+
+#: src/xml/xmli18n-tmp.h:7476
+msgid "Epson MJ 5100C"
+msgstr "Epson MJ 5100C"
+
+#: src/xml/xmli18n-tmp.h:7477
+msgid "Epson MJ 6000C"
+msgstr "Epson MJ 6000C"
+
+#: src/xml/xmli18n-tmp.h:7478
+msgid "Epson MJ 8000C"
+msgstr "Epson MJ 8000C"
+
+#: src/xml/xmli18n-tmp.h:7479
+msgid "Epson PM 670C"
+msgstr "Epson PM 670C"
+
+#: src/xml/xmli18n-tmp.h:7480
+msgid "Epson PM 700C"
+msgstr "Epson PM 700C"
+
+#: src/xml/xmli18n-tmp.h:7481
+msgid "Epson PM 730C"
+msgstr "Epson PM 730C"
+
+#: src/xml/xmli18n-tmp.h:7482
+msgid "Epson PM 740C"
+msgstr "Epson PM 740C"
+
+#: src/xml/xmli18n-tmp.h:7483
+msgid "Epson PM 750C"
+msgstr "Epson PM 750C"
+
+#: src/xml/xmli18n-tmp.h:7484
+msgid "Epson PM 760C"
+msgstr "Epson PM 760C"
+
+#: src/xml/xmli18n-tmp.h:7485
+msgid "Epson PM 770C"
+msgstr "Epson PM 770C"
+
+#: src/xml/xmli18n-tmp.h:7486
+msgid "Epson PM 780C"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:7487
+msgid "Epson PM 790PT"
+msgstr "Epson PM 790PT"
+
+#: src/xml/xmli18n-tmp.h:7488
+msgid "Epson PM 800C"
+msgstr "Epson PM 800C"
+
+#: src/xml/xmli18n-tmp.h:7489
+msgid "Epson PM 850PT"
+msgstr "Epson PM 850PT"
+
+#: src/xml/xmli18n-tmp.h:7490
+msgid "Epson PM 870C"
+msgstr "Epson PM 870C"
+
+#: src/xml/xmli18n-tmp.h:7491
+msgid "Epson PM 880C"
+msgstr "Epson PM 880C"
+
+#: src/xml/xmli18n-tmp.h:7492
+msgid "Epson PM 930C"
+msgstr "Epson PM 930C"
+
+#: src/xml/xmli18n-tmp.h:7493
+msgid "Epson PM 940C"
+msgstr "Epson PM 940C"
+
+#: src/xml/xmli18n-tmp.h:7494
+msgid "Epson PM 950C"
+msgstr "Epson PM 950C"
+
+#: src/xml/xmli18n-tmp.h:7495
+msgid "Epson PM 970C"
+msgstr "Epson PM 970C"
+
+#: src/xml/xmli18n-tmp.h:7496
+msgid "Epson PM 980C"
+msgstr "Epson PM 980C"
+
+#: src/xml/xmli18n-tmp.h:7497
+msgid "Epson PM 2000C"
+msgstr "Epson PM 2000C"
+
+#: src/xml/xmli18n-tmp.h:7498
+msgid "Epson PM 2200C"
+msgstr "Epson PM 2200C"
+
+#: src/xml/xmli18n-tmp.h:7499
+msgid "Epson PM 3000C"
+msgstr "Epson PM 3000C"
+
+#: src/xml/xmli18n-tmp.h:7500
+msgid "Epson PM 3300C"
+msgstr "Epson PM 3300C"
+
+#: src/xml/xmli18n-tmp.h:7501
+msgid "Epson PM 3500C"
+msgstr "Epson PM 3500C"
+
+#: src/xml/xmli18n-tmp.h:7502
+msgid "Epson PM 3700C"
+msgstr "Epson PM 3700C"
+
+#: src/xml/xmli18n-tmp.h:7503
+msgid "Epson PM 4000PX"
+msgstr "Epson PM 4000PX"
+
+#: src/xml/xmli18n-tmp.h:7504
+msgid "Epson PM 5000C"
+msgstr "Epson PM 5000C"
+
+#: src/xml/xmli18n-tmp.h:7505
+msgid "Epson PM 7000C"
+msgstr "Epson PM 7000C"
+
+#: src/xml/xmli18n-tmp.h:7506
+msgid "Epson PM 9000C"
+msgstr "Epson PM 9000C"
+
+#: src/xml/xmli18n-tmp.h:7507
+msgid "Epson PM 10000"
+msgstr "Epson PM 10000"
+
+#: src/xml/xmli18n-tmp.h:7508
+msgid "Epson PM A650"
+msgstr "Epson PM A650"
+
+#: src/xml/xmli18n-tmp.h:7509
+msgid "Epson PM A750"
+msgstr "Epson PM A750"
+
+#: src/xml/xmli18n-tmp.h:7510
+msgid "Epson PM A820"
+msgstr "Epson PM A820"
+
+#: src/xml/xmli18n-tmp.h:7511
+msgid "Epson PM A890"
+msgstr "Epson PM A890"
+
+#: src/xml/xmli18n-tmp.h:7512
+msgid "Epson PM A900"
+msgstr "Epson PM A900"
+
+#: src/xml/xmli18n-tmp.h:7513
+msgid "Epson PM A940"
+msgstr "Epson PM A940"
+
+#: src/xml/xmli18n-tmp.h:7514
+msgid "Epson PM A950"
+msgstr "Epson PM A950"
+
+#: src/xml/xmli18n-tmp.h:7515
+msgid "Epson PM D600"
+msgstr "Epson PM D600"
+
+#: src/xml/xmli18n-tmp.h:7516
+msgid "Epson PM D750"
+msgstr "Epson PM D750"
+
+#: src/xml/xmli18n-tmp.h:7517
+msgid "Epson PM D770"
+msgstr "Epson PM D770"
+
+#: src/xml/xmli18n-tmp.h:7518
+msgid "Epson PM D800"
+msgstr "Epson PM D800"
+
+#: src/xml/xmli18n-tmp.h:7519
+msgid "Epson PM D870"
+msgstr "Epson PM D870"
+
+#: src/xml/xmli18n-tmp.h:7520
+msgid "Epson PM D1000"
+msgstr "Epson PM D1000"
+
+#: src/xml/xmli18n-tmp.h:7521
+msgid "Epson PM G700"
+msgstr "Epson PM G700"
+
+#: src/xml/xmli18n-tmp.h:7522
+msgid "Epson PM G720"
+msgstr "Epson PM G720"
+
+#: src/xml/xmli18n-tmp.h:7523
+msgid "Epson PM G730"
+msgstr "Epson PM G730"
+
+#: src/xml/xmli18n-tmp.h:7524
+msgid "Epson PM G800"
+msgstr "Epson PM G800"
+
+#: src/xml/xmli18n-tmp.h:7525
+msgid "Epson PM G820"
+msgstr "Epson PM G820"
+
+#: src/xml/xmli18n-tmp.h:7526
+msgid "Epson PM G850"
+msgstr "Epson PM G850"
+
+#: src/xml/xmli18n-tmp.h:7527
+msgid "Epson PM T960"
+msgstr "Epson PM T960"
+
+#: src/xml/xmli18n-tmp.h:7528
+msgid "Epson PM G4500"
+msgstr "Epson PM G4500"
+
+#: src/xml/xmli18n-tmp.h:7529
+msgid "Epson PX A650"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:7530
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:7531
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7533
+msgid "Epson PX 101"
+msgstr "Epson PX 101"
+
+#: src/xml/xmli18n-tmp.h:7534
+msgid "Epson PX 201"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:7536
+msgid "Epson PX 401A"
+msgstr "Epson PX 401A"
+
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7538
+msgid "Epson PX 601F"
+msgstr "Epson PX 601F"
+
+#: src/xml/xmli18n-tmp.h:7539
+msgid "Epson PX 1001"
+msgstr "Epson PX 1001"
+
+#: src/xml/xmli18n-tmp.h:7540
+msgid "Epson PX G900"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:7541
+msgid "Epson PX G920"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:7542
+msgid "Epson PX G5000"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:7543
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:7544
+msgid "Epson PX V500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:7545
+msgid "Epson PX V600"
+msgstr "Epson PX V600"
+
+#: src/xml/xmli18n-tmp.h:7546
+msgid "Epson PX V630"
+msgstr "Epson PX V630"
+
+#: src/xml/xmli18n-tmp.h:7547
+msgid "Epson PX V780"
+msgstr "Epson PX V780"
+
+#: src/xml/xmli18n-tmp.h:7548
+msgid "Epson PX 5500"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:7549
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:7550
+msgid "Epson PX 7000"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:7551
+msgid "Epson PX 9000"
+msgstr "Epson PX 9000"
+
+#: src/xml/xmli18n-tmp.h:7552
+msgid "Apollo P-2100"
+msgstr "Apollo P-2100"
+
+#: src/xml/xmli18n-tmp.h:7553
+msgid "Apollo P-2150"
+msgstr "Apollo P-2150"
+
+#: src/xml/xmli18n-tmp.h:7554
+msgid "Apollo P-2200"
+msgstr "Apollo P-2200"
+
+#: src/xml/xmli18n-tmp.h:7555
+msgid "Apollo P-2250"
+msgstr "Apollo P-2250"
+
+#: src/xml/xmli18n-tmp.h:7556
+msgid "Apollo P-2500"
+msgstr "Apollo P-2500"
+
+#: src/xml/xmli18n-tmp.h:7557
+msgid "Apollo P-2550"
+msgstr "Apollo P-2550"
+
+#: src/xml/xmli18n-tmp.h:7558
+msgid "Apollo P-2600"
+msgstr "Apollo P-2600"
+
+#: src/xml/xmli18n-tmp.h:7559
+msgid "Apollo P-2650"
+msgstr "Apollo P-2650"
+
+#: src/xml/xmli18n-tmp.h:7560
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/xml/xmli18n-tmp.h:7561
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/xml/xmli18n-tmp.h:7562
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/xml/xmli18n-tmp.h:7563
+msgid "Apple LaserWriter Select 360"
+msgstr "Apple LaserWriter Select 360"
+
+#: src/xml/xmli18n-tmp.h:7564
+msgid "Brother DCP-1200"
+msgstr "Brother DCP-1200"
+
+#: src/xml/xmli18n-tmp.h:7565
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
+
+#: src/xml/xmli18n-tmp.h:7566
+msgid "Brother HL-1040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:7567
+msgid "Brother HL-1050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:7568
+msgid "Brother HL-1060"
+msgstr "Brother HL-1060"
+
+#: src/xml/xmli18n-tmp.h:7569
+msgid "Brother HL-1070"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:7570
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:7571
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:7572
+msgid "Brother HL-1240"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:7573
+msgid "Brother HL-1250"
+msgstr "Brother HL-1250"
+
+#: src/xml/xmli18n-tmp.h:7574
+msgid "Brother HL-1260"
+msgstr "Brother HL-1260"
+
+#: src/xml/xmli18n-tmp.h:7575
+msgid "Brother HL-1270N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:7576
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:7577
+msgid "Brother HL-1440"
+msgstr "Brother HL-1440"
+
+#: src/xml/xmli18n-tmp.h:7578
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:7579
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:7580
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:7581
+msgid "Brother HL-1660e"
+msgstr "Brother HL-1660e"
+
+#: src/xml/xmli18n-tmp.h:7582
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:7583
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:7584
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:7585
+msgid "Brother HL-2030"
+msgstr "Brother HL-2030"
+
+#: src/xml/xmli18n-tmp.h:7586
+msgid "Brother HL-2035"
+msgstr "Brother HL-2035"
+
+#: src/xml/xmli18n-tmp.h:7587
+msgid "Brother HL-2060"
+msgstr "Brother HL-2060"
+
+#: src/xml/xmli18n-tmp.h:7588
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:7589
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:7590
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:7591
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:7592
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:7593
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:7594
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:7595
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:7596
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:7597
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:7598
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:7599
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:7600
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:7601
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:7602
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:7603
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:7604
+msgid "Brother MFC-6550MC"
+msgstr "Brother MFC-6550MC"
+
+#: src/xml/xmli18n-tmp.h:7605
+msgid "Brother MFC-8300"
+msgstr "Brother MFC-8300"
+
+#: src/xml/xmli18n-tmp.h:7606
+msgid "Brother MFC-9500"
+msgstr "Brother MFC-9500"
+
+#: src/xml/xmli18n-tmp.h:7607
+msgid "Brother MFC-9600"
+msgstr "Brother MFC-9600"
+
+#: src/xml/xmli18n-tmp.h:7608
+msgid "Canon GP 335"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:7609
+msgid "Canon LBP-4sx"
+msgstr "Canon LBP-4sx"
+
+#: src/xml/xmli18n-tmp.h:7610
+msgid "Canon LBP-430"
+msgstr "Canon LBP-430"
+
+#: src/xml/xmli18n-tmp.h:7611
+msgid "Canon LBP-1000"
+msgstr "Canon LBP-1000"
+
+#: src/xml/xmli18n-tmp.h:7612
+msgid "Canon LBP-1260"
+msgstr "Canon LBP-1260"
+
+#: src/xml/xmli18n-tmp.h:7613
+msgid "Canon LBP-1760"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:7614
+msgid "Canon LBP-3360"
+msgstr "Canon LBP-3360"
+
+#: src/xml/xmli18n-tmp.h:7615
+msgid "Canon imageRunner 330s"
+msgstr "Canon imageRunner 330s"
+
+#: src/xml/xmli18n-tmp.h:7616
+msgid "Citizen ProJet II"
+msgstr "Citizen ProJet II"
+
+#: src/xml/xmli18n-tmp.h:7617
+msgid "DEC 1800"
+msgstr "DEC 1800"
+
+#: src/xml/xmli18n-tmp.h:7618
+msgid "DEC LN17"
+msgstr "DEC LN17"
+
+#: src/xml/xmli18n-tmp.h:7619
+msgid "Epson ActionLaser 1100"
+msgstr "Epson ActionLaser 1100"
+
+#: src/xml/xmli18n-tmp.h:7620
+msgid "Epson ActionLaser II"
+msgstr "Epson ActionLaser II"
+
+#: src/xml/xmli18n-tmp.h:7621
+msgid "Epson AL-C2000"
+msgstr "Epson AL-C2000"
+
+#: src/xml/xmli18n-tmp.h:7622
+msgid "Epson AL-C2000 PS3"
+msgstr "Epson AL-C2000 PS3"
+
+#: src/xml/xmli18n-tmp.h:7623
+msgid "Epson AL-C8500"
+msgstr "Epson AL-C8500"
+
+#: src/xml/xmli18n-tmp.h:7624
+msgid "Epson AL-C8500PS"
+msgstr "Epson AL-C8500PS"
+
+#: src/xml/xmli18n-tmp.h:7625
+msgid "Epson AL-C8600"
+msgstr "Epson AL-C8600"
+
+#: src/xml/xmli18n-tmp.h:7626
+msgid "Epson AL-C8600 PS3"
+msgstr "Epson AL-C8600 PS3"
+
+#: src/xml/xmli18n-tmp.h:7627
+msgid "Epson EPL-5200"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:7628
+msgid "Epson EPL-5200+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:7629
+msgid "Epson EPL-5700"
+msgstr "Epson EPL-5700"
+
+#: src/xml/xmli18n-tmp.h:7630
+msgid "Epson EPL-5700PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:7631
+msgid "Epson EPL-5800"
+msgstr "Epson EPL-5800"
+
+#: src/xml/xmli18n-tmp.h:7632
+msgid "Epson EPL-5800PS"
+msgstr "Epson EPL-5800PS"
+
+#: src/xml/xmli18n-tmp.h:7633
+msgid "Epson EPL-5900"
+msgstr "Epson EPL-5900"
+
+#: src/xml/xmli18n-tmp.h:7634
+msgid "Epson EPL-5900 PS3"
+msgstr "Epson EPL-5900 PS3"
+
+#: src/xml/xmli18n-tmp.h:7635
+msgid "Epson EPL-6100"
+msgstr "Epson EPL-6100"
+
+#: src/xml/xmli18n-tmp.h:7636
+msgid "Epson EPL-6100 PS3"
+msgstr "Epson EPL-6100 PS3"
+
+#: src/xml/xmli18n-tmp.h:7637
+msgid "Epson EPL-7100"
+msgstr "Epson EPL-7100"
+
+#: src/xml/xmli18n-tmp.h:7638
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:7639
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:7640
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:7641
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:7642
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:7643
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:7644
+msgid "Epson EPL-N2500 PS3"
+msgstr "Epson EPL-N2500 PS3"
+
+#: src/xml/xmli18n-tmp.h:7645
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:7646
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:7647
+msgid "Fujitsu PrintPartner 10V"
+msgstr "Fujitsu PrintPartner 10V"
+
+#: src/xml/xmli18n-tmp.h:7648
+msgid "Fujitsu PrintPartner 16DV"
+msgstr "Fujitsu PrintPartner 16DV"
+
+#: src/xml/xmli18n-tmp.h:7649
+msgid "Fujitsu PrintPartner 20W"
+msgstr "Fujitsu PrintPartner 20W"
+
+#: src/xml/xmli18n-tmp.h:7650
+msgid "Fujitsu PrintPartner 8000"
+msgstr "Fujitsu PrintPartner 8000"
+
+#: src/xml/xmli18n-tmp.h:7651
+msgid "Generic PCL 4 Printer"
+msgstr "Типовий принтер PCL 4"
+
+#: src/xml/xmli18n-tmp.h:7652
+msgid "Generic PCL 4 LF Printer"
+msgstr "Типовий принтер PCL 4 LF"
+
+#: src/xml/xmli18n-tmp.h:7653
+msgid "Generic PCL 5 Printer"
+msgstr "Типовий принтер PCL 5"
+
+#: src/xml/xmli18n-tmp.h:7654
+msgid "Generic PCL 5 LF Printer"
+msgstr "Типовий принтер PCL 5 LF"
+
+#: src/xml/xmli18n-tmp.h:7655
+msgid "Generic PCL 5c Printer"
+msgstr "Типовий принтер PCL 5c"
+
+#: src/xml/xmli18n-tmp.h:7656
+msgid "Generic PCL 5c LF Printer"
+msgstr "Типовий принтер PCL 5c LF"
+
+#: src/xml/xmli18n-tmp.h:7657
+msgid "Generic PCL 5e Printer"
+msgstr "Типовий принтер PCL 5e"
+
+#: src/xml/xmli18n-tmp.h:7658
+msgid "Generic PCL 5e LF Printer"
+msgstr "Типовий принтер PCL 5e LF"
+
+#: src/xml/xmli18n-tmp.h:7659
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr "Типовий принтер PCL 6/PCL XL"
+
+#: src/xml/xmli18n-tmp.h:7660
+msgid "Generic PCL 6/PCL XL LF Printer"
+msgstr "Типовий принтер PCL 6/PCL XL LF"
+
+#: src/xml/xmli18n-tmp.h:7661
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:7662
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:7663
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:7664
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:7665
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:7666
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
+
+#: src/xml/xmli18n-tmp.h:7667
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:7668
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
+
+#: src/xml/xmli18n-tmp.h:7669
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:7670
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:7671
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:7672
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:7673
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:7674
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:7675
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:7676
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:7677
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:7678
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:7679
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:7680
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:7681
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
+
+#: src/xml/xmli18n-tmp.h:7682
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
+
+#: src/xml/xmli18n-tmp.h:7683
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:7684
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:7685
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:7686
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:7687
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:7688
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
+
+#: src/xml/xmli18n-tmp.h:7689
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
+
+#: src/xml/xmli18n-tmp.h:7690
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
+
+#: src/xml/xmli18n-tmp.h:7691
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
+
+#: src/xml/xmli18n-tmp.h:7692
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
+
+#: src/xml/xmli18n-tmp.h:7693
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
+
+#: src/xml/xmli18n-tmp.h:7694
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
+
+#: src/xml/xmli18n-tmp.h:7695
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
+
+#: src/xml/xmli18n-tmp.h:7696
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
+
+#: src/xml/xmli18n-tmp.h:7697
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
+
+#: src/xml/xmli18n-tmp.h:7698
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
+
+#: src/xml/xmli18n-tmp.h:7699
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
+
+#: src/xml/xmli18n-tmp.h:7700
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
+
+#: src/xml/xmli18n-tmp.h:7701
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
+
+#: src/xml/xmli18n-tmp.h:7702
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
+
+#: src/xml/xmli18n-tmp.h:7703
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:7704
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:7705
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
+
+#: src/xml/xmli18n-tmp.h:7706
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:7707
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:7708
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:7709
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:7710
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:7711
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:7712
+msgid "HP Business Inkjet 2200"
+msgstr "HP Business Inkjet 2200"
+
+#: src/xml/xmli18n-tmp.h:7713
+msgid "HP Business Inkjet 2230"
+msgstr "HP Business Inkjet 2230"
+
+#: src/xml/xmli18n-tmp.h:7714
+msgid "HP Business Inkjet 2250"
+msgstr "HP Business Inkjet 2250"
+
+#: src/xml/xmli18n-tmp.h:7715
+msgid "HP Business Inkjet 2250TN"
+msgstr "HP Business Inkjet 2250TN"
+
+#: src/xml/xmli18n-tmp.h:7716
+msgid "HP Business Inkjet 2280"
+msgstr "HP Business Inkjet 2280"
+
+#: src/xml/xmli18n-tmp.h:7717
+msgid "HP Color Inkjet Printer CP1160"
+msgstr "HP Color Inkjet Printer CP1160"
+
+#: src/xml/xmli18n-tmp.h:7718
+msgid "HP Color Inkjet Printer CP1700"
+msgstr "HP Color Inkjet Printer CP1700"
+
+#: src/xml/xmli18n-tmp.h:7719
+msgid "HP Color LaserJet 2500"
+msgstr "HP Color LaserJet 2500"
+
+#: src/xml/xmli18n-tmp.h:7720
+msgid "HP Color LaserJet 4500"
+msgstr "HP Color LaserJet 4500"
+
+#: src/xml/xmli18n-tmp.h:7721
+msgid "HP Color LaserJet 4550"
+msgstr "HP Color LaserJet 4550"
+
+#: src/xml/xmli18n-tmp.h:7722
+msgid "HP Color LaserJet 4600"
+msgstr "HP Color LaserJet 4600"
+
+#: src/xml/xmli18n-tmp.h:7723
+msgid "HP Color LaserJet 5"
+msgstr "HP Color LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:7724
+msgid "HP Color LaserJet 5000"
+msgstr "HP Color LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:7725
+msgid "HP Color LaserJet 5500"
+msgstr "HP Color LaserJet 5500"
+
+#: src/xml/xmli18n-tmp.h:7726
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP Color LaserJet 8550GN"
+
+#: src/xml/xmli18n-tmp.h:7727
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/xml/xmli18n-tmp.h:7728
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/xml/xmli18n-tmp.h:7729
+msgid "HP DesignJet 430"
+msgstr "HP DesignJet 430"
+
+#: src/xml/xmli18n-tmp.h:7730
+msgid "HP DesignJet 450C"
+msgstr "HP DesignJet 450C"
+
+#: src/xml/xmli18n-tmp.h:7731
+msgid "HP DesignJet 455CA"
+msgstr "HP DesignJet 455CA"
+
+#: src/xml/xmli18n-tmp.h:7732
+msgid "HP DesignJet 488CA"
+msgstr "HP DesignJet 488CA"
+
+#: src/xml/xmli18n-tmp.h:7733
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/xml/xmli18n-tmp.h:7734
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C Plus"
+
+#: src/xml/xmli18n-tmp.h:7735
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/xml/xmli18n-tmp.h:7736
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500CP"
+
+#: src/xml/xmli18n-tmp.h:7737
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500CP"
+
+#: src/xml/xmli18n-tmp.h:7738
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet ColorPro CAD"
+
+#: src/xml/xmli18n-tmp.h:7739
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/xml/xmli18n-tmp.h:7740
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 420C"
+
+#: src/xml/xmli18n-tmp.h:7741
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 450"
+
+#: src/xml/xmli18n-tmp.h:7742
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/xml/xmli18n-tmp.h:7743
+msgid "HP DeskJet 500C"
+msgstr "HP DeskJet 500C"
+
+#: src/xml/xmli18n-tmp.h:7744
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 505J Plus"
+
+#: src/xml/xmli18n-tmp.h:7745
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 510"
+
+#: src/xml/xmli18n-tmp.h:7746
+msgid "HP DeskJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/xml/xmli18n-tmp.h:7747
+msgid "HP DeskJet 540C"
+msgstr "HP DeskJet 540C"
+
+#: src/xml/xmli18n-tmp.h:7748
+msgid "HP DeskJet 550C"
+msgstr "HP DeskJet 550C"
+
+#: src/xml/xmli18n-tmp.h:7749
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 5550"
+
+#: src/xml/xmli18n-tmp.h:7750
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 5551"
+
+#: src/xml/xmli18n-tmp.h:7751
+msgid "HP DeskJet 560C"
+msgstr "HP DeskJet 560C"
+
+#: src/xml/xmli18n-tmp.h:7752
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 600"
+
+#: src/xml/xmli18n-tmp.h:7753
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 600C"
+
+#: src/xml/xmli18n-tmp.h:7754
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 610C"
+
+#: src/xml/xmli18n-tmp.h:7755
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 610CL"
+
+#: src/xml/xmli18n-tmp.h:7756
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 6122"
+
+#: src/xml/xmli18n-tmp.h:7757
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 6127"
+
+#: src/xml/xmli18n-tmp.h:7758
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 612C"
+
+#: src/xml/xmli18n-tmp.h:7759
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 640C"
+
+#: src/xml/xmli18n-tmp.h:7760
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 648C"
+
+#: src/xml/xmli18n-tmp.h:7761
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 660C"
+
+#: src/xml/xmli18n-tmp.h:7762
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 670C"
+
+#: src/xml/xmli18n-tmp.h:7763
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 670TV"
+
+#: src/xml/xmli18n-tmp.h:7764
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 672C"
+
+#: src/xml/xmli18n-tmp.h:7765
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 680C"
+
+#: src/xml/xmli18n-tmp.h:7766
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 682C"
+
+#: src/xml/xmli18n-tmp.h:7767
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 690C"
+
+#: src/xml/xmli18n-tmp.h:7768
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 692C"
+
+#: src/xml/xmli18n-tmp.h:7769
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 693C"
+
+#: src/xml/xmli18n-tmp.h:7770
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 694C"
+
+#: src/xml/xmli18n-tmp.h:7771
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 695C"
+
+#: src/xml/xmli18n-tmp.h:7772
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 697C"
+
+#: src/xml/xmli18n-tmp.h:7773
+msgid "HP DeskJet 810C"
+msgstr "HP DeskJet 810C"
+
+#: src/xml/xmli18n-tmp.h:7774
+msgid "HP DeskJet 812C"
+msgstr "HP DeskJet 812C"
+
+#: src/xml/xmli18n-tmp.h:7775
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 815C"
+
+#: src/xml/xmli18n-tmp.h:7776
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 816C"
+
+#: src/xml/xmli18n-tmp.h:7777
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 825C"
+
+#: src/xml/xmli18n-tmp.h:7778
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 830C"
+
+#: src/xml/xmli18n-tmp.h:7779
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 832C"
+
+#: src/xml/xmli18n-tmp.h:7780
+msgid "HP DeskJet 840C"
+msgstr "HP DeskJet 840C"
+
+#: src/xml/xmli18n-tmp.h:7781
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 841C"
+
+#: src/xml/xmli18n-tmp.h:7782
+msgid "HP DeskJet 842C"
+msgstr "HP DeskJet 842C"
+
+#: src/xml/xmli18n-tmp.h:7783
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 843C"
+
+#: src/xml/xmli18n-tmp.h:7784
+msgid "HP DeskJet 845C"
+msgstr "HP DeskJet 845C"
+
+#: src/xml/xmli18n-tmp.h:7785
+msgid "HP DeskJet 850C"
+msgstr "HP DeskJet 850C"
+
+#: src/xml/xmli18n-tmp.h:7786
+msgid "HP DeskJet 855C"
+msgstr "HP DeskJet 855C"
+
+#: src/xml/xmli18n-tmp.h:7787
+msgid "HP DeskJet 870C"
+msgstr "HP DeskJet 870C"
+
+#: src/xml/xmli18n-tmp.h:7788
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 880C"
+
+#: src/xml/xmli18n-tmp.h:7789
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 882C"
+
+#: src/xml/xmli18n-tmp.h:7790
+msgid "HP DeskJet 890C"
+msgstr "HP DeskJet 890C"
+
+#: src/xml/xmli18n-tmp.h:7791
+msgid "HP DeskJet 895C"
+msgstr "HP DeskJet 895C"
+
+#: src/xml/xmli18n-tmp.h:7792
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 916C"
+
+#: src/xml/xmli18n-tmp.h:7793
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 920C"
+
+#: src/xml/xmli18n-tmp.h:7794
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 9300"
+
+#: src/xml/xmli18n-tmp.h:7795
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 930C"
+
+#: src/xml/xmli18n-tmp.h:7796
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 932C"
+
+#: src/xml/xmli18n-tmp.h:7797
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 933C"
+
+#: src/xml/xmli18n-tmp.h:7798
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 934C"
+
+#: src/xml/xmli18n-tmp.h:7799
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 935C"
+
+#: src/xml/xmli18n-tmp.h:7800
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 940C"
+
+#: src/xml/xmli18n-tmp.h:7801
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 948C"
+
+#: src/xml/xmli18n-tmp.h:7802
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 950C"
+
+#: src/xml/xmli18n-tmp.h:7803
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 952C"
+
+#: src/xml/xmli18n-tmp.h:7804
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 955C"
+
+#: src/xml/xmli18n-tmp.h:7805
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 957C"
+
+#: src/xml/xmli18n-tmp.h:7806
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 959C"
+
+#: src/xml/xmli18n-tmp.h:7807
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 960C"
+
+#: src/xml/xmli18n-tmp.h:7808
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 970C"
+
+#: src/xml/xmli18n-tmp.h:7809
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 975C"
+
+#: src/xml/xmli18n-tmp.h:7810
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 980C"
+
+#: src/xml/xmli18n-tmp.h:7811
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 990C"
+
+#: src/xml/xmli18n-tmp.h:7812
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 995C"
+
+#: src/xml/xmli18n-tmp.h:7813
+msgid "HP DeskJet 1100C"
+msgstr "HP DeskJet 1100C"
+
+#: src/xml/xmli18n-tmp.h:7814
+msgid "HP DeskJet 1120C"
+msgstr "HP DeskJet 1120C"
+
+#: src/xml/xmli18n-tmp.h:7815
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1125C"
+
+#: src/xml/xmli18n-tmp.h:7816
+msgid "HP DeskJet 1200C"
+msgstr "HP DeskJet 1200C"
+
+#: src/xml/xmli18n-tmp.h:7817
+msgid "HP DeskJet 1220C"
+msgstr "HP DeskJet 1220C"
+
+#: src/xml/xmli18n-tmp.h:7818
+msgid "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/xml/xmli18n-tmp.h:7819
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600CM"
+
+#: src/xml/xmli18n-tmp.h:7820
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 2000"
+
+#: src/xml/xmli18n-tmp.h:7821
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 2500"
+
+#: src/xml/xmli18n-tmp.h:7822
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 2500CM"
+
+#: src/xml/xmli18n-tmp.h:7823
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340C"
+
+#: src/xml/xmli18n-tmp.h:7824
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 3810"
+
+#: src/xml/xmli18n-tmp.h:7825
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 3816"
+
+#: src/xml/xmli18n-tmp.h:7826
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 3820"
+
+#: src/xml/xmli18n-tmp.h:7827
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 3822"
+
+#: src/xml/xmli18n-tmp.h:7828
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:7829
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 2D"
+
+#: src/xml/xmli18n-tmp.h:7830
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet 2P Plus"
+
+#: src/xml/xmli18n-tmp.h:7831
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 2P"
+
+#: src/xml/xmli18n-tmp.h:7832
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:7833
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 3D"
+
+#: src/xml/xmli18n-tmp.h:7834
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 3P з PCL5"
+
+#: src/xml/xmli18n-tmp.h:7835
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 3P з PS"
+
+#: src/xml/xmli18n-tmp.h:7836
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4 Plus"
+
+#: src/xml/xmli18n-tmp.h:7837
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4"
+
+#: src/xml/xmli18n-tmp.h:7838
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:7839
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4M"
+
+#: src/xml/xmli18n-tmp.h:7840
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4ML"
+
+#: src/xml/xmli18n-tmp.h:7841
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4P"
+
+#: src/xml/xmli18n-tmp.h:7842
+msgid "HP LaserJet 4Si"
+msgstr "HP LaserJet 4Si"
+
+#: src/xml/xmli18n-tmp.h:7843
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
+
+#: src/xml/xmli18n-tmp.h:7844
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:7845
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 5L"
+
+#: src/xml/xmli18n-tmp.h:7846
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5M"
+
+#: src/xml/xmli18n-tmp.h:7847
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:7848
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5P"
+
+#: src/xml/xmli18n-tmp.h:7849
+msgid "HP LaserJet 5Si"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:7850
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 6"
+
+#: src/xml/xmli18n-tmp.h:7851
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 6L"
+
+#: src/xml/xmli18n-tmp.h:7852
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 6MP"
+
+#: src/xml/xmli18n-tmp.h:7853
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 6P"
+
+#: src/xml/xmli18n-tmp.h:7854
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:7855
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 1012"
+
+#: src/xml/xmli18n-tmp.h:7856
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:7857
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1022"
+
+#: src/xml/xmli18n-tmp.h:7858
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 1100"
+
+#: src/xml/xmli18n-tmp.h:7859
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 1100A"
+
+#: src/xml/xmli18n-tmp.h:7860
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 1150"
+
+#: src/xml/xmli18n-tmp.h:7861
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:7862
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:7863
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 1220"
+
+#: src/xml/xmli18n-tmp.h:7864
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:7865
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:7866
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:7867
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 2100M"
+
+#: src/xml/xmli18n-tmp.h:7868
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 2200"
+
+#: src/xml/xmli18n-tmp.h:7869
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:7870
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:7871
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:7872
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:7873
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:7874
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:7875
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:7876
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:7877
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:7878
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:7879
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 3200"
+
+#: src/xml/xmli18n-tmp.h:7880
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 3200m"
+
+#: src/xml/xmli18n-tmp.h:7881
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 3200se"
+
+#: src/xml/xmli18n-tmp.h:7882
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:7883
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 3310 MFP"
+
+#: src/xml/xmli18n-tmp.h:7884
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 3320 MFP"
+
+#: src/xml/xmli18n-tmp.h:7885
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 3320N MFP"
+
+#: src/xml/xmli18n-tmp.h:7886
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 3330 MFP"
+
+#: src/xml/xmli18n-tmp.h:7887
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:7888
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:7889
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:7890
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4000"
+
+#: src/xml/xmli18n-tmp.h:7891
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:7892
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4100"
+
+#: src/xml/xmli18n-tmp.h:7893
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:7894
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:7895
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:7896
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4300"
+
+#: src/xml/xmli18n-tmp.h:7897
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:7898
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:7899
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:7900
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5100"
+
+#: src/xml/xmli18n-tmp.h:7901
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:7902
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:7903
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 8000"
+
+#: src/xml/xmli18n-tmp.h:7904
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 8100"
+
+#: src/xml/xmli18n-tmp.h:7905
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 8150"
+
+#: src/xml/xmli18n-tmp.h:7906
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:7907
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:7908
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:7909
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:7910
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:7911
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:7912
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:7913
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:7914
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:7915
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:7916
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:7917
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:7918
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:7919
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:7920
+msgid "HP Mopier 240"
+msgstr "HP Mopier 240"
+
+#: src/xml/xmli18n-tmp.h:7921
+msgid "HP Mopier 320"
+msgstr "HP Mopier 320"
+
+#: src/xml/xmli18n-tmp.h:7922
+msgid "HP OfficeJet 300"
+msgstr "HP OfficeJet 300"
+
+#: src/xml/xmli18n-tmp.h:7923
+msgid "HP OfficeJet 330"
+msgstr "HP OfficeJet 330"
+
+#: src/xml/xmli18n-tmp.h:7924
+msgid "HP OfficeJet 350"
+msgstr "HP OfficeJet 350"
+
+#: src/xml/xmli18n-tmp.h:7925
+msgid "HP OfficeJet 500"
+msgstr "HP OfficeJet 500"
+
+#: src/xml/xmli18n-tmp.h:7926
+msgid "HP OfficeJet 520"
+msgstr "HP OfficeJet 520"
+
+#: src/xml/xmli18n-tmp.h:7927
+msgid "HP OfficeJet 570"
+msgstr "HP OfficeJet 570"
+
+#: src/xml/xmli18n-tmp.h:7928
+msgid "HP OfficeJet 580"
+msgstr "HP OfficeJet 580"
+
+#: src/xml/xmli18n-tmp.h:7929
+msgid "HP OfficeJet 590"
+msgstr "HP OfficeJet 590"
+
+#: src/xml/xmli18n-tmp.h:7930
+msgid "HP OfficeJet 600"
+msgstr "HP OfficeJet 600"
+
+#: src/xml/xmli18n-tmp.h:7931
+msgid "HP OfficeJet 610"
+msgstr "HP OfficeJet 610"
+
+#: src/xml/xmli18n-tmp.h:7932
+msgid "HP OfficeJet 625"
+msgstr "HP OfficeJet 625"
+
+#: src/xml/xmli18n-tmp.h:7933
+msgid "HP OfficeJet 630"
+msgstr "HP OfficeJet 630"
+
+#: src/xml/xmli18n-tmp.h:7934
+msgid "HP OfficeJet 635"
+msgstr "HP OfficeJet 635"
+
+#: src/xml/xmli18n-tmp.h:7935
+msgid "HP OfficeJet 700"
+msgstr "HP OfficeJet 700"
+
+#: src/xml/xmli18n-tmp.h:7936
+msgid "HP OfficeJet 710"
+msgstr "HP OfficeJet 710"
+
+#: src/xml/xmli18n-tmp.h:7937
+msgid "HP OfficeJet 720"
+msgstr "HP OfficeJet 720"
+
+#: src/xml/xmli18n-tmp.h:7938
+msgid "HP OfficeJet 725"
+msgstr "HP OfficeJet 725"
+
+#: src/xml/xmli18n-tmp.h:7939
+msgid "HP OfficeJet 5105"
+msgstr "HP OfficeJet 5105"
+
+#: src/xml/xmli18n-tmp.h:7940
+msgid "HP OfficeJet 5110"
+msgstr "HP OfficeJet 5110"
+
+#: src/xml/xmli18n-tmp.h:7941
+msgid "HP OfficeJet 5110xi"
+msgstr "HP OfficeJet 5110xi"
+
+#: src/xml/xmli18n-tmp.h:7942
+msgid "HP OfficeJet 6105"
+msgstr "HP OfficeJet 6105"
+
+#: src/xml/xmli18n-tmp.h:7943
+msgid "HP OfficeJet 6110"
+msgstr "HP OfficeJet 6110"
+
+#: src/xml/xmli18n-tmp.h:7944
+msgid "HP OfficeJet 7110"
+msgstr "HP OfficeJet 7110"
+
+#: src/xml/xmli18n-tmp.h:7945
+msgid "HP OfficeJet 7130"
+msgstr "HP OfficeJet 7130"
+
+#: src/xml/xmli18n-tmp.h:7946
+msgid "HP OfficeJet 7140"
+msgstr "HP OfficeJet 7140"
+
+#: src/xml/xmli18n-tmp.h:7947
+msgid "HP OfficeJet D125"
+msgstr "HP OfficeJet D125"
+
+#: src/xml/xmli18n-tmp.h:7948
+msgid "HP OfficeJet D135"
+msgstr "HP OfficeJet D135"
+
+#: src/xml/xmli18n-tmp.h:7949
+msgid "HP OfficeJet D145"
+msgstr "HP OfficeJet D145"
+
+#: src/xml/xmli18n-tmp.h:7950
+msgid "HP OfficeJet D155"
+msgstr "HP OfficeJet D155"
+
+#: src/xml/xmli18n-tmp.h:7951
+msgid "HP OfficeJet G55"
+msgstr "HP OfficeJet G55"
+
+#: src/xml/xmli18n-tmp.h:7952
+msgid "HP OfficeJet G85"
+msgstr "HP OfficeJet G85"
+
+#: src/xml/xmli18n-tmp.h:7953
+msgid "HP OfficeJet G95"
+msgstr "HP OfficeJet G95"
+
+#: src/xml/xmli18n-tmp.h:7954
+msgid "HP OfficeJet K60"
+msgstr "HP OfficeJet K60"
+
+#: src/xml/xmli18n-tmp.h:7955
+msgid "HP OfficeJet K60xi"
+msgstr "HP OfficeJet K60xi"
+
+#: src/xml/xmli18n-tmp.h:7956
+msgid "HP OfficeJet K80"
+msgstr "HP OfficeJet K80"
+
+#: src/xml/xmli18n-tmp.h:7957
+msgid "HP OfficeJet K80xi"
+msgstr "HP OfficeJet K80xi"
+
+#: src/xml/xmli18n-tmp.h:7958
+msgid "HP OfficeJet LX"
+msgstr "HP OfficeJet LX"
+
+#: src/xml/xmli18n-tmp.h:7959
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP OfficeJet Pro 1150C"
+
+#: src/xml/xmli18n-tmp.h:7960
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP OfficeJet Pro 1170C"
+
+#: src/xml/xmli18n-tmp.h:7961
+msgid "HP OfficeJet Pro 1175C"
+msgstr "HP OfficeJet Pro 1175C"
+
+#: src/xml/xmli18n-tmp.h:7962
+msgid "HP OfficeJet R40"
+msgstr "HP OfficeJet R40"
+
+#: src/xml/xmli18n-tmp.h:7963
+msgid "HP OfficeJet R45"
+msgstr "HP OfficeJet R45"
+
+#: src/xml/xmli18n-tmp.h:7964
+msgid "HP OfficeJet R60"
+msgstr "HP OfficeJet R60"
+
+#: src/xml/xmli18n-tmp.h:7965
+msgid "HP OfficeJet R65"
+msgstr "HP OfficeJet R65"
+
+#: src/xml/xmli18n-tmp.h:7966
+msgid "HP OfficeJet R80"
+msgstr "HP OfficeJet R80"
+
+#: src/xml/xmli18n-tmp.h:7967
+msgid "HP OfficeJet T45"
+msgstr "HP OfficeJet T45"
+
+#: src/xml/xmli18n-tmp.h:7968
+msgid "HP OfficeJet T65"
+msgstr "HP OfficeJet T65"
+
+#: src/xml/xmli18n-tmp.h:7969
+msgid "HP OfficeJet V40"
+msgstr "HP OfficeJet V40"
+
+#: src/xml/xmli18n-tmp.h:7970
+msgid "HP OfficeJet V40xi"
+msgstr "HP OfficeJet V40xi"
+
+#: src/xml/xmli18n-tmp.h:7971
+msgid "HP OfficeJet"
+msgstr "HP OfficeJet"
+
+#: src/xml/xmli18n-tmp.h:7972
+msgid "HP PSC 370"
+msgstr "HP PSC 370"
+
+#: src/xml/xmli18n-tmp.h:7973
+msgid "HP PSC 380"
+msgstr "HP PSC 380"
+
+#: src/xml/xmli18n-tmp.h:7974
+msgid "HP PSC 500"
+msgstr "HP PSC 500"
+
+#: src/xml/xmli18n-tmp.h:7975
+msgid "HP PSC 750"
+msgstr "HP PSC 750"
+
+#: src/xml/xmli18n-tmp.h:7976
+msgid "HP PSC 950"
+msgstr "HP PSC 950"
+
+#: src/xml/xmli18n-tmp.h:7977
+msgid "HP PSC 950xi"
+msgstr "HP PSC 950xi"
+
+#: src/xml/xmli18n-tmp.h:7978
+msgid "HP PSC 2110"
+msgstr "HP PSC 2110"
+
+#: src/xml/xmli18n-tmp.h:7979
+msgid "HP PSC 2150"
+msgstr "HP PSC 2150"
+
+#: src/xml/xmli18n-tmp.h:7980
+msgid "HP PSC 2210"
+msgstr "HP PSC 2210"
+
+#: src/xml/xmli18n-tmp.h:7981
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart 7150"
+
+#: src/xml/xmli18n-tmp.h:7982
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart 7345"
+
+#: src/xml/xmli18n-tmp.h:7983
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart 7350"
+
+#: src/xml/xmli18n-tmp.h:7984
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart 7550"
+
+#: src/xml/xmli18n-tmp.h:7985
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P100"
+
+#: src/xml/xmli18n-tmp.h:7986
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P130"
+
+#: src/xml/xmli18n-tmp.h:7987
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P230"
+
+#: src/xml/xmli18n-tmp.h:7988
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/xml/xmli18n-tmp.h:7989
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/xml/xmli18n-tmp.h:7990
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1115"
+
+#: src/xml/xmli18n-tmp.h:7991
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1215"
+
+#: src/xml/xmli18n-tmp.h:7992
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1218"
+
+#: src/xml/xmli18n-tmp.h:7993
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1315"
+
+#: src/xml/xmli18n-tmp.h:7994
+msgid "HP e-printer e20"
+msgstr "HP e-printer e20"
+
+#: src/xml/xmli18n-tmp.h:7995
+msgid "IBM 4019"
+msgstr "IBM 4019"
+
+#: src/xml/xmli18n-tmp.h:7996
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr "IBM 4029 030 LaserPrinter 10"
+
+#: src/xml/xmli18n-tmp.h:7997
+msgid "IBM 4312"
+msgstr "IBM 4312"
+
+#: src/xml/xmli18n-tmp.h:7998
+msgid "IBM Infoprint 12"
+msgstr "IBM Infoprint 12"
+
+#: src/xml/xmli18n-tmp.h:7999
+msgid "IBM Page Printer 3112"
+msgstr "IBM Page Printer 3112"
+
+#: src/xml/xmli18n-tmp.h:8000
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:8001
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:8002
+msgid "Infotec 4651 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:8003
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:8004
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:8005
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:8006
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:8007
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:8008
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:8009
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:8010
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:8011
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:8012
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:8013
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:8014
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:8015
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:8016
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:8017
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:8018
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:8019
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:8020
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:8021
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:8022
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:8023
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:8024
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:8025
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:8026
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:8027
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:8028
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:8029
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:8030
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:8031
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:8032
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:8033
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:8034
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:8035
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:8036
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:8037
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:8038
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:8039
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:8040
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:8041
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:8042
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:8043
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:8044
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:8045
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8046
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8047
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8048
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8049
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8050
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8051
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8052
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8053
+msgid "Kyocera CS-1815"
+msgstr "Kyocera CS-1815"
+
+#: src/xml/xmli18n-tmp.h:8054
+msgid "Kyocera F-1010"
+msgstr "Kyocera F-1010"
+
+#: src/xml/xmli18n-tmp.h:8055
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr "Kyocera FS-600 - KPDL-2"
+
+#: src/xml/xmli18n-tmp.h:8056
+msgid "Kyocera FS-600"
+msgstr "Kyocera FS-600"
+
+#: src/xml/xmli18n-tmp.h:8057
+msgid "Kyocera FS-680"
+msgstr "Kyocera FS-680"
+
+#: src/xml/xmli18n-tmp.h:8058
+msgid "Kyocera FS-800"
+msgstr "Kyocera FS-800"
+
+#: src/xml/xmli18n-tmp.h:8059
+msgid "Kyocera FS-920"
+msgstr "Kyocera FS-920"
+
+#: src/xml/xmli18n-tmp.h:8060
+msgid "Kyocera FS-1000"
+msgstr "Kyocera FS-1000"
+
+#: src/xml/xmli18n-tmp.h:8061
+msgid "Kyocera FS-1000+"
+msgstr "Kyocera FS-1000+"
+
+#: src/xml/xmli18n-tmp.h:8062
+msgid "Kyocera FS-1010"
+msgstr "Kyocera FS-1010"
+
+#: src/xml/xmli18n-tmp.h:8063
+msgid "Kyocera FS-1018MFP"
+msgstr "Kyocera FS-1018MFP"
+
+#: src/xml/xmli18n-tmp.h:8064
+msgid "Kyocera FS-1020D"
+msgstr "Kyocera FS-1020D"
+
+#: src/xml/xmli18n-tmp.h:8065
+msgid "Kyocera FS-1030D"
+msgstr "Kyocera FS-1030D"
+
+#: src/xml/xmli18n-tmp.h:8066
+msgid "Kyocera FS-1050"
+msgstr "Kyocera FS-1050"
+
+#: src/xml/xmli18n-tmp.h:8067
+msgid "Kyocera FS-1118MFP"
+msgstr "Kyocera FS-1118MFP"
+
+#: src/xml/xmli18n-tmp.h:8068
+msgid "Kyocera FS-1200"
+msgstr "Kyocera FS-1200"
+
+#: src/xml/xmli18n-tmp.h:8069
+msgid "Kyocera FS-1600"
+msgstr "Kyocera FS-1600"
+
+#: src/xml/xmli18n-tmp.h:8070
+msgid "Kyocera FS-1600+"
+msgstr "Kyocera FS-1600+"
+
+#: src/xml/xmli18n-tmp.h:8071
+msgid "Kyocera FS-1700"
+msgstr "Kyocera FS-1700"
+
+#: src/xml/xmli18n-tmp.h:8072
+msgid "Kyocera FS-1700+"
+msgstr "Kyocera FS-1700+"
+
+#: src/xml/xmli18n-tmp.h:8073
+msgid "Kyocera FS-1714M"
+msgstr "Kyocera FS-1714M"
+
+#: src/xml/xmli18n-tmp.h:8074
+msgid "Kyocera FS-1750"
+msgstr "Kyocera FS-1750"
+
+#: src/xml/xmli18n-tmp.h:8075
+msgid "Kyocera FS-1800"
+msgstr "Kyocera FS-1800"
+
+#: src/xml/xmli18n-tmp.h:8076
+msgid "Kyocera FS-1800+"
+msgstr "Kyocera FS-1800+"
+
+#: src/xml/xmli18n-tmp.h:8077
+msgid "Kyocera FS-1900"
+msgstr "Kyocera FS-1900"
+
+#: src/xml/xmli18n-tmp.h:8078
+msgid "Kyocera FS-1920"
+msgstr "Kyocera FS-1920"
+
+#: src/xml/xmli18n-tmp.h:8079
+msgid "Kyocera FS-2000D"
+msgstr "Kyocera FS-2000D"
+
+#: src/xml/xmli18n-tmp.h:8080
+msgid "Kyocera FS-3500"
+msgstr "Kyocera FS-3500"
+
+#: src/xml/xmli18n-tmp.h:8081
+msgid "Kyocera FS-3600"
+msgstr "Kyocera FS-3600"
+
+#: src/xml/xmli18n-tmp.h:8082
+msgid "Kyocera FS-3600+"
+msgstr "Kyocera FS-3600+"
+
+#: src/xml/xmli18n-tmp.h:8083
+msgid "Kyocera FS-3700"
+msgstr "Kyocera FS-3700"
+
+#: src/xml/xmli18n-tmp.h:8084
+msgid "Kyocera FS-3700+"
+msgstr "Kyocera FS-3700+"
+
+#: src/xml/xmli18n-tmp.h:8085
+msgid "Kyocera FS-3718M"
+msgstr "Kyocera FS-3718M"
+
+#: src/xml/xmli18n-tmp.h:8086
+msgid "Kyocera FS-3750"
+msgstr "Kyocera FS-3750"
+
+#: src/xml/xmli18n-tmp.h:8087
+msgid "Kyocera FS-3800"
+msgstr "Kyocera FS-3800"
+
+#: src/xml/xmli18n-tmp.h:8088
+msgid "Kyocera FS-3820N"
+msgstr "Kyocera FS-3820N"
+
+#: src/xml/xmli18n-tmp.h:8089
+msgid "Kyocera FS-3830N"
+msgstr "Kyocera FS-3830N"
+
+#: src/xml/xmli18n-tmp.h:8090
+msgid "Kyocera FS-3900DN"
+msgstr "Kyocera FS-3900DN"
+
+#: src/xml/xmli18n-tmp.h:8091
+msgid "Kyocera FS-4000DN"
+msgstr "Kyocera FS-4000DN"
+
+#: src/xml/xmli18n-tmp.h:8092
+msgid "Kyocera FS-5800C"
+msgstr "Kyocera FS-5800C"
+
+#: src/xml/xmli18n-tmp.h:8093
+msgid "Kyocera FS-5900C"
+msgstr "Kyocera FS-5900C"
+
+#: src/xml/xmli18n-tmp.h:8094
+msgid "Kyocera FS-6020"
+msgstr "Kyocera FS-6020"
+
+#: src/xml/xmli18n-tmp.h:8095
+msgid "Kyocera FS-6026"
+msgstr "Kyocera FS-6026"
+
+#: src/xml/xmli18n-tmp.h:8096
+msgid "Kyocera FS-6300"
+msgstr "Kyocera FS-6300"
+
+#: src/xml/xmli18n-tmp.h:8097
+msgid "Kyocera FS-6500"
+msgstr "Kyocera FS-6500"
+
+#: src/xml/xmli18n-tmp.h:8098
+msgid "Kyocera FS-6500+"
+msgstr "Kyocera FS-6500+"
+
+#: src/xml/xmli18n-tmp.h:8099
+msgid "Kyocera FS-6700"
+msgstr "Kyocera FS-6700"
+
+#: src/xml/xmli18n-tmp.h:8100
+msgid "Kyocera FS-6750"
+msgstr "Kyocera FS-6750"
+
+#: src/xml/xmli18n-tmp.h:8101
+msgid "Kyocera FS-6900"
+msgstr "Kyocera FS-6900"
+
+#: src/xml/xmli18n-tmp.h:8102
+msgid "Kyocera FS-6950DN"
+msgstr "Kyocera FS-6950DN"
+
+#: src/xml/xmli18n-tmp.h:8103
+msgid "Kyocera FS-7000"
+msgstr "Kyocera FS-7000"
+
+#: src/xml/xmli18n-tmp.h:8104
+msgid "Kyocera FS-7000+"
+msgstr "Kyocera FS-7000+"
+
+#: src/xml/xmli18n-tmp.h:8105
+msgid "Kyocera FS-7028M"
+msgstr "Kyocera FS-7028M"
+
+#: src/xml/xmli18n-tmp.h:8106
+msgid "Kyocera FS-8000C"
+msgstr "Kyocera FS-8000C"
+
+#: src/xml/xmli18n-tmp.h:8107
+msgid "Kyocera FS-9000"
+msgstr "Kyocera FS-9000"
+
+#: src/xml/xmli18n-tmp.h:8108
+msgid "Kyocera FS-9100DN"
+msgstr "Kyocera FS-9100DN"
+
+#: src/xml/xmli18n-tmp.h:8109
+msgid "Kyocera FS-9130DN"
+msgstr "Kyocera FS-9130DN"
+
+#: src/xml/xmli18n-tmp.h:8110
+msgid "Kyocera FS-9500DN"
+msgstr "Kyocera FS-9500DN"
+
+#: src/xml/xmli18n-tmp.h:8111
+msgid "Kyocera FS-9530DN"
+msgstr "Kyocera FS-9530DN"
+
+#: src/xml/xmli18n-tmp.h:8112
+msgid "Kyocera KM-1510"
+msgstr "Kyocera KM-1510"
+
+#: src/xml/xmli18n-tmp.h:8113
+msgid "Kyocera KM-1530"
+msgstr "Kyocera KM-1530"
+
+#: src/xml/xmli18n-tmp.h:8114
+msgid "Kyocera KM-1810"
+msgstr "Kyocera KM-1810"
+
+#: src/xml/xmli18n-tmp.h:8115
+msgid "Kyocera KM-1815"
+msgstr "Kyocera KM-1815"
+
+#: src/xml/xmli18n-tmp.h:8116
+msgid "Kyocera KM-1820"
+msgstr "Kyocera KM-1820"
+
+#: src/xml/xmli18n-tmp.h:8117
+msgid "Kyocera KM-2030"
+msgstr "Kyocera KM-2030"
+
+#: src/xml/xmli18n-tmp.h:8118
+msgid "Kyocera KM-2530"
+msgstr "Kyocera KM-2530"
+
+#: src/xml/xmli18n-tmp.h:8119
+msgid "Kyocera KM-3050"
+msgstr "Kyocera KM-3050"
+
+#: src/xml/xmli18n-tmp.h:8120
+msgid "Kyocera KM-3530"
+msgstr "Kyocera KM-3530"
+
+#: src/xml/xmli18n-tmp.h:8121
+msgid "Kyocera KM-4050"
+msgstr "Kyocera KM-4050"
+
+#: src/xml/xmli18n-tmp.h:8122
+msgid "Kyocera KM-4230"
+msgstr "Kyocera KM-4230"
+
+#: src/xml/xmli18n-tmp.h:8123
+msgid "Kyocera KM-4230/5230"
+msgstr "Kyocera KM-4230/5230"
+
+#: src/xml/xmli18n-tmp.h:8124
+msgid "Kyocera KM-4530"
+msgstr "Kyocera KM-4530"
+
+#: src/xml/xmli18n-tmp.h:8125
+msgid "Kyocera KM-5050"
+msgstr "Kyocera KM-5050"
+
+#: src/xml/xmli18n-tmp.h:8126
+msgid "Kyocera KM-5230"
+msgstr "Kyocera KM-5230"
+
+#: src/xml/xmli18n-tmp.h:8127
+msgid "Kyocera KM-5530"
+msgstr "Kyocera KM-5530"
+
+#: src/xml/xmli18n-tmp.h:8128
+msgid "Kyocera KM-6030"
+msgstr "Kyocera KM-6030"
+
+#: src/xml/xmli18n-tmp.h:8129
+msgid "Kyocera KM-6230"
+msgstr "Kyocera KM-6230"
+
+#: src/xml/xmli18n-tmp.h:8130
+msgid "Kyocera KM-8030"
+msgstr "Kyocera KM-8030"
+
+#: src/xml/xmli18n-tmp.h:8131
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
+
+#: src/xml/xmli18n-tmp.h:8132
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
+
+#: src/xml/xmli18n-tmp.h:8133
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
+
+#: src/xml/xmli18n-tmp.h:8134
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
+
+#: src/xml/xmli18n-tmp.h:8135
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
+
+#: src/xml/xmli18n-tmp.h:8136
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
+
+#: src/xml/xmli18n-tmp.h:8137
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
+
+#: src/xml/xmli18n-tmp.h:8138
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
+
+#: src/xml/xmli18n-tmp.h:8139
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
+
+#: src/xml/xmli18n-tmp.h:8140
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
+
+#: src/xml/xmli18n-tmp.h:8141
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
+
+#: src/xml/xmli18n-tmp.h:8142
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
+
+#: src/xml/xmli18n-tmp.h:8143
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
+
+#: src/xml/xmli18n-tmp.h:8144
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
+
+#: src/xml/xmli18n-tmp.h:8145
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
+
+#: src/xml/xmli18n-tmp.h:8146
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
+
+#: src/xml/xmli18n-tmp.h:8147
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
+
+#: src/xml/xmli18n-tmp.h:8148
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
+
+#: src/xml/xmli18n-tmp.h:8149
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
+
+#: src/xml/xmli18n-tmp.h:8150
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
+
+#: src/xml/xmli18n-tmp.h:8151
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
+
+#: src/xml/xmli18n-tmp.h:8152
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
+
+#: src/xml/xmli18n-tmp.h:8153
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
+
+#: src/xml/xmli18n-tmp.h:8154
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
+
+#: src/xml/xmli18n-tmp.h:8155
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
+
+#: src/xml/xmli18n-tmp.h:8156
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
+
+#: src/xml/xmli18n-tmp.h:8157
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
+
+#: src/xml/xmli18n-tmp.h:8158
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
+
+#: src/xml/xmli18n-tmp.h:8159
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
+
+#: src/xml/xmli18n-tmp.h:8160
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
+
+#: src/xml/xmli18n-tmp.h:8161
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
+
+#: src/xml/xmli18n-tmp.h:8162
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
+
+#: src/xml/xmli18n-tmp.h:8163
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
+
+#: src/xml/xmli18n-tmp.h:8164
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
+
+#: src/xml/xmli18n-tmp.h:8165
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
+
+#: src/xml/xmli18n-tmp.h:8166
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
+
+#: src/xml/xmli18n-tmp.h:8167
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
+
+#: src/xml/xmli18n-tmp.h:8168
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
+
+#: src/xml/xmli18n-tmp.h:8169
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
+
+#: src/xml/xmli18n-tmp.h:8170
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
+
+#: src/xml/xmli18n-tmp.h:8171
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
+
+#: src/xml/xmli18n-tmp.h:8172
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
+
+#: src/xml/xmli18n-tmp.h:8173
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
+
+#: src/xml/xmli18n-tmp.h:8174
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
+
+#: src/xml/xmli18n-tmp.h:8175
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
+
+#: src/xml/xmli18n-tmp.h:8176
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
+
+#: src/xml/xmli18n-tmp.h:8177
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
+
+#: src/xml/xmli18n-tmp.h:8178
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
+
+#: src/xml/xmli18n-tmp.h:8179
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
+
+#: src/xml/xmli18n-tmp.h:8180
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
+
+#: src/xml/xmli18n-tmp.h:8181
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
+
+#: src/xml/xmli18n-tmp.h:8182
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
+
+#: src/xml/xmli18n-tmp.h:8183
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/xml/xmli18n-tmp.h:8184
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
+
+#: src/xml/xmli18n-tmp.h:8185
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
+
+#: src/xml/xmli18n-tmp.h:8186
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
+
+#: src/xml/xmli18n-tmp.h:8187
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
+
+#: src/xml/xmli18n-tmp.h:8188
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
+
+#: src/xml/xmli18n-tmp.h:8189
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
+
+#: src/xml/xmli18n-tmp.h:8190
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
+
+#: src/xml/xmli18n-tmp.h:8191
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
+
+#: src/xml/xmli18n-tmp.h:8192
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
+
+#: src/xml/xmli18n-tmp.h:8193
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
+
+#: src/xml/xmli18n-tmp.h:8194
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
+
+#: src/xml/xmli18n-tmp.h:8195
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
+
+#: src/xml/xmli18n-tmp.h:8196
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
+
+#: src/xml/xmli18n-tmp.h:8197
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
+
+#: src/xml/xmli18n-tmp.h:8198
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
+
+#: src/xml/xmli18n-tmp.h:8199
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
+
+#: src/xml/xmli18n-tmp.h:8200
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
+
+#: src/xml/xmli18n-tmp.h:8201
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
+
+#: src/xml/xmli18n-tmp.h:8202
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
+
+#: src/xml/xmli18n-tmp.h:8203
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
+
+#: src/xml/xmli18n-tmp.h:8204
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
+
+#: src/xml/xmli18n-tmp.h:8205
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
+
+#: src/xml/xmli18n-tmp.h:8206
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
+
+#: src/xml/xmli18n-tmp.h:8207
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
+
+#: src/xml/xmli18n-tmp.h:8208
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
+
+#: src/xml/xmli18n-tmp.h:8209
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
+
+#: src/xml/xmli18n-tmp.h:8210
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
+
+#: src/xml/xmli18n-tmp.h:8211
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
+
+#: src/xml/xmli18n-tmp.h:8212
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
+
+#: src/xml/xmli18n-tmp.h:8213
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
+
+#: src/xml/xmli18n-tmp.h:8214
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
+
+#: src/xml/xmli18n-tmp.h:8215
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
+
+#: src/xml/xmli18n-tmp.h:8216
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
+
+#: src/xml/xmli18n-tmp.h:8217
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
+
+#: src/xml/xmli18n-tmp.h:8218
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
+
+#: src/xml/xmli18n-tmp.h:8219
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
+
+#: src/xml/xmli18n-tmp.h:8220
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
+
+#: src/xml/xmli18n-tmp.h:8221
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
+
+#: src/xml/xmli18n-tmp.h:8222
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
+
+#: src/xml/xmli18n-tmp.h:8223
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
+
+#: src/xml/xmli18n-tmp.h:8224
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
+
+#: src/xml/xmli18n-tmp.h:8225
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
+
+#: src/xml/xmli18n-tmp.h:8226
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
+
+#: src/xml/xmli18n-tmp.h:8227
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
+
+#: src/xml/xmli18n-tmp.h:8228
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
+
+#: src/xml/xmli18n-tmp.h:8229
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
+
+#: src/xml/xmli18n-tmp.h:8230
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
+
+#: src/xml/xmli18n-tmp.h:8231
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
+
+#: src/xml/xmli18n-tmp.h:8232
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
+
+#: src/xml/xmli18n-tmp.h:8233
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
+
+#: src/xml/xmli18n-tmp.h:8234
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
+
+#: src/xml/xmli18n-tmp.h:8235
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
+
+#: src/xml/xmli18n-tmp.h:8236
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
+
+#: src/xml/xmli18n-tmp.h:8237
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
+
+#: src/xml/xmli18n-tmp.h:8238
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
+
+#: src/xml/xmli18n-tmp.h:8239
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8240
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8241
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
+
+#: src/xml/xmli18n-tmp.h:8242
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8243
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8244
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
+
+#: src/xml/xmli18n-tmp.h:8245
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8246
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8247
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
+
+#: src/xml/xmli18n-tmp.h:8248
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8249
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8250
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
+
+#: src/xml/xmli18n-tmp.h:8251
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
+
+#: src/xml/xmli18n-tmp.h:8252
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
+
+#: src/xml/xmli18n-tmp.h:8253
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
+
+#: src/xml/xmli18n-tmp.h:8254
+msgid "Oki B4350"
+msgstr "Oki B4350"
+
+#: src/xml/xmli18n-tmp.h:8255
+msgid "Oki OL400"
+msgstr "Oki OL400"
+
+#: src/xml/xmli18n-tmp.h:8256
+msgid "Oki OL400e"
+msgstr "Oki OL400e"
+
+#: src/xml/xmli18n-tmp.h:8257
+msgid "Oki OL400ex"
+msgstr "Oki OL400ex"
+
+#: src/xml/xmli18n-tmp.h:8258
+msgid "Oki OL410e"
+msgstr "Oki OL410e"
+
+#: src/xml/xmli18n-tmp.h:8259
+msgid "Oki OL600e"
+msgstr "Oki OL600e"
+
+#: src/xml/xmli18n-tmp.h:8260
+msgid "Oki OL610e/S"
+msgstr "Oki OL610e/S"
+
+#: src/xml/xmli18n-tmp.h:8261
+msgid "Oki OL800"
+msgstr "Oki OL800"
+
+#: src/xml/xmli18n-tmp.h:8262
+msgid "Oki OL810ex"
+msgstr "Oki OL810ex"
+
+#: src/xml/xmli18n-tmp.h:8263
+msgid "Oki Okipage 6e"
+msgstr "Oki Okipage 6e"
+
+#: src/xml/xmli18n-tmp.h:8264
+msgid "Oki Okipage 6ex"
+msgstr "Oki Okipage 6ex"
+
+#: src/xml/xmli18n-tmp.h:8265
+msgid "Oki Okipage 8p"
+msgstr "Oki Okipage 8p"
+
+#: src/xml/xmli18n-tmp.h:8266
+msgid "Oki Okipage 10e"
+msgstr "Oki Okipage 10e"
+
+#: src/xml/xmli18n-tmp.h:8267
+msgid "Oki Okipage 10ex"
+msgstr "Oki Okipage 10ex"
+
+#: src/xml/xmli18n-tmp.h:8268
+msgid "Oki Okipage 14ex"
+msgstr "Oki Okipage 14ex"
+
+#: src/xml/xmli18n-tmp.h:8269
+msgid "Oki Super 6e"
+msgstr "Oki Super 6e"
+
+#: src/xml/xmli18n-tmp.h:8270
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
+
+#: src/xml/xmli18n-tmp.h:8271
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
+
+#: src/xml/xmli18n-tmp.h:8272
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
+
+#: src/xml/xmli18n-tmp.h:8273
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
+
+#: src/xml/xmli18n-tmp.h:8274
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
+
+#: src/xml/xmli18n-tmp.h:8275
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
+
+#: src/xml/xmli18n-tmp.h:8276
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
+
+#: src/xml/xmli18n-tmp.h:8277
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
+
+#: src/xml/xmli18n-tmp.h:8278
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
+
+#: src/xml/xmli18n-tmp.h:8279
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
+
+#: src/xml/xmli18n-tmp.h:8280
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
+
+#: src/xml/xmli18n-tmp.h:8281
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
+
+#: src/xml/xmli18n-tmp.h:8282
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
+
+#: src/xml/xmli18n-tmp.h:8283
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
+
+#: src/xml/xmli18n-tmp.h:8284
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
+
+#: src/xml/xmli18n-tmp.h:8285
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
+
+#: src/xml/xmli18n-tmp.h:8286
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
+
+#: src/xml/xmli18n-tmp.h:8287
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
+
+#: src/xml/xmli18n-tmp.h:8288
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
+
+#: src/xml/xmli18n-tmp.h:8289
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
+
+#: src/xml/xmli18n-tmp.h:8290
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
+
+#: src/xml/xmli18n-tmp.h:8291
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
+
+#: src/xml/xmli18n-tmp.h:8292
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
+
+#: src/xml/xmli18n-tmp.h:8293
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
+
+#: src/xml/xmli18n-tmp.h:8294
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
+
+#: src/xml/xmli18n-tmp.h:8295
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
+
+#: src/xml/xmli18n-tmp.h:8296
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
+
+#: src/xml/xmli18n-tmp.h:8297
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
+
+#: src/xml/xmli18n-tmp.h:8298
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
+
+#: src/xml/xmli18n-tmp.h:8299
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
+
+#: src/xml/xmli18n-tmp.h:8300
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
+
+#: src/xml/xmli18n-tmp.h:8301
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
+
+#: src/xml/xmli18n-tmp.h:8302
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
+
+#: src/xml/xmli18n-tmp.h:8303
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
+
+#: src/xml/xmli18n-tmp.h:8304
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
+
+#: src/xml/xmli18n-tmp.h:8305
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
+
+#: src/xml/xmli18n-tmp.h:8306
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
+
+#: src/xml/xmli18n-tmp.h:8307
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
+
+#: src/xml/xmli18n-tmp.h:8308
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
+
+#: src/xml/xmli18n-tmp.h:8309
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
+
+#: src/xml/xmli18n-tmp.h:8310
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
+
+#: src/xml/xmli18n-tmp.h:8311
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
+
+#: src/xml/xmli18n-tmp.h:8312
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
+
+#: src/xml/xmli18n-tmp.h:8313
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
+
+#: src/xml/xmli18n-tmp.h:8314
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
+
+#: src/xml/xmli18n-tmp.h:8315
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
+
+#: src/xml/xmli18n-tmp.h:8316
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
+
+#: src/xml/xmli18n-tmp.h:8317
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
+
+#: src/xml/xmli18n-tmp.h:8318
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
+
+#: src/xml/xmli18n-tmp.h:8319
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:8320
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
+
+#: src/xml/xmli18n-tmp.h:8321
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
+
+#: src/xml/xmli18n-tmp.h:8322
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:8323
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
+
+#: src/xml/xmli18n-tmp.h:8324
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
+
+#: src/xml/xmli18n-tmp.h:8325
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:8326
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
+
+#: src/xml/xmli18n-tmp.h:8327
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
+
+#: src/xml/xmli18n-tmp.h:8328
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:8329
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
+
+#: src/xml/xmli18n-tmp.h:8330
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
+
+#: src/xml/xmli18n-tmp.h:8331
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
+
+#: src/xml/xmli18n-tmp.h:8332
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
+
+#: src/xml/xmli18n-tmp.h:8333
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:8334
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
+
+#: src/xml/xmli18n-tmp.h:8335
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
+
+#: src/xml/xmli18n-tmp.h:8336
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
+
+#: src/xml/xmli18n-tmp.h:8337
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
+
+#: src/xml/xmli18n-tmp.h:8338
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
+
+#: src/xml/xmli18n-tmp.h:8339
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
+
+#: src/xml/xmli18n-tmp.h:8340
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
+
+#: src/xml/xmli18n-tmp.h:8341
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
+
+#: src/xml/xmli18n-tmp.h:8342
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
+
+#: src/xml/xmli18n-tmp.h:8343
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
+
+#: src/xml/xmli18n-tmp.h:8344
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
+
+#: src/xml/xmli18n-tmp.h:8345
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
+
+#: src/xml/xmli18n-tmp.h:8346
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
+
+#: src/xml/xmli18n-tmp.h:8347
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
+
+#: src/xml/xmli18n-tmp.h:8348
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
+
+#: src/xml/xmli18n-tmp.h:8349
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
+
+#: src/xml/xmli18n-tmp.h:8350
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:8351
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
+
+#: src/xml/xmli18n-tmp.h:8352
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
+
+#: src/xml/xmli18n-tmp.h:8353
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:8354
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
+
+#: src/xml/xmli18n-tmp.h:8355
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
+
+#: src/xml/xmli18n-tmp.h:8356
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
+
+#: src/xml/xmli18n-tmp.h:8357
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:8358
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
+
+#: src/xml/xmli18n-tmp.h:8359
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
+
+#: src/xml/xmli18n-tmp.h:8360
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/xml/xmli18n-tmp.h:8361
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:8362
+msgid "Savin 2522"
+msgstr "Savin 2522"
+
+#: src/xml/xmli18n-tmp.h:8363
+msgid "Savin 2527"
+msgstr "Savin 2527"
+
+#: src/xml/xmli18n-tmp.h:8364
+msgid "Savin 2532"
+msgstr "Savin 2532"
+
+#: src/xml/xmli18n-tmp.h:8365
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
+
+#: src/xml/xmli18n-tmp.h:8366
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
+
+#: src/xml/xmli18n-tmp.h:8367
+msgid "Savin 2560"
+msgstr "Savin 2560"
+
+#: src/xml/xmli18n-tmp.h:8368
+msgid "Savin 2575"
+msgstr "Savin 2575"
+
+#: src/xml/xmli18n-tmp.h:8369
+msgid "Savin 3515"
+msgstr "Savin 3515"
+
+#: src/xml/xmli18n-tmp.h:8370
+msgid "Savin 40105"
+msgstr "Savin 40105"
+
+#: src/xml/xmli18n-tmp.h:8371
+msgid "Savin 4015"
+msgstr "Savin 4015"
+
+#: src/xml/xmli18n-tmp.h:8372
+msgid "Savin 4018"
+msgstr "Savin 4018"
+
+#: src/xml/xmli18n-tmp.h:8373
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
+
+#: src/xml/xmli18n-tmp.h:8374
+msgid "Savin 4022"
+msgstr "Savin 4022"
+
+#: src/xml/xmli18n-tmp.h:8375
+msgid "Savin 4027"
+msgstr "Savin 4027"
+
+#: src/xml/xmli18n-tmp.h:8376
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
+
+#: src/xml/xmli18n-tmp.h:8377
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
+
+#: src/xml/xmli18n-tmp.h:8378
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
+
+#: src/xml/xmli18n-tmp.h:8379
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
+
+#: src/xml/xmli18n-tmp.h:8380
+msgid "Savin 4051"
+msgstr "Savin 4051"
+
+#: src/xml/xmli18n-tmp.h:8381
+msgid "Savin 4060"
+msgstr "Savin 4060"
+
+#: src/xml/xmli18n-tmp.h:8382
+msgid "Savin 4075"
+msgstr "Savin 4075"
+
+#: src/xml/xmli18n-tmp.h:8383
+msgid "Savin 4090"
+msgstr "Savin 4090"
+
+#: src/xml/xmli18n-tmp.h:8384
+msgid "Savin 7025"
+msgstr "Savin 7025"
+
+#: src/xml/xmli18n-tmp.h:8385
+msgid "Savin 8016"
+msgstr "Savin 8016"
+
+#: src/xml/xmli18n-tmp.h:8386
+msgid "Savin 8020"
+msgstr "Savin 8020"
+
+#: src/xml/xmli18n-tmp.h:8387
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
+
+#: src/xml/xmli18n-tmp.h:8388
+msgid "Savin 8025"
+msgstr "Savin 8025"
+
+#: src/xml/xmli18n-tmp.h:8389
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
+
+#: src/xml/xmli18n-tmp.h:8390
+msgid "Savin 8030"
+msgstr "Savin 8030"
+
+#: src/xml/xmli18n-tmp.h:8391
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
+
+#: src/xml/xmli18n-tmp.h:8392
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
+
+#: src/xml/xmli18n-tmp.h:8393
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
+
+#: src/xml/xmli18n-tmp.h:8394
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
+
+#: src/xml/xmli18n-tmp.h:8395
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
+
+#: src/xml/xmli18n-tmp.h:8396
+msgid "Savin 8055"
+msgstr "Savin 8055"
+
+#: src/xml/xmli18n-tmp.h:8397
+msgid "Savin 8065"
+msgstr "Savin 8065"
+
+#: src/xml/xmli18n-tmp.h:8398
+msgid "Savin 8075"
+msgstr "Savin 8075"
+
+#: src/xml/xmli18n-tmp.h:8399
+msgid "Savin 8090"
+msgstr "Savin 8090"
+
+#: src/xml/xmli18n-tmp.h:8400
+msgid "Savin 8110"
+msgstr "Savin 8110"
+
+#: src/xml/xmli18n-tmp.h:8401
+msgid "Savin 8135"
+msgstr "Savin 8135"
+
+#: src/xml/xmli18n-tmp.h:8402
+msgid "Savin 816"
+msgstr "Savin 816"
+
+#: src/xml/xmli18n-tmp.h:8403
+msgid "Savin 9016"
+msgstr "Savin 9016"
+
+#: src/xml/xmli18n-tmp.h:8404
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
+
+#: src/xml/xmli18n-tmp.h:8405
+msgid "Savin 9025"
+msgstr "Savin 9025"
+
+#: src/xml/xmli18n-tmp.h:8406
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
+
+#: src/xml/xmli18n-tmp.h:8407
+msgid "Savin 9033"
+msgstr "Savin 9033"
+
+#: src/xml/xmli18n-tmp.h:8408
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
+
+#: src/xml/xmli18n-tmp.h:8409
+msgid "Savin 9040"
+msgstr "Savin 9040"
+
+#: src/xml/xmli18n-tmp.h:8410
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
+
+#: src/xml/xmli18n-tmp.h:8411
+msgid "Savin 9050"
+msgstr "Savin 9050"
+
+#: src/xml/xmli18n-tmp.h:8412
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
+
+#: src/xml/xmli18n-tmp.h:8413
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
+
+#: src/xml/xmli18n-tmp.h:8414
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
+
+#: src/xml/xmli18n-tmp.h:8415
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
+
+#: src/xml/xmli18n-tmp.h:8416
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
+
+#: src/xml/xmli18n-tmp.h:8417
+msgid "Star LS-04"
+msgstr "Star LS-04"
+
+#: src/xml/xmli18n-tmp.h:8418
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
+
+#: src/xml/xmli18n-tmp.h:8419
+msgid "Tally MT908"
+msgstr "Tally MT908"
+
+#: src/xml/xmli18n-tmp.h:8420
+msgid "Tektronix Phaser 750DP"
+msgstr "Tektronix Phaser 750DP"
+
+#: src/xml/xmli18n-tmp.h:8421
+msgid "Tektronix Phaser 750DX"
+msgstr "Tektronix Phaser 750DX"
+
+#: src/xml/xmli18n-tmp.h:8422
+msgid "Tektronix Phaser 750N"
+msgstr "Tektronix Phaser 750N"
+
+#: src/xml/xmli18n-tmp.h:8423
+msgid "Tektronix Phaser 750P"
+msgstr "Tektronix Phaser 750P"
+
+#: src/xml/xmli18n-tmp.h:8424
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
+
+#: src/xml/xmli18n-tmp.h:8425
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
+
+#: src/xml/xmli18n-tmp.h:8426
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
+
+#: src/xml/xmli18n-tmp.h:8427
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
+
+#: src/xml/xmli18n-tmp.h:8428
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
+
+#: src/xml/xmli18n-tmp.h:8429
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
+
+#: src/xml/xmli18n-tmp.h:8430
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
+
+#: src/xml/xmli18n-tmp.h:8431
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
+
+#: src/xml/xmli18n-tmp.h:8432
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
+
+#: src/xml/xmli18n-tmp.h:8433
+msgid "Xerox Phaser 2135"
+msgstr "Xerox Phaser 2135"
+
+#: src/xml/xmli18n-tmp.h:8434
+msgid "Xerox Phaser 4400B"
+msgstr "Xerox Phaser 4400B"
+
+#: src/xml/xmli18n-tmp.h:8435
+msgid "Xerox Phaser 4400DT"
+msgstr "Xerox Phaser 4400DT"
+
+#: src/xml/xmli18n-tmp.h:8436
+msgid "Xerox Phaser 4400DX"
+msgstr "Xerox Phaser 4400DX"
+
+#: src/xml/xmli18n-tmp.h:8437
+msgid "Xerox Phaser 4400N"
+msgstr "Xerox Phaser 4400N"
+
+#: src/xml/xmli18n-tmp.h:8438
+msgid "Xerox Phaser 4500B"
+msgstr "Xerox Phaser 4500B"
+
+#: src/xml/xmli18n-tmp.h:8439
+msgid "Xerox Phaser 4500DT"
+msgstr "Xerox Phaser 4500DT"
+
+#: src/xml/xmli18n-tmp.h:8440
+msgid "Xerox Phaser 4500DX"
+msgstr "Xerox Phaser 4500DX"
+
+#: src/xml/xmli18n-tmp.h:8441
+msgid "Xerox Phaser 4500N"
+msgstr "Xerox Phaser 4500N"
+
+#: src/xml/xmli18n-tmp.h:8442
+msgid "Xerox Phaser 4510B"
+msgstr "Xerox Phaser 4510B"
+
+#: src/xml/xmli18n-tmp.h:8443
+msgid "Xerox Phaser 4510DT"
+msgstr "Xerox Phaser 4510DT"
+
+#: src/xml/xmli18n-tmp.h:8444
+msgid "Xerox Phaser 4510DX"
+msgstr "Xerox Phaser 4510DX"
+
+#: src/xml/xmli18n-tmp.h:8445
+msgid "Xerox Phaser 4510N"
+msgstr "Xerox Phaser 4510N"
+
+#: src/xml/xmli18n-tmp.h:8446
+msgid "Xerox Phaser 5500B"
+msgstr "Xerox Phaser 5500B"
+
+#: src/xml/xmli18n-tmp.h:8447
+msgid "Xerox Phaser 5500DN"
+msgstr "Xerox Phaser 5500DN"
+
+#: src/xml/xmli18n-tmp.h:8448
+msgid "Xerox Phaser 5500DT"
+msgstr "Xerox Phaser 5500DT"
+
+#: src/xml/xmli18n-tmp.h:8449
+msgid "Xerox Phaser 5500DX"
+msgstr "Xerox Phaser 5500DX"
+
+#: src/xml/xmli18n-tmp.h:8450
+msgid "Xerox Phaser 5500N"
+msgstr "Xerox Phaser 5500N"
+
+#: src/xml/xmli18n-tmp.h:8451
+msgid "Xerox Phaser 6130N"
+msgstr "Xerox Phaser 6130N"
+
+#: src/xml/xmli18n-tmp.h:8452
+msgid "Xerox Phaser 6180DN"
+msgstr "Xerox Phaser 6180DN"
+
+#: src/xml/xmli18n-tmp.h:8453
+msgid "Xerox Phaser 6180MFP-D"
+msgstr "Xerox Phaser 6180MFP-D"
+
+#: src/xml/xmli18n-tmp.h:8454
+msgid "Xerox Phaser 6200B"
+msgstr "Xerox Phaser 6200B"
+
+#: src/xml/xmli18n-tmp.h:8455
+msgid "Xerox Phaser 6200DP"
+msgstr "Xerox Phaser 6200DP"
+
+#: src/xml/xmli18n-tmp.h:8456
+msgid "Xerox Phaser 6200DX"
+msgstr "Xerox Phaser 6200DX"
+
+#: src/xml/xmli18n-tmp.h:8457
+msgid "Xerox Phaser 6200N"
+msgstr "Xerox Phaser 6200N"
+
+#: src/xml/xmli18n-tmp.h:8458
+msgid "Xerox Phaser 6250B"
+msgstr "Xerox Phaser 6250B"
+
+#: src/xml/xmli18n-tmp.h:8459
+msgid "Xerox Phaser 6250DP"
+msgstr "Xerox Phaser 6250DP"
+
+#: src/xml/xmli18n-tmp.h:8460
+msgid "Xerox Phaser 6250DT"
+msgstr "Xerox Phaser 6250DT"
+
+#: src/xml/xmli18n-tmp.h:8461
+msgid "Xerox Phaser 6250DX"
+msgstr "Xerox Phaser 6250DX"
+
+#: src/xml/xmli18n-tmp.h:8462
+msgid "Xerox Phaser 6250N"
+msgstr "Xerox Phaser 6250N"
+
+#: src/xml/xmli18n-tmp.h:8463
+msgid "Xerox Phaser 6300DN"
+msgstr "Xerox Phaser 6300DN"
+
+#: src/xml/xmli18n-tmp.h:8464
+msgid "Xerox Phaser 6300N"
+msgstr "Xerox Phaser 6300N"
+
+#: src/xml/xmli18n-tmp.h:8465
+msgid "Xerox Phaser 6350DP"
+msgstr "Xerox Phaser 6350DP"
+
+#: src/xml/xmli18n-tmp.h:8466
+msgid "Xerox Phaser 6350DT"
+msgstr "Xerox Phaser 6350DT"
+
+#: src/xml/xmli18n-tmp.h:8467
+msgid "Xerox Phaser 6350DX"
+msgstr "Xerox Phaser 6350DX"
+
+#: src/xml/xmli18n-tmp.h:8468
+msgid "Xerox Phaser 6360DN"
+msgstr "Xerox Phaser 6360DN"
+
+#: src/xml/xmli18n-tmp.h:8469
+msgid "Xerox Phaser 6360DX"
+msgstr "Xerox Phaser 6360DX"
+
+#: src/xml/xmli18n-tmp.h:8470
+msgid "Xerox Phaser 7300B"
+msgstr "Xerox Phaser 7300B"
+
+#: src/xml/xmli18n-tmp.h:8471
+msgid "Xerox Phaser 7300DN"
+msgstr "Xerox Phaser 7300DN"
+
+#: src/xml/xmli18n-tmp.h:8472
+msgid "Xerox Phaser 7300DT"
+msgstr "Xerox Phaser 7300DT"
+
+#: src/xml/xmli18n-tmp.h:8473
+msgid "Xerox Phaser 7300DX"
+msgstr "Xerox Phaser 7300DX"
+
+#: src/xml/xmli18n-tmp.h:8474
+msgid "Xerox Phaser 7300N"
+msgstr "Xerox Phaser 7300N"
+
+#: src/xml/xmli18n-tmp.h:8475
+msgid "Xerox Phaser 7400DN"
+msgstr "Xerox Phaser 7400DN"
+
+#: src/xml/xmli18n-tmp.h:8476
+msgid "Xerox Phaser 7400DT"
+msgstr "Xerox Phaser 7400DT"
+
+#: src/xml/xmli18n-tmp.h:8477
+msgid "Xerox Phaser 7400DX"
+msgstr "Xerox Phaser 7400DX"
+
+#: src/xml/xmli18n-tmp.h:8478
+msgid "Xerox Phaser 7400DXF"
+msgstr "Xerox Phaser 7400DXF"
+
+#: src/xml/xmli18n-tmp.h:8479
+msgid "Xerox Phaser 7400N"
+msgstr "Xerox Phaser 7400N"
+
+#: src/xml/xmli18n-tmp.h:8480
+msgid "Xerox Phaser 7700DN"
+msgstr "Xerox Phaser 7700DN"
+
+#: src/xml/xmli18n-tmp.h:8481
+msgid "Xerox Phaser 7700DX"
+msgstr "Xerox Phaser 7700DX"
+
+#: src/xml/xmli18n-tmp.h:8482
+msgid "Xerox Phaser 7700GX"
+msgstr "Xerox Phaser 7700GX"
+
+#: src/xml/xmli18n-tmp.h:8483
+msgid "Xerox Phaser 7750B"
+msgstr "Xerox Phaser 7750B"
+
+#: src/xml/xmli18n-tmp.h:8484
+msgid "Xerox Phaser 7750DN"
+msgstr "Xerox Phaser 7750DN"
+
+#: src/xml/xmli18n-tmp.h:8485
+msgid "Xerox Phaser 7750DXF"
+msgstr "Xerox Phaser 7750DXF"
+
+#: src/xml/xmli18n-tmp.h:8486
+msgid "Xerox Phaser 7750GX"
+msgstr "Xerox Phaser 7750GX"
+
+#: src/xml/xmli18n-tmp.h:8487
+msgid "Xerox Phaser 7760DN"
+msgstr "Xerox Phaser 7760DN"
+
+#: src/xml/xmli18n-tmp.h:8488
+msgid "Xerox Phaser 7760DX"
+msgstr "Xerox Phaser 7760DX"
+
+#: src/xml/xmli18n-tmp.h:8489
+msgid "Xerox Phaser 7760GX"
+msgstr "Xerox Phaser 7760GX"
+
+#: src/xml/xmli18n-tmp.h:8490
+msgid "Xerox Phaser 8400B"
+msgstr "Xerox Phaser 8400B"
+
+#: src/xml/xmli18n-tmp.h:8491
+msgid "Xerox Phaser 8400BD"
+msgstr "Xerox Phaser 8400BD"
+
+#: src/xml/xmli18n-tmp.h:8492
+msgid "Xerox Phaser 8400DP"
+msgstr "Xerox Phaser 8400DP"
+
+#: src/xml/xmli18n-tmp.h:8493
+msgid "Xerox Phaser 8400DX"
+msgstr "Xerox Phaser 8400DX"
+
+#: src/xml/xmli18n-tmp.h:8494
+msgid "Xerox Phaser 8400N"
+msgstr "Xerox Phaser 8400N"
+
+#: src/xml/xmli18n-tmp.h:8495
+msgid "Xerox Phaser 8500DN"
+msgstr "Xerox Phaser 8500DN"
+
+#: src/xml/xmli18n-tmp.h:8496
+msgid "Xerox Phaser 8500N"
+msgstr "Xerox Phaser 8500N"
+
+#: src/xml/xmli18n-tmp.h:8497
+msgid "Xerox Phaser 8550DP"
+msgstr "Xerox Phaser 8550DP"
+
+#: src/xml/xmli18n-tmp.h:8498
+msgid "Xerox Phaser 8550DT"
+msgstr "Xerox Phaser 8550DT"
+
+#: src/xml/xmli18n-tmp.h:8499
+msgid "Xerox Phaser 8550DX"
+msgstr "Xerox Phaser 8550DX"
+
+#: src/xml/xmli18n-tmp.h:8500
+msgid "Xerox Phaser 8560DN"
+msgstr "Xerox Phaser 8560DN"
+
+#: src/xml/xmli18n-tmp.h:8501
+msgid "Xerox WorkCentre 7345"
+msgstr "Xerox WorkCentre 7345"
+
+#: src/xml/xmli18n-tmp.h:8502
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
+
+#: src/xml/xmli18n-tmp.h:8503
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
+
+#: src/xml/xmli18n-tmp.h:8504
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
+
+#: src/xml/xmli18n-tmp.h:8505
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
+
+#: src/xml/xmli18n-tmp.h:8506
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
+
+#: src/xml/xmli18n-tmp.h:8507
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
+
+#: src/xml/xmli18n-tmp.h:8508
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/xml/xmli18n-tmp.h:8509
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
+
+#: src/xml/xmli18n-tmp.h:8510
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
+
+#: src/xml/xmli18n-tmp.h:8511
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
+
+#: src/xml/xmli18n-tmp.h:8512
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
+
+#: src/xml/xmli18n-tmp.h:8513
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
+
+#: src/xml/xmli18n-tmp.h:8514
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
+
+#: src/xml/xmli18n-tmp.h:8515
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
+
+#: src/xml/xmli18n-tmp.h:8516
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
+
+#: src/xml/xmli18n-tmp.h:8517
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
+
+#: src/xml/xmli18n-tmp.h:8518
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
+
+#: src/xml/xmli18n-tmp.h:8519
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
+
+#: src/xml/xmli18n-tmp.h:8520
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
+
+#: src/xml/xmli18n-tmp.h:8521
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:8522
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
+
+#: src/xml/xmli18n-tmp.h:8523
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
+
+#: src/xml/xmli18n-tmp.h:8524
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:8525
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
+
+#: src/xml/xmli18n-tmp.h:8526
+#, fuzzy
+msgid "Canon SELPHY-CP400"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:8527
+#, fuzzy
+msgid "Canon SELPHY-CP500"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:8528
+#, fuzzy
+msgid "Canon SELPHY-CP510"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:8529
+#, fuzzy
+msgid "Canon SELPHY-CP520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:8530
+#, fuzzy
+msgid "Canon SELPHY-CP530"
+msgstr "Canon SELPHY-CP-530"
+
+#: src/xml/xmli18n-tmp.h:8531
+#, fuzzy
+msgid "Canon SELPHY-CP710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8532
+#, fuzzy
+msgid "Canon SELPHY-CP730"
+msgstr "Canon SELPHY-CP-730"
+
+#: src/xml/xmli18n-tmp.h:8533
+#, fuzzy
+msgid "Canon SELPHY-CP740"
+msgstr "Canon SELPHY-CP-740"
+
+#: src/xml/xmli18n-tmp.h:8534
+#, fuzzy
+msgid "Canon SELPHY-CP750"
+msgstr "Canon SELPHY-CP-750"
+
+#: src/xml/xmli18n-tmp.h:8535
+#, fuzzy
+msgid "Canon SELPHY-CP760"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8537
+#, fuzzy
+msgid "Canon SELPHY-CP790"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:8538
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
+
+#: src/xml/xmli18n-tmp.h:8539
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
+
+#: src/xml/xmli18n-tmp.h:8540
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
+
+#: src/xml/xmli18n-tmp.h:8541
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
+
+#: src/xml/xmli18n-tmp.h:8542
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
+
+#: src/xml/xmli18n-tmp.h:8543
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/xml/xmli18n-tmp.h:8544
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
+
+#: src/xml/xmli18n-tmp.h:8545
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
+
+#: src/xml/xmli18n-tmp.h:8546
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-Dock"
+
+#: src/xml/xmli18n-tmp.h:8547
+msgid "Kodak EasyShare-G600-Printer-Dock"
+msgstr "Kodak EasyShare-G600-Printer-Dock"
+
+#: src/xml/xmli18n-tmp.h:8548
+msgid "Kodak PD-4000"
+msgstr "Kodak PD-4000"
+
+#: src/xml/xmli18n-tmp.h:8549
+msgid "Kodak PD-6000"
+msgstr "Kodak PD-6000"
+
+#: src/xml/xmli18n-tmp.h:8550
+msgid "Kodak Photo-Printer"
+msgstr "Kodak Photo-Printer"
+
+#: src/xml/xmli18n-tmp.h:8551
+msgid "Kodak Photo-Printer-500"
+msgstr "Kodak Photo-Printer-500"
+
+#: src/xml/xmli18n-tmp.h:8552
+msgid "Kodak Printer-Dock-Plus"
+msgstr "Kodak Printer-Dock-Plus"
+
+#: src/xml/xmli18n-tmp.h:8553
+msgid "Kodak Printer-Dock-Plus-S3"
+msgstr "Kodak Printer-Dock-Plus-S3"
+
+#: src/xml/xmli18n-tmp.h:8554
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
+
+#: src/xml/xmli18n-tmp.h:8555
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:8556
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:8557
+msgid "RAW DATA 16 bit"
+msgstr "RAW DATA 16 бітів"
+
+#: src/xml/xmli18n-tmp.h:8558
+msgid "RAW DATA 8 bit"
+msgstr "RAW DATA 8 бітів"
+
+#, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon i865"
+
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon SELPHY-CP-600"
+
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon SELPHY-CP-720"
+
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon SELPHY-CP-800"
+
+#~ msgid "Canon SELPHY ES2"
+#~ msgstr "Canon SELPHY ES2"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
new file mode 100644
index 0000000..c5133d8
--- /dev/null
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..07643d5
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,14693 @@
+# Chinese (simplified) translation for gutenprint.
+# Copyright (C) 2011 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.
+# Wylmer Wang <wantinghard@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gutenprint 20110308\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-06-04 22:38-0400\n"
+"PO-Revision-Date: 2011-12-20 11:15+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/main/dither-main.c:44 src/main/print-color.c:49
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
+msgid "Default"
+msgstr "默认"
+
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
+#: src/main/dither-main.c:47
+msgid "EvenTone"
+msgstr ""
+
+#: src/main/dither-main.c:48
+msgid "Hybrid EvenTone"
+msgstr ""
+
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
+msgid "EvenBetter"
+msgstr ""
+
+#: src/main/dither-main.c:54
+msgid "Hybrid EvenBetter"
+msgstr ""
+
+#: src/main/dither-main.c:60
+msgid "UniTone"
+msgstr ""
+
+#: src/main/dither-main.c:61
+msgid "Hybrid UniTone"
+msgstr ""
+
+#: 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
+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: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: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:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
+#: src/main/print-pcl.c:1346 src/main/print-ps.c:74
+msgid "Page Size"
+msgstr "页�尺寸"
+
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
+#: src/main/print-pcl.c:1347 src/main/print-ps.c:75
+msgid "Size of the paper being printed to"
+msgstr "打�纸张的尺寸"
+
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
+msgid "Media Type"
+msgstr "媒质类型"
+
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
+#: src/main/print-pcl.c:1353
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr "媒质类型(普通纸�相片纸等)"
+
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
+msgid "Media Source"
+msgstr "媒质��"
+
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
+#: src/main/print-pcl.c:1359
+msgid "Source (input slot) of the media"
+msgstr "媒质��(进纸槽)"
+
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
+msgid "CD Hub Size"
+msgstr ""
+
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
+msgid "CD Size (Custom)"
+msgstr "CD 尺寸(自定义)"
+
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
+msgid "CD Hub Size (Custom)"
+msgstr ""
+
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr ""
+
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
+#: src/main/print-escp2.c:211 src/main/print-escp2.c:217
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
+msgid "Resolution"
+msgstr "分辨率"
+
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
+msgid "Resolution and quality of the print"
+msgstr ""
+
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
+#: src/main/print-pcl.c:1376 src/main/print-raw.c:80
+msgid "Ink Type"
+msgstr ""
+
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
+#: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
+#: src/main/print-raw.c:81
+msgid "Type of ink in the printer"
+msgstr ""
+
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
+#: src/main/print-escp2.c:323 src/main/print-escp2.c:324
+#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
+#: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
+msgid "Ink Channels"
+msgstr ""
+
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
+#: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
+msgid "Printing Mode"
+msgstr "打�模�"
+
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
+#: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
+msgid "Printing Output Mode"
+msgstr "打�输出模�"
+
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr ""
+
+#: src/main/print-canon.c:307
+msgid "Type of inkset in the printer"
+msgstr ""
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
+#: src/main/print-pcl.c:1394
+msgid "Double-Sided Printing"
+msgstr "��打�"
+
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
+#: src/main/print-pcl.c:1395
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
+#: src/main/print-escp2.c:162 src/main/print-escp2.c:163
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "打�质�"
+
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
+msgid "Cyan Density"
+msgstr ""
+
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
+msgid "Adjust the cyan density"
+msgstr ""
+
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
+msgid "Magenta Density"
+msgstr ""
+
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
+msgid "Adjust the magenta density"
+msgstr ""
+
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
+msgid "Yellow Density"
+msgstr ""
+
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
+msgid "Adjust the yellow density"
+msgstr ""
+
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
+msgid "Black Density"
+msgstr ""
+
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
+msgid "Adjust the black density"
+msgstr ""
+
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
+#: src/main/print-escp2.c:550 src/main/print-escp2.c:551
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
+#: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
+msgid "Light Cyan Transition"
+msgstr ""
+
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
+#: src/main/print-escp2.c:582 src/main/print-escp2.c:583
+#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
+#: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
+msgid "Light Magenta Transition"
+msgstr ""
+
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
+msgid "Light Yellow Transition"
+msgstr ""
+
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
+msgid "Off"
+msgstr "å…³"
+
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
+#: src/main/print-pcl.c:1684
+msgid "Long Edge (Standard)"
+msgstr "长边(标准)"
+
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
+#, fuzzy
+msgid "Short Edge (Flip)"
+msgstr "短边(翻转)"
+
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
+msgid "CD - 5 inch"
+msgstr "CD - 5 英寸"
+
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
+msgid "CD - 3 inch"
+msgstr "CD - 3 英寸"
+
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
+msgid "CD - Custom"
+msgstr "CD - 自定义"
+
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
+msgid "Normal"
+msgstr "正常"
+
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
+msgid "Print To Hub"
+msgstr ""
+
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
+msgid "Black and White"
+msgstr "黑白"
+
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr ""
+
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
+#: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
+#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
+#: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
+#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
+#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2706 src/xml/xmli18n-tmp.h:2721
+#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2747
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2771
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2799
+#: src/xml/xmli18n-tmp.h:2811 src/xml/xmli18n-tmp.h:2823
+#: src/xml/xmli18n-tmp.h:2836 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2863 src/xml/xmli18n-tmp.h:2874
+#: src/xml/xmli18n-tmp.h:2888 src/xml/xmli18n-tmp.h:2902
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2928
+#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:2969 src/xml/xmli18n-tmp.h:2982
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3008
+#: 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:3077 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3176 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3226
+#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3253
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3309
+#: src/xml/xmli18n-tmp.h:3321 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:3382
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3588 src/xml/xmli18n-tmp.h:3600
+#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3652
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3701 src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:3749 src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
+msgid "Black"
+msgstr "黑"
+
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr ""
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "手动控制"
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+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:1269 src/cups/genppd.c:2361
+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:1300 src/cups/genppd.c:2368
+msgid "CMYK"
+msgstr "CMYK"
+
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
+msgid "KCMY"
+msgstr "KCMY"
+
+#: src/main/print-color.c:165 src/main/print-color.c:454
+msgid "Channel "
+msgstr ""
+
+#: src/main/print-color.c:166
+msgid "Gamma for raw channel "
+msgstr ""
+
+#: src/main/print-color.c:176
+msgid "Color Correction"
+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:347
+msgid "Raw Channels"
+msgstr ""
+
+#: 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 ""
+
+#: src/main/print-color.c:240
+msgid "Linear Contrast Adjustment"
+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:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
+#: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
+#: src/xml/xmli18n-tmp.h:2675 src/xml/xmli18n-tmp.h:2691
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2722
+#: src/xml/xmli18n-tmp.h:2735 src/xml/xmli18n-tmp.h:2748
+#: src/xml/xmli18n-tmp.h:2760 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2800
+#: src/xml/xmli18n-tmp.h:2812 src/xml/xmli18n-tmp.h:2824
+#: src/xml/xmli18n-tmp.h:2837 src/xml/xmli18n-tmp.h:2849
+#: src/xml/xmli18n-tmp.h:2864 src/xml/xmli18n-tmp.h:2875
+#: src/xml/xmli18n-tmp.h:2889 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:2929
+#: src/xml/xmli18n-tmp.h:2943 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:2970 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3009
+#: 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:3078 src/xml/xmli18n-tmp.h:3093
+#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3165
+#: src/xml/xmli18n-tmp.h:3177 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3322
+#: 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:3383 src/xml/xmli18n-tmp.h:3396
+#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3426
+#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3456
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3576
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3601
+#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:3641 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3687
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:3731 src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
+msgid "Cyan"
+msgstr ""
+
+#: 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:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2692
+#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2723
+#: src/xml/xmli18n-tmp.h:2736 src/xml/xmli18n-tmp.h:2749
+#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2773
+#: src/xml/xmli18n-tmp.h:2787 src/xml/xmli18n-tmp.h:2801
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2825
+#: src/xml/xmli18n-tmp.h:2838 src/xml/xmli18n-tmp.h:2850
+#: src/xml/xmli18n-tmp.h:2865 src/xml/xmli18n-tmp.h:2876
+#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2904
+#: src/xml/xmli18n-tmp.h:2917 src/xml/xmli18n-tmp.h:2930
+#: src/xml/xmli18n-tmp.h:2944 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3064
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3094
+#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3130 src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3166
+#: src/xml/xmli18n-tmp.h:3178 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3216
+#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3255 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3283 src/xml/xmli18n-tmp.h:3296
+#: src/xml/xmli18n-tmp.h:3311 src/xml/xmli18n-tmp.h:3323
+#: 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:3384 src/xml/xmli18n-tmp.h:3397
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3425
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3457
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3487
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3520
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:3590 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3627
+#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3669 src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3730 src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:3757 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3927 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
+msgid "Magenta"
+msgstr ""
+
+#: 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:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
+#: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
+#: src/xml/xmli18n-tmp.h:2677 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2774
+#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2802
+#: src/xml/xmli18n-tmp.h:2814 src/xml/xmli18n-tmp.h:2826
+#: src/xml/xmli18n-tmp.h:2839 src/xml/xmli18n-tmp.h:2851
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2877
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2905
+#: src/xml/xmli18n-tmp.h:2918 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3095
+#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3118
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3179 src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3284 src/xml/xmli18n-tmp.h:3297
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:3336 src/xml/xmli18n-tmp.h:3349
+#: src/xml/xmli18n-tmp.h:3361 src/xml/xmli18n-tmp.h:3373
+#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3398
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3424
+#: src/xml/xmli18n-tmp.h:3444 src/xml/xmli18n-tmp.h:3458
+#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3486
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3522
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3615 src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3655
+#: src/xml/xmli18n-tmp.h:3665 src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:3704 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3732 src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3849 src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:3875 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
+msgid "Yellow"
+msgstr ""
+
+#: 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:1052 src/escputil/escputil.c:1071
+#: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
+msgid "Red"
+msgstr ""
+
+#: 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 ""
+
+#: 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:1053 src/escputil/escputil.c:1072
+#: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
+msgid "Blue"
+msgstr ""
+
+#: src/main/print-color.c:307
+msgid "Adjust the blue gamma"
+msgstr ""
+
+#: src/main/print-color.c:315
+msgid "Adjust the black gamma"
+msgstr ""
+
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
+msgid "Cyan Balance"
+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:2077
+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:2085
+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:358
+msgid "Limit the total ink printed to the page"
+msgstr ""
+
+#: src/main/print-color.c:365 src/main/print-escp2.c:878
+msgid "GCR Transition"
+msgstr ""
+
+#: src/main/print-color.c:366 src/main/print-escp2.c:879
+msgid "Adjust the gray component transition rate"
+msgstr ""
+
+#: src/main/print-color.c:373 src/main/print-escp2.c:886
+msgid "GCR Lower Bound"
+msgstr ""
+
+#: src/main/print-color.c:374 src/main/print-escp2.c:887
+msgid "Lower bound of gray component reduction"
+msgstr ""
+
+#: src/main/print-color.c:381 src/main/print-escp2.c:894
+msgid "GCR Upper Bound"
+msgstr ""
+
+#: src/main/print-color.c:382 src/main/print-escp2.c:895
+msgid "Upper bound of gray component reduction"
+msgstr ""
+
+#: src/main/print-color.c:421
+msgid "LUT dump file"
+msgstr ""
+
+#: src/main/print-color.c:421
+msgid "Advanced Output Control"
+msgstr ""
+
+#: src/main/print-color.c:422
+msgid "Dump file for LUT for external color adjustment"
+msgstr ""
+
+#: src/main/print-color.c:456
+msgid "Curve for raw channel "
+msgstr ""
+
+#: src/main/print-color.c:466
+msgid "Cyan Curve"
+msgstr ""
+
+#: src/main/print-color.c:467
+msgid "Cyan curve"
+msgstr ""
+
+#: src/main/print-color.c:474
+msgid "Magenta Curve"
+msgstr ""
+
+#: src/main/print-color.c:475
+msgid "Magenta curve"
+msgstr ""
+
+#: src/main/print-color.c:482
+msgid "Yellow Curve"
+msgstr ""
+
+#: src/main/print-color.c:483
+msgid "Yellow curve"
+msgstr ""
+
+#: src/main/print-color.c:490
+msgid "Black Curve"
+msgstr ""
+
+#: src/main/print-color.c:491
+msgid "Black curve"
+msgstr ""
+
+#: src/main/print-color.c:498
+msgid "Red Curve"
+msgstr ""
+
+#: src/main/print-color.c:499
+msgid "Red curve"
+msgstr ""
+
+#: src/main/print-color.c:506
+msgid "Green Curve"
+msgstr ""
+
+#: src/main/print-color.c:507
+msgid "Green curve"
+msgstr ""
+
+#: src/main/print-color.c:514
+msgid "Blue Curve"
+msgstr ""
+
+#: src/main/print-color.c:515
+msgid "Blue curve"
+msgstr ""
+
+#: src/main/print-color.c:522
+msgid "White Curve"
+msgstr ""
+
+#: src/main/print-color.c:523
+msgid "White curve"
+msgstr ""
+
+#: src/main/print-color.c:530
+msgid "Hue Map"
+msgstr ""
+
+#: src/main/print-color.c:531
+msgid "Hue adjustment curve"
+msgstr ""
+
+#: src/main/print-color.c:538
+msgid "Saturation Map"
+msgstr ""
+
+#: src/main/print-color.c:539
+msgid "Saturation adjustment curve"
+msgstr ""
+
+#: src/main/print-color.c:546
+msgid "Luminosity Map"
+msgstr ""
+
+#: src/main/print-color.c:547
+msgid "Luminosity adjustment curve"
+msgstr ""
+
+#: src/main/print-color.c:554
+msgid "Gray Component Reduction"
+msgstr ""
+
+#: src/main/print-color.c:555
+msgid "Gray component reduction curve"
+msgstr ""
+
+#: src/main/print-color.c:1740
+msgid "Traditional Gutenprint color conversion"
+msgstr ""
+
+#: src/main/printers.c:597
+#, c-format
+msgid "Value must be set for %s\n"
+msgstr ""
+
+#: src/main/printers.c:610 src/main/printers.c:615
+#, c-format
+msgid "`%s' is not a valid %s\n"
+msgstr ""
+
+#: src/main/printers.c:634
+#, c-format
+msgid "%s must be between %f and %f (is %f)\n"
+msgstr ""
+
+#: src/main/printers.c:656 src/main/printers.c:680
+#, c-format
+msgid "%s must be between %d and %d (is %d)\n"
+msgstr ""
+
+#: src/main/printers.c:711
+#, c-format
+msgid "%s bounds must be between %f and %f\n"
+msgstr ""
+
+#: src/main/printers.c:719
+#, c-format
+msgid "%s wrap mode must be %s\n"
+msgstr ""
+
+#: src/main/printers.c:723
+msgid "no wrap"
+msgstr ""
+
+#: src/main/printers.c:723
+msgid "wrap around"
+msgstr ""
+
+#: src/main/printers.c:767
+#, c-format
+msgid "Unknown type parameter %s (%d)\n"
+msgstr ""
+
+#: src/main/printers.c:780 src/main/printers.c:791
+#, c-format
+msgid "%s out of range (value %d, min %d, max %d)\n"
+msgstr ""
+
+#: src/main/printers.c:851
+msgid "Page size is not valid\n"
+msgstr ""
+
+#: src/main/printers.c:872
+#, c-format
+msgid "Top margin must not be less than %d\n"
+msgstr ""
+
+#: src/main/printers.c:878
+#, c-format
+msgid "Left margin must not be less than %d\n"
+msgstr ""
+
+#: src/main/printers.c:884
+msgid "Height must be greater than zero\n"
+msgstr ""
+
+#: src/main/printers.c:890
+msgid "Width must be greater than zero\n"
+msgstr ""
+
+#: src/main/printers.c:896
+#, 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:903
+#, 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:150
+msgid "Automatic Printing Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:151
+msgid "Automatic printing mode"
+msgstr ""
+
+#: src/main/print-escp2.c:222
+msgid "CD Allow Other Media Sizes"
+msgstr ""
+
+#: src/main/print-escp2.c:223
+msgid "Allow non-CD media sizes when printing to CD"
+msgstr ""
+
+#: src/main/print-escp2.c:229 src/main/print-pcl.c:1371
+msgid "Resolution of the print"
+msgstr ""
+
+#: src/main/print-escp2.c:245
+msgid "Enhanced Gloss"
+msgstr ""
+
+#: src/main/print-escp2.c:246
+msgid "Add gloss enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:257
+msgid "Printing Direction"
+msgstr ""
+
+#: src/main/print-escp2.c:258
+msgid "Printing direction (unidirectional is higher quality, but slower)"
+msgstr ""
+
+#: src/main/print-escp2.c:269
+msgid "Interleave Method"
+msgstr ""
+
+#: src/main/print-escp2.c:270
+msgid "Interleave pattern to use"
+msgstr ""
+
+#: src/main/print-escp2.c:275 src/main/print-escp2.c:276
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
+msgid "Output Order"
+msgstr ""
+
+#: src/main/print-escp2.c:281 src/main/print-escp2.c:282
+msgid "Alignment Passes"
+msgstr ""
+
+#: src/main/print-escp2.c:287 src/main/print-escp2.c:288
+msgid "Alignment Choices"
+msgstr ""
+
+#: src/main/print-escp2.c:293 src/main/print-escp2.c:294
+msgid "Ink change command"
+msgstr ""
+
+#: src/main/print-escp2.c:299 src/main/print-escp2.c:300
+msgid "Alternate Alignment Passes"
+msgstr ""
+
+#: src/main/print-escp2.c:305 src/main/print-escp2.c:306
+msgid "Alternate Alignment Choices"
+msgstr ""
+
+#: src/main/print-escp2.c:311
+msgid "Supports Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:312
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:317
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:318
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:329 src/main/print-escp2.c:330
+msgid "Raw Channel Names"
+msgstr ""
+
+#: src/main/print-escp2.c:335 src/main/print-escp2.c:336
+msgid "Channel Names"
+msgstr ""
+
+#: src/main/print-escp2.c:348
+msgid "Raw Channel Count"
+msgstr ""
+
+#: src/main/print-escp2.c:353
+msgid "Cyan Map"
+msgstr ""
+
+#: src/main/print-escp2.c:354
+msgid "Adjust the cyan map"
+msgstr ""
+
+#: src/main/print-escp2.c:359
+msgid "Magenta Map"
+msgstr ""
+
+#: src/main/print-escp2.c:360
+msgid "Adjust the magenta map"
+msgstr ""
+
+#: src/main/print-escp2.c:365
+msgid "Yellow Map"
+msgstr ""
+
+#: src/main/print-escp2.c:366
+msgid "Adjust the yellow map"
+msgstr ""
+
+#: src/main/print-escp2.c:371
+msgid "Blue Map"
+msgstr ""
+
+#: src/main/print-escp2.c:372
+msgid "Adjust the blue map"
+msgstr ""
+
+#: src/main/print-escp2.c:377
+msgid "Orange Map"
+msgstr ""
+
+#: src/main/print-escp2.c:378
+msgid "Adjust the orange map"
+msgstr ""
+
+#: src/main/print-escp2.c:383
+msgid "Red Map"
+msgstr ""
+
+#: src/main/print-escp2.c:384
+msgid "Adjust the red map"
+msgstr ""
+
+#: src/main/print-escp2.c:486
+msgid "Red Density"
+msgstr ""
+
+#: src/main/print-escp2.c:487
+msgid "Adjust the red density"
+msgstr ""
+
+#: src/main/print-escp2.c:494
+msgid "Blue Density"
+msgstr ""
+
+#: src/main/print-escp2.c:495
+msgid "Adjust the blue density"
+msgstr ""
+
+#: src/main/print-escp2.c:502
+msgid "Orange Density"
+msgstr ""
+
+#: src/main/print-escp2.c:503
+msgid "Adjust the orange density"
+msgstr ""
+
+#: src/main/print-escp2.c:510
+msgid "Gloss Level"
+msgstr ""
+
+#: src/main/print-escp2.c:511
+msgid "Adjust the gloss level"
+msgstr ""
+
+#: src/main/print-escp2.c:518
+msgid "Drop Size Small"
+msgstr ""
+
+#: src/main/print-escp2.c:519
+msgid "Drop Size 1 (small)"
+msgstr ""
+
+#: src/main/print-escp2.c:526
+msgid "Drop Size Medium"
+msgstr ""
+
+#: src/main/print-escp2.c:527
+msgid "Drop Size 2 (medium)"
+msgstr ""
+
+#: src/main/print-escp2.c:534
+msgid "Drop Size Large"
+msgstr ""
+
+#: src/main/print-escp2.c:535
+msgid "Drop Size 3 (large)"
+msgstr ""
+
+#: src/main/print-escp2.c:542 src/main/print-escp2.c:543
+msgid "Light Cyan Value"
+msgstr ""
+
+#: src/main/print-escp2.c:558 src/main/print-escp2.c:559
+msgid "Light Cyan Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:566 src/main/print-escp2.c:567
+msgid "Light Magenta Value"
+msgstr ""
+
+#: src/main/print-escp2.c:574 src/main/print-escp2.c:575
+msgid "Light Magenta Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:590 src/main/print-escp2.c:591
+msgid "Dark Yellow Value"
+msgstr ""
+
+#: src/main/print-escp2.c:598 src/main/print-escp2.c:599
+msgid "Dark Yellow Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:606 src/main/print-escp2.c:607
+msgid "Dark Yellow Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:614 src/main/print-escp2.c:615
+#: src/main/print-escp2.c:638 src/main/print-escp2.c:639
+msgid "Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:622 src/main/print-escp2.c:623
+#: src/main/print-escp2.c:646 src/main/print-escp2.c:647
+msgid "Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:630 src/main/print-escp2.c:631
+#: src/main/print-escp2.c:654 src/main/print-escp2.c:655
+msgid "Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:662 src/main/print-escp2.c:663
+#: src/main/print-escp2.c:734 src/main/print-escp2.c:735
+msgid "Light Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:670 src/main/print-escp2.c:671
+#: src/main/print-escp2.c:742 src/main/print-escp2.c:743
+msgid "Light Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:678 src/main/print-escp2.c:679
+#: src/main/print-escp2.c:750 src/main/print-escp2.c:751
+msgid "Light Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:686 src/main/print-escp2.c:687
+msgid "Dark Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:694 src/main/print-escp2.c:695
+msgid "Dark Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:702 src/main/print-escp2.c:703
+msgid "Dark Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:710
+msgid "Mid Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:711
+msgid "Medium Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:718
+msgid "Mid Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:719
+msgid "Medium Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:726
+msgid "Mid Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:727
+msgid "Medium Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:759
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:767
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:774
+msgid "Hextone Gray 5 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:775
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:782 src/main/print-escp2.c:783
+msgid "Hextone Gray 4 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:790 src/main/print-escp2.c:791
+msgid "Hextone Gray 4 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:798 src/main/print-escp2.c:799
+msgid "Hextone Gray 4 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:806 src/main/print-escp2.c:807
+msgid "Hextone Gray 3 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:814 src/main/print-escp2.c:815
+msgid "Hextone Gray 3 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:822 src/main/print-escp2.c:823
+msgid "Hextone Gray 3 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:830 src/main/print-escp2.c:831
+msgid "Hextone Gray 2 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:838 src/main/print-escp2.c:839
+msgid "Hextone Gray 2 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:846 src/main/print-escp2.c:847
+msgid "Hextone Gray 2 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:855
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:863
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:870
+msgid "Hextone Gray 1 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:871
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:902
+msgid "Subchannel Cutoff"
+msgstr ""
+
+#: src/main/print-escp2.c:903
+msgid "Upper limit for using light ink"
+msgstr ""
+
+#: src/main/print-escp2.c:910
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:911
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:918
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:942
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:943
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:950
+msgid "Paper Thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:951
+msgid "Set printer paper thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:958
+msgid "Vacuum Intensity"
+msgstr ""
+
+#: src/main/print-escp2.c:959
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:966
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:967
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:974
+msgid "Print Method"
+msgstr ""
+
+#: src/main/print-escp2.c:975
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:982
+msgid "Platen Gap"
+msgstr ""
+
+#: src/main/print-escp2.c:983
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:990
+msgid "Feed Adjustment"
+msgstr ""
+
+#: src/main/print-escp2.c:992
+#, no-c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:2214
+msgid "Full Manual Control"
+msgstr ""
+
+#: src/main/print-escp2.c:2216
+msgid "Automatic Setting Control"
+msgstr ""
+
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
+msgid "Automatic"
+msgstr ""
+
+#: src/main/print-escp2.c:2439
+msgid "Bidirectional"
+msgstr ""
+
+#: src/main/print-escp2.c:2441
+msgid "Unidirectional"
+msgstr ""
+
+#: src/main/print-escp2.c:2472
+msgid "Alternate Fill"
+msgstr ""
+
+#: src/main/print-escp2.c:2474
+msgid "Ascending Fill"
+msgstr ""
+
+#: src/main/print-escp2.c:2476
+msgid "Descending Fill"
+msgstr ""
+
+#: src/main/print-escp2.c:2478
+msgid "Ascending Double"
+msgstr ""
+
+#: src/main/print-escp2.c:2480
+msgid "Nearest Neighbor Avoidance"
+msgstr ""
+
+#: src/main/print-escp2.c:2516
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:3134
+#, c-format
+msgid "This printer does not support raw printer output at depth %d\n"
+msgstr ""
+
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
+#: 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 ""
+
+#: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
+msgid "600 DPI"
+msgstr ""
+
+#: src/main/print-lexmark.c:579 src/main/print-lexmark.c:655
+msgid "600 DPI high quality"
+msgstr ""
+
+#: 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 ""
+
+#: src/main/print-lexmark.c:582 src/main/print-lexmark.c:658
+msgid "1200 DPI high quality"
+msgstr ""
+
+#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
+msgid "1200 DPI highest quality"
+msgstr ""
+
+#: 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 ""
+
+#: src/main/print-lexmark.c:586
+msgid "2400 DPI x 1200 DPI high quality"
+msgstr ""
+
+#: src/main/print-lexmark.c:587
+msgid "2400 DPI x 1200 DPI highest quality"
+msgstr ""
+
+#: 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:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
+msgid "Four Color Standard"
+msgstr ""
+
+#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
+msgid "Three Color Composite"
+msgstr ""
+
+#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
+msgid "Six Color Photo"
+msgstr ""
+
+#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
+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:469
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:889
+#: src/xml/xmli18n-tmp.h:927 src/xml/xmli18n-tmp.h:965
+#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1088
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1712
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:2012
+#: src/xml/xmli18n-tmp.h:2054 src/xml/xmli18n-tmp.h:2117
+#: src/xml/xmli18n-tmp.h:2177 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2373
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2512
+#: src/xml/xmli18n-tmp.h:2546
+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:374 src/xml/xmli18n-tmp.h:484
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:825 src/xml/xmli18n-tmp.h:895
+#: src/xml/xmli18n-tmp.h:933 src/xml/xmli18n-tmp.h:974
+#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1094
+#: src/xml/xmli18n-tmp.h:1152 src/xml/xmli18n-tmp.h:1197
+#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1485 src/xml/xmli18n-tmp.h:1596
+#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1837
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:2018
+#: src/xml/xmli18n-tmp.h:2063 src/xml/xmli18n-tmp.h:2123
+#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2385
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2552
+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:379
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:897 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1154
+#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1297
+#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1601 src/xml/xmli18n-tmp.h:1682
+#: src/xml/xmli18n-tmp.h:1720 src/xml/xmli18n-tmp.h:1771
+#: src/xml/xmli18n-tmp.h:1842 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:2020 src/xml/xmli18n-tmp.h:2066
+#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2186
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2313
+#: src/xml/xmli18n-tmp.h:2389 src/xml/xmli18n-tmp.h:2461
+#: src/xml/xmli18n-tmp.h:2518 src/xml/xmli18n-tmp.h:2554
+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:384
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:757 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:899 src/xml/xmli18n-tmp.h:937
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1497
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2069
+#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2189
+#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2317
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2556
+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:394
+#: src/xml/xmli18n-tmp.h:504 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:841
+#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1160
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1407 src/xml/xmli18n-tmp.h:1509
+#: src/xml/xmli18n-tmp.h:1616 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1726 src/xml/xmli18n-tmp.h:1780
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2075
+#: src/xml/xmli18n-tmp.h:2135 src/xml/xmli18n-tmp.h:2195
+#: src/xml/xmli18n-tmp.h:2255 src/xml/xmli18n-tmp.h:2325
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2470
+#: src/xml/xmli18n-tmp.h:2524 src/xml/xmli18n-tmp.h:2560
+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:409
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:597
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1164
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1692
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1962
+#: src/xml/xmli18n-tmp.h:2030 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2333
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2528 src/xml/xmli18n-tmp.h:2564
+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:414
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:853
+#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1327
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1527
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2204
+#: src/xml/xmli18n-tmp.h:2264 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2413 src/xml/xmli18n-tmp.h:2479
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2566
+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:419
+#: src/xml/xmli18n-tmp.h:529 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:647 src/xml/xmli18n-tmp.h:707
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:857
+#: src/xml/xmli18n-tmp.h:911 src/xml/xmli18n-tmp.h:949
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1058
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1168
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1533
+#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1792
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2341
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2482
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2568
+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:424
+#: src/xml/xmli18n-tmp.h:534 src/xml/xmli18n-tmp.h:603
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1061
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1337
+#: src/xml/xmli18n-tmp.h:1432 src/xml/xmli18n-tmp.h:1539
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1736 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1758 src/xml/xmli18n-tmp.h:1795
+#: src/xml/xmli18n-tmp.h:1882 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2090
+#: src/xml/xmli18n-tmp.h:2150 src/xml/xmli18n-tmp.h:2210
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2345
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2534 src/xml/xmli18n-tmp.h:2570
+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:439
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:656 src/xml/xmli18n-tmp.h:716
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:869
+#: src/xml/xmli18n-tmp.h:917 src/xml/xmli18n-tmp.h:955
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1067
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1174
+#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1551
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1702
+#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1801
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1987
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2216
+#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2353
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2574
+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:449
+#: src/xml/xmli18n-tmp.h:559 src/xml/xmli18n-tmp.h:609
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:797 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1136 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1352
+#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1656 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1746 src/xml/xmli18n-tmp.h:1810
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1992
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2433 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2576
+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:454
+#: src/xml/xmli18n-tmp.h:564 src/xml/xmli18n-tmp.h:611
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:877
+#: src/xml/xmli18n-tmp.h:921 src/xml/xmli18n-tmp.h:959
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1661
+#: src/xml/xmli18n-tmp.h:1706 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1902
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2048
+#: src/xml/xmli18n-tmp.h:2108 src/xml/xmli18n-tmp.h:2168
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2578
+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:464
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:1025 src/xml/xmli18n-tmp.h:1085
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1462 src/xml/xmli18n-tmp.h:1575
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1710
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1819
+#: src/xml/xmli18n-tmp.h:1912 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2114
+#: src/xml/xmli18n-tmp.h:2174 src/xml/xmli18n-tmp.h:2234
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2369
+#: src/xml/xmli18n-tmp.h:2445 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2582
+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:280
+msgid "Coated"
+msgstr ""
+
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
+msgid "Glossy"
+msgstr ""
+
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
+msgid "Texture"
+msgstr ""
+
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
+msgid "Matte"
+msgstr ""
+
+#. TRANSLATORS: Some dye sublimation printers are able to 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:2034 src/main/print-olympus.c:2035
+msgid "Laminate Pattern"
+msgstr ""
+
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
+msgid "Output Level Adjustment"
+msgstr ""
+
+#: src/main/print-olympus.c:2070
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:2078
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:2086
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:2093
+msgid "Black Balance"
+msgstr ""
+
+#: src/main/print-olympus.c:2094
+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:238 src/xml/xmli18n-tmp.h:6653
+msgid "Manual"
+msgstr ""
+
+#: src/main/print-pcl.c:239
+msgid "Manual - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:241
+msgid "Tray 1 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:242
+msgid "Tray 1"
+msgstr ""
+
+#: src/main/print-pcl.c:243
+msgid "Tray 2 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:244 src/main/print-pcl.c:252
+msgid "Tray 2"
+msgstr ""
+
+#: src/main/print-pcl.c:245
+msgid "Tray 3 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:246
+msgid "Tray 3"
+msgstr ""
+
+#: src/main/print-pcl.c:247
+msgid "Tray 4 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:248
+msgid "Tray 4"
+msgstr ""
+
+#: src/main/print-pcl.c:249
+msgid "Portable Sheet Feeder"
+msgstr ""
+
+#: src/main/print-pcl.c:250
+msgid "Desktop Sheet Feeder"
+msgstr ""
+
+#: src/main/print-pcl.c:251
+msgid "Tray"
+msgstr ""
+
+#: src/main/print-pcl.c:253
+msgid "Optional Source"
+msgstr ""
+
+#: src/main/print-pcl.c:254
+msgid "Autoselect"
+msgstr ""
+
+#: src/main/print-pcl.c:268
+msgid "150x150 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:269
+msgid "300x300 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:270
+msgid "600x300 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:271
+msgid "600x600 DPI monochrome"
+msgstr ""
+
+#: src/main/print-pcl.c:272
+msgid "600x600 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:273
+msgid "1200x600 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:274
+msgid "2400x600 DPI"
+msgstr ""
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
+msgid "Draft"
+msgstr ""
+
+#: src/main/print-pcl.c:282 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
+msgid "High"
+msgstr ""
+
+#: src/main/print-pcl.c:1671
+msgid "Color + Black Cartridges"
+msgstr ""
+
+#: src/main/print-pcl.c:1672
+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 ""
+
+#: src/main/print-ps.c:80
+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 ""
+
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
+msgid "Letter"
+msgstr ""
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
+msgid "A4"
+msgstr ""
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
+msgid "Custom"
+msgstr ""
+
+#: src/main/print-raw.c:225
+msgid "Image dimensions must match paper dimensions"
+msgstr ""
+
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1528
+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:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
+msgid "Fast Economy"
+msgstr ""
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
+msgid "Economy"
+msgstr ""
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
+msgid "Super Photo"
+msgstr ""
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
+msgid "Ultra Photo"
+msgstr ""
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
+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
+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:408
+msgid "Gamma"
+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
+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 ""
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+
+#: 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: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 ""
+
+#: 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 ""
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/gutenprintui2/plist.c:98
+msgid "CUPS"
+msgstr ""
+
+#: 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:154
+msgid "Printer Features"
+msgstr ""
+
+#: src/cups/genppd.c:155
+msgid "Output Control"
+msgstr ""
+
+#: src/cups/genppd.c:160
+msgid "Common"
+msgstr ""
+
+#: src/cups/genppd.c:161
+msgid "Extra 1"
+msgstr ""
+
+#: src/cups/genppd.c:162
+msgid "Extra 2"
+msgstr ""
+
+#: src/cups/genppd.c:163
+msgid "Extra 3"
+msgstr ""
+
+#: src/cups/genppd.c:164
+msgid "Extra 4"
+msgstr ""
+
+#: src/cups/genppd.c:165
+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:960
+msgid "English"
+msgstr ""
+
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
+msgid "Media Size"
+msgstr ""
+
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
+msgid "Color Model"
+msgstr ""
+
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
+msgid "Inverted Grayscale"
+msgstr ""
+
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
+msgid "RGB Color"
+msgstr ""
+
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
+msgid "CMY Color"
+msgstr ""
+
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
+msgid "Color Precision"
+msgstr ""
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
+msgid "Yes"
+msgstr ""
+
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
+msgid "No"
+msgstr ""
+
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
+msgid "Value"
+msgstr ""
+
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
+#, c-format
+msgid "%.1f mm"
+msgstr ""
+
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
+msgid "Expand (use maximum page area)"
+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:389
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:395
+#, c-format
+msgid "Unknown option %c\n"
+msgstr ""
+
+#: src/escputil/escputil.c:403
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:405
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:407
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:473
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:496
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:512 src/escputil/escputil.c:522
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr ""
+
+#: src/escputil/escputil.c:582
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:587
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:769
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:776
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:823
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:972
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
+#: src/xml/xmli18n-tmp.h:639 src/xml/xmli18n-tmp.h:642
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:660
+#: src/xml/xmli18n-tmp.h:663 src/xml/xmli18n-tmp.h:666
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:684
+#: src/xml/xmli18n-tmp.h:687 src/xml/xmli18n-tmp.h:690
+#: 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:1763
+#: src/xml/xmli18n-tmp.h:1766 src/xml/xmli18n-tmp.h:1769
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:1778 src/xml/xmli18n-tmp.h:1781
+#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1793
+#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1811
+#: src/xml/xmli18n-tmp.h:1814 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:1820 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:2265 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2274
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2286
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
+msgid "Photo Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
+msgid "Unknown"
+msgstr ""
+
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
+#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2932
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3051
+#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3132
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3204
+#: src/xml/xmli18n-tmp.h:3218 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3257
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3298
+#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3350
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3412
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3535
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3684 src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
+msgid "Light Cyan"
+msgstr ""
+
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
+#: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2987
+#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3052
+#: src/xml/xmli18n-tmp.h:3067 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3133
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3231
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3258
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3351
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3414
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3685 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
+msgid "Light Magenta"
+msgstr ""
+
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
+#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
+msgid "Light Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
+#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
+#: src/xml/xmli18n-tmp.h:640 src/xml/xmli18n-tmp.h:643
+#: src/xml/xmli18n-tmp.h:646 src/xml/xmli18n-tmp.h:649
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:661
+#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:667
+#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:673
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:691
+#: 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:1764
+#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1770
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1782
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1797 src/xml/xmli18n-tmp.h:1800
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1812
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2245
+#: src/xml/xmli18n-tmp.h:2248 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2260 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2269
+#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2275
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2281
+#: src/xml/xmli18n-tmp.h:2284 src/xml/xmli18n-tmp.h:2287
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
+#: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
+#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
+msgid "Matte Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
+#: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
+msgid "Light Light Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
+msgid "Orange"
+msgstr ""
+
+#: src/escputil/escputil.c:1087
+#, c-format
+msgid "Status: Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1090
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1093
+#, c-format
+msgid "Status: Busy\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1096
+#, c-format
+msgid "Status: Waiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1099
+#, c-format
+msgid "Status: Idle\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1102
+#, c-format
+msgid "Status: Paused\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1105
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1108
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1111
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1114
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1125
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1128
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1131
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1134
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1137
+#, c-format
+msgid "Error: Ink out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1140
+#, c-format
+msgid "Error: Paper out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1143
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1146
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1149
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1152
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1155
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1158
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1161
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1164
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1167
+#, c-format
+msgid "Error: Rear cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1170
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1173
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1176
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1179
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1182
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1185
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1188
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1200
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1203
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1209
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1212
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1219
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1222
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1225
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1237
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+msgid "Ink color"
+msgstr ""
+
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Percent remaining"
+msgstr ""
+
+#: src/escputil/escputil.c:1439
+#, c-format
+msgid "Job Name: "
+msgstr ""
+
+#: src/escputil/escputil.c:1469
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1472
+msgid "status"
+msgstr ""
+
+#: src/escputil/escputil.c:1477
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1563
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1783
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1801
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1823
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1840
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1844
+#, 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:1879
+#, 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:1923
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
+#, c-format
+msgid "Exiting\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1940
+#, 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:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
+msgid "> "
+msgstr ""
+
+#: src/escputil/escputil.c:1955
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1962
+#, 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:1969
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1977
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1983
+#, 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:1995
+#, c-format
+msgid "About to save settings..."
+msgstr ""
+
+#: src/escputil/escputil.c:2001
+#, c-format
+msgid "failed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2002
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2006
+#, c-format
+msgid "succeeded!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2007
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2012
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2015
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2020
+#, 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:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
+msgid "Press enter to continue > "
+msgstr ""
+
+#: src/escputil/escputil.c:2096
+#, 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:2109
+#, c-format
+msgid "Pass #%d"
+msgstr ""
+
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2136
+#, c-format
+msgid "Number out of range!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2141
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2147
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2154
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr ""
+
+#: src/escputil/escputil.c:2157
+#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2158
+#, 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:2204
+#, c-format
+msgid "Error in input\n"
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+msgid "<Image>/File/Print with Gutenprint..."
+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:365
+#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:390 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:405
+#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:415
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:425
+#: src/xml/xmli18n-tmp.h:430 src/xml/xmli18n-tmp.h:435
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:445
+#: src/xml/xmli18n-tmp.h:450 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:495
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:510 src/xml/xmli18n-tmp.h:515
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:525
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:540 src/xml/xmli18n-tmp.h:545
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:555
+#: src/xml/xmli18n-tmp.h:560 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:570 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:584 src/xml/xmli18n-tmp.h:586
+#: src/xml/xmli18n-tmp.h:588 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:596 src/xml/xmli18n-tmp.h:598
+#: src/xml/xmli18n-tmp.h:600 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:608 src/xml/xmli18n-tmp.h:610
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:616 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:762
+#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:774 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:798 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:822 src/xml/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:830 src/xml/xmli18n-tmp.h:834
+#: src/xml/xmli18n-tmp.h:838 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:858
+#: src/xml/xmli18n-tmp.h:862 src/xml/xmli18n-tmp.h:866
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:882
+#: src/xml/xmli18n-tmp.h:886 src/xml/xmli18n-tmp.h:890
+#: src/xml/xmli18n-tmp.h:892 src/xml/xmli18n-tmp.h:894
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:902
+#: src/xml/xmli18n-tmp.h:904 src/xml/xmli18n-tmp.h:906
+#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:916 src/xml/xmli18n-tmp.h:918
+#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:928 src/xml/xmli18n-tmp.h:930
+#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:940 src/xml/xmli18n-tmp.h:942
+#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:952 src/xml/xmli18n-tmp.h:954
+#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:964 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: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:1343 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1358
+#: src/xml/xmli18n-tmp.h:1363 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1378
+#: src/xml/xmli18n-tmp.h:1383 src/xml/xmli18n-tmp.h:1388
+#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1398
+#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1413 src/xml/xmli18n-tmp.h:1418
+#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1438
+#: src/xml/xmli18n-tmp.h:1443 src/xml/xmli18n-tmp.h:1448
+#: 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:1474 src/xml/xmli18n-tmp.h:1480
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1498 src/xml/xmli18n-tmp.h:1504
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1516
+#: src/xml/xmli18n-tmp.h:1522 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1540
+#: src/xml/xmli18n-tmp.h:1546 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1558 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1587
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1607
+#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1622 src/xml/xmli18n-tmp.h:1627
+#: 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:1679 src/xml/xmli18n-tmp.h:1681
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1689
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1693
+#: src/xml/xmli18n-tmp.h:1695 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1701
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1707 src/xml/xmli18n-tmp.h:1709
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1713
+#: src/xml/xmli18n-tmp.h:1715 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1727 src/xml/xmli18n-tmp.h:1729
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1733
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1741
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1745
+#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1749
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1753
+#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1863 src/xml/xmli18n-tmp.h:1868
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1878
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1898
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1908
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1923 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1938
+#: src/xml/xmli18n-tmp.h:1943 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1968
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1998
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2015
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2023
+#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2027
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2035
+#: src/xml/xmli18n-tmp.h:2037 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2047
+#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2051
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2298
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2306
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2314
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2322
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2330
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2366 src/xml/xmli18n-tmp.h:2370
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2386
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2394
+#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2402
+#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2418
+#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2426
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2446 src/xml/xmli18n-tmp.h:2513
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2521
+#: src/xml/xmli18n-tmp.h:2523 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2533
+#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2537
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2541
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2547 src/xml/xmli18n-tmp.h:2549
+#: src/xml/xmli18n-tmp.h:2551 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2557
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2565
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
+#: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:364
+#: src/xml/xmli18n-tmp.h:474
+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:369
+#: src/xml/xmli18n-tmp.h:479 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:745 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:931
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1031
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1150
+#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1287
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1479
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1765
+#: src/xml/xmli18n-tmp.h:1832 src/xml/xmli18n-tmp.h:1927
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2060
+#: src/xml/xmli18n-tmp.h:2120 src/xml/xmli18n-tmp.h:2180
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
+#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
+#: src/xml/xmli18n-tmp.h:6635
+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:389
+#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:591
+#: src/xml/xmli18n-tmp.h:632 src/xml/xmli18n-tmp.h:692
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1043
+#: src/xml/xmli18n-tmp.h:1103 src/xml/xmli18n-tmp.h:1158
+#: src/xml/xmli18n-tmp.h:1212 src/xml/xmli18n-tmp.h:1307
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1503
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1724 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2192
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2321
+#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2558
+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:399
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:638 src/xml/xmli18n-tmp.h:698
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:845
+#: src/xml/xmli18n-tmp.h:905 src/xml/xmli18n-tmp.h:943
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1109 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1317
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1621 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1783
+#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1957
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2329
+#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2562
+msgid "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:404
+#: src/xml/xmli18n-tmp.h:514
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:429
+#: src/xml/xmli18n-tmp.h:539
+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:434
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:865
+#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1064
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1342
+#: src/xml/xmli18n-tmp.h:1437 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1738 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2038 src/xml/xmli18n-tmp.h:2093
+#: src/xml/xmli18n-tmp.h:2153 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2349
+#: src/xml/xmli18n-tmp.h:2425 src/xml/xmli18n-tmp.h:2488
+#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2572
+msgid "Premium Semigloss Photo Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:444
+#: src/xml/xmli18n-tmp.h:554
+msgid "Ultra Premium Photo Paper Luster"
+msgstr ""
+
+#: 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:459
+#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:613
+#: src/xml/xmli18n-tmp.h:671 src/xml/xmli18n-tmp.h:731
+#: src/xml/xmli18n-tmp.h:805 src/xml/xmli18n-tmp.h:881
+#: src/xml/xmli18n-tmp.h:923 src/xml/xmli18n-tmp.h:961
+#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1142 src/xml/xmli18n-tmp.h:1178
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1362
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2365
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2506
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2580
+msgid "ColorLife Paper"
+msgstr ""
+
+#: 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:361
+#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:406 src/xml/xmli18n-tmp.h:411
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:421
+#: src/xml/xmli18n-tmp.h:426 src/xml/xmli18n-tmp.h:431
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:441
+#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:486 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:501
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:516 src/xml/xmli18n-tmp.h:521
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:531
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:546 src/xml/xmli18n-tmp.h:551
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:561
+#: src/xml/xmli18n-tmp.h:566 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:576 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:759 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:771
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:779
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:787
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:795
+#: src/xml/xmli18n-tmp.h:799 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:823 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:831 src/xml/xmli18n-tmp.h:835
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:851
+#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:859
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:875
+#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:883
+#: src/xml/xmli18n-tmp.h:887 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:1344
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1354
+#: src/xml/xmli18n-tmp.h:1359 src/xml/xmli18n-tmp.h:1364
+#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1374
+#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1389 src/xml/xmli18n-tmp.h:1394
+#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1414
+#: src/xml/xmli18n-tmp.h:1419 src/xml/xmli18n-tmp.h:1424
+#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1434
+#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1449 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1481 src/xml/xmli18n-tmp.h:1487
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1499
+#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1523
+#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1547
+#: src/xml/xmli18n-tmp.h:1553 src/xml/xmli18n-tmp.h:1559
+#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1571
+#: src/xml/xmli18n-tmp.h:1577 src/xml/xmli18n-tmp.h:1583
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1603
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1623
+#: src/xml/xmli18n-tmp.h:1628 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:1824 src/xml/xmli18n-tmp.h:1829
+#: src/xml/xmli18n-tmp.h:1834 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1849
+#: src/xml/xmli18n-tmp.h:1854 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1864 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1879
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1889
+#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1909
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1919
+#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1939
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1969
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1979
+#: src/xml/xmli18n-tmp.h:1984 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1994 src/xml/xmli18n-tmp.h:1999
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2009
+#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2303
+#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2311
+#: src/xml/xmli18n-tmp.h:2315 src/xml/xmli18n-tmp.h:2319
+#: src/xml/xmli18n-tmp.h:2323 src/xml/xmli18n-tmp.h:2327
+#: src/xml/xmli18n-tmp.h:2331 src/xml/xmli18n-tmp.h:2335
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2343
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2351
+#: src/xml/xmli18n-tmp.h:2355 src/xml/xmli18n-tmp.h:2359
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2367
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2375
+#: src/xml/xmli18n-tmp.h:2379 src/xml/xmli18n-tmp.h:2383
+#: src/xml/xmli18n-tmp.h:2387 src/xml/xmli18n-tmp.h:2391
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2403 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
+#: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
+#: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
+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:362
+#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:372
+#: src/xml/xmli18n-tmp.h:377 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:392
+#: src/xml/xmli18n-tmp.h:397 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:412
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:432
+#: src/xml/xmli18n-tmp.h:437 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:452
+#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:467 src/xml/xmli18n-tmp.h:472
+#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:487 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:502
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:512
+#: src/xml/xmli18n-tmp.h:517 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:532
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:542
+#: src/xml/xmli18n-tmp.h:547 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:562
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:577 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:760 src/xml/xmli18n-tmp.h:764
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:772
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:780
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:788
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:796
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:804
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:812
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:820
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:828
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:836
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:852
+#: src/xml/xmli18n-tmp.h:856 src/xml/xmli18n-tmp.h:860
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:876
+#: src/xml/xmli18n-tmp.h:880 src/xml/xmli18n-tmp.h:884
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1225
+#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1265
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1275
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1285
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1295
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1305
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1315
+#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1325
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1335
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1360 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1385
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1420 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1445
+#: 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:1476
+#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1500
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1524
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1536
+#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1548
+#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1566 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1578 src/xml/xmli18n-tmp.h:1584
+#: src/xml/xmli18n-tmp.h:1589 src/xml/xmli18n-tmp.h:1594
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1604
+#: src/xml/xmli18n-tmp.h:1609 src/xml/xmli18n-tmp.h:1614
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1629 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:1825 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1850
+#: src/xml/xmli18n-tmp.h:1855 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1875 src/xml/xmli18n-tmp.h:1880
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1890
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1920
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1950
+#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:1970
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1980
+#: src/xml/xmli18n-tmp.h:1985 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1995 src/xml/xmli18n-tmp.h:2000
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2010
+#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2316 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2324 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2344
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2364 src/xml/xmli18n-tmp.h:2368
+#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2384
+#: src/xml/xmli18n-tmp.h:2388 src/xml/xmli18n-tmp.h:2392
+#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2400
+#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2416
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2436 src/xml/xmli18n-tmp.h:2440
+#: src/xml/xmli18n-tmp.h:2444 src/xml/xmli18n-tmp.h:2448
+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:581
+#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1187
+#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1714 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2452
+#: src/xml/xmli18n-tmp.h:2548
+msgid "Plain Paper Fast Load"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:368
+#: src/xml/xmli18n-tmp.h:373 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:383 src/xml/xmli18n-tmp.h:388
+#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:403 src/xml/xmli18n-tmp.h:408
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:428
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:448
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:468
+#: src/xml/xmli18n-tmp.h:473 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:488
+#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:508
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:518
+#: src/xml/xmli18n-tmp.h:523 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:538
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:553 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:568
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:578
+#: 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:1341
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1356 src/xml/xmli18n-tmp.h:1361
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1396 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1421
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1431
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1446 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:1472 src/xml/xmli18n-tmp.h:1477
+#: src/xml/xmli18n-tmp.h:1478 src/xml/xmli18n-tmp.h:1483
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1489
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1502 src/xml/xmli18n-tmp.h:1507
+#: src/xml/xmli18n-tmp.h:1508 src/xml/xmli18n-tmp.h:1513
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1519
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1537
+#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1543
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1555
+#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1567
+#: src/xml/xmli18n-tmp.h:1568 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1579
+#: src/xml/xmli18n-tmp.h:1580 src/xml/xmli18n-tmp.h:1826
+#: src/xml/xmli18n-tmp.h:1831 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1856
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1866
+#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1881 src/xml/xmli18n-tmp.h:1886
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1896
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1911 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1926
+#: src/xml/xmli18n-tmp.h:1931 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1941 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1956
+#: src/xml/xmli18n-tmp.h:1961 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1971 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1986
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:2001 src/xml/xmli18n-tmp.h:2006
+#: src/xml/xmli18n-tmp.h:2011
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1070
+#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1742
+#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:2042
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2279
+#: src/xml/xmli18n-tmp.h:2494
+msgid "Archival Matte Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:662 src/xml/xmli18n-tmp.h:722
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1133 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1807 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2102 src/xml/xmli18n-tmp.h:2162
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2282
+#: src/xml/xmli18n-tmp.h:2497
+msgid "Watercolor Paper - Radiant White"
+msgstr ""
+
+#: 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:1017
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1023
+#: src/xml/xmli18n-tmp.h:1026 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1035
+#: src/xml/xmli18n-tmp.h:1038 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1044 src/xml/xmli18n-tmp.h:1047
+#: src/xml/xmli18n-tmp.h:1050 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1056 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1062 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1071
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1077
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1086 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1095
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1101
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1107
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1125
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1131
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1137
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1146 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2061
+#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2067
+#: src/xml/xmli18n-tmp.h:2070 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2076 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2085
+#: src/xml/xmli18n-tmp.h:2088 src/xml/xmli18n-tmp.h:2091
+#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2109
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2115
+#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2124 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2133
+#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2139
+#: src/xml/xmli18n-tmp.h:2142 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2157
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2163
+#: src/xml/xmli18n-tmp.h:2166 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2181
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2187
+#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2199
+#: 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:2450 src/xml/xmli18n-tmp.h:2453
+#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2459
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2468 src/xml/xmli18n-tmp.h:2471
+#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2477
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2489
+#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
+msgid "UltraChrome Photo Black"
+msgstr ""
+
+#: 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:1138
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1144
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2071 src/xml/xmli18n-tmp.h:2074
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2089 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2098
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2119 src/xml/xmli18n-tmp.h:2122
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2140
+#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2146
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2152
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2161 src/xml/xmli18n-tmp.h:2164
+#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2170
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2176
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2185 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2194
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2200
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2227 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2233 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2460
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2469 src/xml/xmli18n-tmp.h:2472
+#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2478
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
+#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
+msgid "UltraChrome Matte Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1585 src/xml/xmli18n-tmp.h:1590
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1600
+#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1620
+#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1630
+#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2599
+#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
+#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2696
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2827
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2919
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3180
+#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3671
+#: src/xml/xmli18n-tmp.h:3688 src/xml/xmli18n-tmp.h:3896
+msgid "360 x 90 DPI Fast Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2614 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2713
+#: src/xml/xmli18n-tmp.h:2726 src/xml/xmli18n-tmp.h:2739
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2855 src/xml/xmli18n-tmp.h:2906
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2948
+#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3002
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3109
+#: src/xml/xmli18n-tmp.h:3122 src/xml/xmli18n-tmp.h:3135
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3301
+msgid "180 DPI Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2653
+#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2714
+#: src/xml/xmli18n-tmp.h:2727 src/xml/xmli18n-tmp.h:2740
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2829
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2977
+#: src/xml/xmli18n-tmp.h:2990 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3110
+#: src/xml/xmli18n-tmp.h:3123 src/xml/xmli18n-tmp.h:3136
+#: src/xml/xmli18n-tmp.h:3168 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3232
+#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3374
+#: src/xml/xmli18n-tmp.h:3432 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3508
+#: src/xml/xmli18n-tmp.h:3523 src/xml/xmli18n-tmp.h:3541
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3656
+#: src/xml/xmli18n-tmp.h:3672 src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:3733 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:3803 src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3930 src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:3991 src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:4007 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:4047 src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:4071 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4095 src/xml/xmli18n-tmp.h:4101
+msgid "360 x 180 DPI Draft"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2591 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2683
+#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2715
+#: src/xml/xmli18n-tmp.h:2728 src/xml/xmli18n-tmp.h:2741
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3183
+msgid "360 DPI High Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2592 src/xml/xmli18n-tmp.h:2605
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2629
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2684
+#: src/xml/xmli18n-tmp.h:2700 src/xml/xmli18n-tmp.h:2716
+#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2742
+#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2765
+#: src/xml/xmli18n-tmp.h:2779 src/xml/xmli18n-tmp.h:2793
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2896
+#: src/xml/xmli18n-tmp.h:2909 src/xml/xmli18n-tmp.h:2922
+#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2965 src/xml/xmli18n-tmp.h:2978
+#: src/xml/xmli18n-tmp.h:2991 src/xml/xmli18n-tmp.h:3004
+#: src/xml/xmli18n-tmp.h:3014 src/xml/xmli18n-tmp.h:3027
+#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
+#: src/xml/xmli18n-tmp.h:3070 src/xml/xmli18n-tmp.h:3085
+#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:3124 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3147 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3169 src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3233
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3289
+#: src/xml/xmli18n-tmp.h:3303 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3364
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3388
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3418
+#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3448
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3477
+#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3509
+#: src/xml/xmli18n-tmp.h:3524 src/xml/xmli18n-tmp.h:3542
+#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3618 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3673 src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:3734 src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:3788 src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3852 src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:3976 src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:4032 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
+msgid "360 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2593 src/xml/xmli18n-tmp.h:2606
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2630
+#: src/xml/xmli18n-tmp.h:2643 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2701 src/xml/xmli18n-tmp.h:2717
+#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2743
+#: src/xml/xmli18n-tmp.h:2754 src/xml/xmli18n-tmp.h:2766
+#: src/xml/xmli18n-tmp.h:2780 src/xml/xmli18n-tmp.h:2794
+#: src/xml/xmli18n-tmp.h:2806 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2843
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2897
+#: src/xml/xmli18n-tmp.h:2910 src/xml/xmli18n-tmp.h:2923
+#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2951
+#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3005
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3056
+#: src/xml/xmli18n-tmp.h:3071 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3113
+#: src/xml/xmli18n-tmp.h:3125 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3148 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3170 src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3234
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3290
+#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3315
+#: src/xml/xmli18n-tmp.h:3328 src/xml/xmli18n-tmp.h:3340
+#: src/xml/xmli18n-tmp.h:3352 src/xml/xmli18n-tmp.h:3365
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3404 src/xml/xmli18n-tmp.h:3419
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3449
+#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3478
+#: src/xml/xmli18n-tmp.h:3496 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3525 src/xml/xmli18n-tmp.h:3543
+#: src/xml/xmli18n-tmp.h:3558 src/xml/xmli18n-tmp.h:3582
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3634
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:3736 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3773 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:3882 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3917 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:3977 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
+msgid "720 x 360 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2607
+#: src/xml/xmli18n-tmp.h:2620 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2644 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2718
+#: src/xml/xmli18n-tmp.h:2731 src/xml/xmli18n-tmp.h:2744
+#: src/xml/xmli18n-tmp.h:2755 src/xml/xmli18n-tmp.h:2767
+#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2795
+#: src/xml/xmli18n-tmp.h:2807 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2898
+#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2924
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2952
+#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2980
+#: src/xml/xmli18n-tmp.h:2993 src/xml/xmli18n-tmp.h:3006
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3057
+#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3087
+#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3114
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3149 src/xml/xmli18n-tmp.h:3160
+#: src/xml/xmli18n-tmp.h:3171 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3263
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3291
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3316
+#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3341
+#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3366
+#: src/xml/xmli18n-tmp.h:3377 src/xml/xmli18n-tmp.h:3390
+#: src/xml/xmli18n-tmp.h:3405 src/xml/xmli18n-tmp.h:3420
+#: src/xml/xmli18n-tmp.h:3435 src/xml/xmli18n-tmp.h:3450
+#: src/xml/xmli18n-tmp.h:3463 src/xml/xmli18n-tmp.h:3479
+#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3526 src/xml/xmli18n-tmp.h:3544
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3635
+#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3659
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:3709 src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:3738 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:3790 src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:3822 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:3883 src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:3918 src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:3978 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3994 src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:4010 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
+msgid "720 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2600 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2803
+#: src/xml/xmli18n-tmp.h:2815 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2867 src/xml/xmli18n-tmp.h:2880
+#: src/xml/xmli18n-tmp.h:2894 src/xml/xmli18n-tmp.h:2934
+#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3025
+#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3068
+#: src/xml/xmli18n-tmp.h:3083 src/xml/xmli18n-tmp.h:3096
+#: src/xml/xmli18n-tmp.h:3145 src/xml/xmli18n-tmp.h:3156
+#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3325
+#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3416
+#: src/xml/xmli18n-tmp.h:3446 src/xml/xmli18n-tmp.h:3459
+#: src/xml/xmli18n-tmp.h:3555 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3616 src/xml/xmli18n-tmp.h:3631
+#: src/xml/xmli18n-tmp.h:3705 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3817 src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:3851 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3965
+msgid "360 x 120 DPI Economy"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
+#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
+#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2868 src/xml/xmli18n-tmp.h:2881
+#: src/xml/xmli18n-tmp.h:2895 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:3013 src/xml/xmli18n-tmp.h:3026
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3069
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3146 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3326
+#: src/xml/xmli18n-tmp.h:3363 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3402 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3460
+#: src/xml/xmli18n-tmp.h:3556 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3593 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3617 src/xml/xmli18n-tmp.h:3632
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3866
+msgid "360 x 240 DPI Draft"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2645
+#: src/xml/xmli18n-tmp.h:2658 src/xml/xmli18n-tmp.h:2671
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2756 src/xml/xmli18n-tmp.h:2768
+#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:2808 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2885
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:3101
+#: src/xml/xmli18n-tmp.h:3150 src/xml/xmli18n-tmp.h:3161
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:3739 src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3936 src/xml/xmli18n-tmp.h:3954
+msgid "720 DPI High Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2646
+#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2672
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2834
+#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2886 src/xml/xmli18n-tmp.h:2900
+#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2926
+#: src/xml/xmli18n-tmp.h:2940 src/xml/xmli18n-tmp.h:2954
+#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2981
+#: src/xml/xmli18n-tmp.h:2994 src/xml/xmli18n-tmp.h:3007
+#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3030
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3073 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3127
+#: src/xml/xmli18n-tmp.h:3140 src/xml/xmli18n-tmp.h:3162
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3198
+#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3236 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3264 src/xml/xmli18n-tmp.h:3277
+#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3307
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3480 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3560
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3609
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3648 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3676 src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:3710 src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:3740 src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:3764 src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:3783 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3807 src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:3841 src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:3901 src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3969 src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:4003 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
+msgid "1440 x 720 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2746 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2835
+#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2862
+#: src/xml/xmli18n-tmp.h:2887 src/xml/xmli18n-tmp.h:2901
+#: src/xml/xmli18n-tmp.h:2914 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2955
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3059
+#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3163
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3637
+msgid "1440 x 720 DPI Highest Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2720 src/xml/xmli18n-tmp.h:2733
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:3151
+msgid "720 DPI Highest Quality"
+msgstr ""
+
+#: 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:3075 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3318 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3661
+msgid "2880 x 720 DPI"
+msgstr ""
+
+#: 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:3076 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3639
+msgid "2880 x 720 DPI Highest Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3212
+#: src/xml/xmli18n-tmp.h:3251 src/xml/xmli18n-tmp.h:3266
+#: src/xml/xmli18n-tmp.h:3279 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3380 src/xml/xmli18n-tmp.h:3393
+#: src/xml/xmli18n-tmp.h:3422 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3452 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3514 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3546 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3650
+#: src/xml/xmli18n-tmp.h:3662 src/xml/xmli18n-tmp.h:3677
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:3752 src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:3776 src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3825 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:3980 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3996 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
+msgid "1440 x 1440 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3237 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3293 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3394
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3586
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3610
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3651
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3678
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3727 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3753 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3777 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3793 src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:3997 src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
+msgid "2880 x 1440 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
+msgid "Dark Yellow"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3440 src/xml/xmli18n-tmp.h:3484
+#: src/xml/xmli18n-tmp.h:3502 src/xml/xmli18n-tmp.h:3516
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:3786 src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:3811 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3845 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
+msgid "2880 x 2880 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3454
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3548
+#: src/xml/xmli18n-tmp.h:3574 src/xml/xmli18n-tmp.h:3587
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3611
+#: src/xml/xmli18n-tmp.h:3624 src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:4108
+msgid "5760 x 1440 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3441 src/xml/xmli18n-tmp.h:3485
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3532
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:3860 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3906 src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:3974 src/xml/xmli18n-tmp.h:4110
+msgid "5760 x 2880 DPI"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3751
+msgid "1440 x 720 DPI Transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3692 src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3838 src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:3952
+msgid "720 x 360 DPI Enhanced"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3728 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:3943
+msgid "Black 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3729 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:3944
+msgid "Black 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3735 src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:3950
+msgid "360 DPI Enhanced"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3765
+msgid "1440 x 720 DPI High Quality"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3908
+msgid "Vivid Light Magenta"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3913
+msgid "Vivid Magenta"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4125
+msgid "Main Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4126
+msgid "Photo Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
+msgid "Print to CD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
+msgid "Rear Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
+msgid "Front Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
+msgid "Manual Feed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
+msgid "Roll Feed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
+msgid "Manual Feed (Front)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4152
+msgid "Roll Feed (borderless with single cut)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4153
+msgid "Roll Feed (borderless with double cut)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4175
+msgid "Photo Board"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4176
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4177
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4178
+msgid "Cut Sheet Autoselect"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4179
+msgid "Manual Selection"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
+msgid "One Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
+msgid "Three Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
+msgid "Four Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
+msgid "Five Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
+msgid "Six Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
+msgid "Gray 3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
+msgid "Gray 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
+msgid "Gray 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
+msgid "Gray 5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
+msgid "Gray 4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
+msgid "One Color Raw Enhanced Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
+msgid "Three Color Raw Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+msgid "Four Color Raw Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
+msgid "Six Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4603
+msgid "MatteBlack"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4686
+msgid "Default Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
+msgid "Seven Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4777
+msgid "Six Color Enhanced Composite"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
+msgid "Seven Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
+msgid "Two Level Grayscale"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
+msgid "Two Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
+msgid "Eight Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
+msgid "Eight Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
+msgid "Four Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
+msgid "Interleave"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
+msgid "Full Overlap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
+msgid "Four Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
+msgid "Interleave 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6577
+msgid "Eight Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6579
+msgid "On"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6632
+msgid "Legal"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6633
+msgid "Tabloid"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6634
+msgid "Executive"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6639
+msgid "3x5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6640
+msgid "3 1/2 x5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6641
+msgid "L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6642
+msgid "4x6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6643
+msgid "KG"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6644
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6645
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6646
+msgid "4x8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6647
+msgid "5x7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6648
+msgid "2L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6649
+msgid "5x8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6650
+msgid "6x8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6651
+msgid "8x10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6652
+msgid "Rokukire"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6654
+msgid "12x18"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6655
+msgid "Super B 13x19"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6656
+msgid "Engineering C 17x22"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6657
+msgid "8x12"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6658
+msgid "YonKire"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6659
+msgid "11x14"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6660
+msgid "HanKire"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6661
+msgid "16x20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6662
+msgid "16x24"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6663
+msgid "20x24"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6664
+msgid "20x30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6665
+msgid "22x30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6666
+msgid "24x30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6667
+msgid "Super A1 24x36"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6668
+msgid "30x40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6669
+msgid "4A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6670
+msgid "2A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6671
+msgid "Super A0"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6672
+msgid "A0"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6673
+msgid "A1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6674
+msgid "A2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6675
+msgid "A3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6677
+msgid "A5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6678
+msgid "A6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6679
+msgid "A7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6680
+msgid "A8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6681
+msgid "A9"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6682
+msgid "A10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6683
+msgid "RA0"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6684
+msgid "RA1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6685
+msgid "RA2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6686
+msgid "RA3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6687
+msgid "RA4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6688
+msgid "SRA0"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6689
+msgid "SRA1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6690
+msgid "SRA2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6691
+msgid "SRA3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6692
+msgid "SRA4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6693
+msgid "4B ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6694
+msgid "2B ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6695
+msgid "B0 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6696
+msgid "B1 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6697
+msgid "B2 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6698
+msgid "B3 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6699
+msgid "B4 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6700
+msgid "B5 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6701
+msgid "B6 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6702
+msgid "B7 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6703
+msgid "B8 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6704
+msgid "B9 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6705
+msgid "B10 ISO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6706
+msgid "Super B0 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6707
+msgid "B0 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6708
+msgid "B1 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6709
+msgid "B2 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6710
+msgid "B3 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6711
+msgid "B4 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6712
+msgid "B5 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6713
+msgid "B6 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6714
+msgid "B7 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6715
+msgid "B8 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6716
+msgid "B9 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6717
+msgid "B10 JIS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6718
+msgid "C0"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6719
+msgid "C0 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6720
+msgid "C1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6721
+msgid "C1 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6722
+msgid "C2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6723
+msgid "C2 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6724
+msgid "C3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6725
+msgid "C3 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6726
+msgid "C4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6727
+msgid "C4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6728
+msgid "C5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6729
+msgid "C5 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6730
+msgid "B6-C4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6731
+msgid "B6-C4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6732
+msgid "C6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6733
+msgid "C6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6734
+msgid "DL"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6735
+msgid "DL landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6736
+msgid "C7-6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6737
+msgid "C7-6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6738
+msgid "C7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6739
+msgid "C7 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6740
+msgid "C8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6741
+msgid "C8 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6742
+msgid "C9"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6743
+msgid "C9 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6744
+msgid "C10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6745
+msgid "C10 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6746
+msgid "EA5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6747
+msgid "EA5 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6748
+msgid "ArchA"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6749
+msgid "ArchA transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6750
+msgid "ArchB"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6751
+msgid "ArchB transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6752
+msgid "ArchC"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6753
+msgid "ArchC transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6754
+msgid "ArchD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6755
+msgid "ArchD transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6756
+msgid "ArchE"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6757
+msgid "ArchE transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6758
+msgid "American foolscap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6759
+msgid "European foolscap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6760
+msgid "Crown Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6761
+msgid "Large Crown Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6762
+msgid "Demy Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6763
+msgid "Royal Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6764
+msgid "Crown Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6765
+msgid "Large Crown Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6766
+msgid "Demy Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6767
+msgid "Royal Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6768
+msgid "Small paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6769
+msgid "Penguin small paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6770
+msgid "Penguin large paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6771
+msgid "10cm x 15cm"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6772
+msgid "Hagaki Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6773
+msgid "Oufuku Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6774
+msgid "Japanese long envelope #3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6775
+msgid "Japanese long envelope #3 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6776
+msgid "Japanese long envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6777
+msgid "Japanese long envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
+msgid "Japanese Kaku envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6783
+msgid "Japanese Kaku envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6784
+msgid "Commercial 10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6785
+msgid "Commercial 10 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6786
+msgid "A2 Invitation"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6787
+msgid "Monarch Envelope"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6788
+msgid "Monarch Envelope landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6789
+msgid "4x5 3/8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6790
+msgid "4x7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6791
+msgid "Wide 101.6x180.6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6792
+msgid "CP_L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
+msgid "Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6795
+msgid "Wide Postcard"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6796
+msgid "Chilean Office"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6797
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6798
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6799
+msgid "A3+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6801
+msgid "89 mm Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6802
+msgid "4 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6803
+msgid "5 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6804
+msgid "210 mm Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6805
+msgid "13 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6806
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6807
+msgid "22 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6808
+msgid "24 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6809
+msgid "36 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6810
+msgid "44 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6811
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6812
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6813
+msgid "PostScript Level 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6814
+msgid "PostScript Level 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6815
+msgid "Canon BJ-30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6816
+msgid "Canon BJC-50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6817
+msgid "Canon BJC-55"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6818
+msgid "Canon BJC-80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6819
+msgid "Canon BJC-85"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6820
+msgid "Canon BJC-210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6821
+msgid "Canon BJC-240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6822
+msgid "Canon BJC-250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6823
+msgid "Canon BJC-1000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6824
+msgid "Canon BJC-2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6825
+msgid "Canon BJC-2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6826
+msgid "Canon BJC-2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6827
+msgid "Canon BJC-2110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6828
+msgid "Canon BJC-3000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6829
+msgid "Canon BJC-4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6830
+msgid "Canon BJC-4300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6831
+msgid "Canon BJC-4400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6832
+msgid "Canon BJC-4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6833
+msgid "Canon BJC-5100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6834
+msgid "Canon BJC-5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6835
+msgid "Canon BJC-6000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6836
+msgid "Canon BJC-6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6837
+msgid "Canon BJC-6200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6838
+msgid "Canon BJC-6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6839
+msgid "Canon BJC-7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6840
+msgid "Canon BJC-7100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6841
+msgid "Canon BJC-8200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6842
+msgid "Canon BJC-8500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6843
+msgid "Canon S100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6844
+msgid "Canon S200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6845
+msgid "Canon S300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6846
+msgid "Canon S330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6847
+msgid "Canon S400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6848
+msgid "Canon S450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6849
+msgid "Canon S500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6850
+msgid "Canon S520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "Canon S530D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6852
+msgid "Canon S600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6853
+msgid "Canon S630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6854
+msgid "Canon S750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6855
+msgid "Canon S800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6856
+msgid "Canon S820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6857
+msgid "Canon S830D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6858
+msgid "Canon S900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6859
+msgid "Canon S9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6860
+msgid "Canon S4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6861
+msgid "Canon SELPHY DS700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6862
+msgid "Canon SELPHY DS810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6863
+msgid "Canon PIXMA mini220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6864
+msgid "Canon PIXMA mini320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6865
+msgid "Canon PIXMA mini360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6866
+msgid "Canon PIXMA iP90"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6867
+msgid "Canon PIXMA iP90v"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6868
+msgid "Canon PIXMA iP100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "Canon PIXMA iP2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6870
+msgid "Canon PIXMA iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6871
+msgid "Canon PIXMA iP3000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6872
+msgid "Canon PIXMA iP3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6873
+msgid "Canon PIXMA iP3300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6874
+msgid "Canon PIXMA iP3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6875
+msgid "Canon PIXMA iP3600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6876
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6877
+msgid "Canon PIXMA iP4000R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6878
+msgid "Canon PIXMA iP4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6879
+msgid "Canon PIXMA iP4100R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6880
+msgid "Canon PIXMA iP4200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6881
+msgid "Canon PIXMA iP4300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6882
+msgid "Canon PIXMA iP4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6883
+msgid "Canon PIXMA iP4600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6884
+msgid "Canon PIXMA iP4700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6885
+msgid "Canon PIXMA iP4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6886
+msgid "Canon PIXMA iP4900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6887
+msgid "Canon PIXMA iP5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6888
+msgid "Canon PIXMA iP5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6889
+msgid "Canon PIXMA iP5200R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6890
+msgid "Canon PIXMA iP5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6891
+msgid "Canon PIXMA iP6000D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6892
+msgid "Canon PIXMA iP6100D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6893
+msgid "Canon PIXMA iP6210D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6894
+msgid "Canon PIXMA iP6220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6895
+msgid "Canon PIXMA iP6310D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6896
+msgid "Canon PIXMA iP6320D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6897
+msgid "Canon PIXMA iP6600D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6898
+msgid "Canon PIXMA iP6700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6899
+msgid "Canon PIXMA iP7100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6900
+msgid "Canon PIXMA iP7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6901
+msgid "Canon PIXMA iP8100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6902
+msgid "Canon PIXMA iP8500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6903
+msgid "Canon PIXMA iP8600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6904
+msgid "Canon PIXMA iP9910"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6905
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6906
+msgid "Canon PIXMA iX5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6907
+msgid "Canon PIXMA iX6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6908
+msgid "Canon PIXMA iX7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6909
+msgid "Canon PIXMA Pro9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6910
+msgid "Canon PIXMA Pro9000mk2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6911
+msgid "Canon PIXMA Pro9500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6912
+msgid "Canon PIXMA Pro9500mk2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6913
+msgid "Canon PIXMA MP140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6914
+msgid "Canon PIXMA MP150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6915
+msgid "Canon PIXMA MP160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6916
+msgid "Canon PIXMA MP170"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6917
+msgid "Canon PIXMA MP180"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6918
+msgid "Canon PIXMA MP190"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6919
+msgid "Canon PIXMA MP210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6920
+msgid "Canon PIXMA MP220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6921
+msgid "Canon PIXMA MP240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6922
+msgid "Canon PIXMA MP250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6923
+msgid "Canon PIXMA MP260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6924
+msgid "Canon PIXMA MP270"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6925
+msgid "Canon PIXMA MP280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6926
+msgid "Canon PIXMA MP360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6927
+msgid "Canon PIXMA MP370"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6928
+msgid "Canon PIXMA MP375R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6929
+msgid "Canon PIXMA MP390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6930
+msgid "Canon PIXMA MP450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6931
+msgid "Canon PIXMA MP460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6932
+msgid "Canon PIXMA MP470"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6933
+msgid "Canon PIXMA MP480"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6934
+msgid "Canon PIXMA MP490"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6935
+msgid "Canon PIXMA MP493"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6936
+msgid "Canon PIXMA MP495"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6937
+msgid "Canon PIXMA MP500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6938
+msgid "Canon PIXMA MP510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6939
+msgid "Canon PIXMA MP520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6940
+msgid "Canon PIXMA MP530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6941
+msgid "Canon PIXMA MP540"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6942
+msgid "Canon PIXMA MP550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6943
+msgid "Canon PIXMA MP560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6944
+msgid "Canon PIXMA MP600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6945
+msgid "Canon PIXMA MP600R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6946
+msgid "Canon PIXMA MP610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6947
+msgid "Canon PIXMA MP620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6948
+msgid "Canon PIXMA MP630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6949
+msgid "Canon PIXMA MP640"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6950
+msgid "Canon PIXMA MP700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6951
+msgid "Canon PIXMA MP710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6952
+msgid "Canon PIXMA MP730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6953
+msgid "Canon PIXMA MP740"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6954
+msgid "Canon PIXMA MP750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6955
+msgid "Canon PIXMA MP760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6956
+msgid "Canon PIXMA MP770"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6957
+msgid "Canon PIXMA MP780"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6958
+msgid "Canon PIXMA MP790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6959
+msgid "Canon PIXMA MP800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6960
+msgid "Canon PIXMA MP800R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6961
+msgid "Canon PIXMA MP810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6962
+msgid "Canon PIXMA MP830"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6963
+msgid "Canon PIXMA MP900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6964
+msgid "Canon PIXMA MP950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6965
+msgid "Canon PIXMA MP960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6966
+msgid "Canon PIXMA MP970"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6967
+msgid "Canon PIXMA MP980"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6968
+msgid "Canon PIXMA MP990"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6969
+msgid "Canon PIXUS iP2700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6970
+msgid "Canon PIXUS iP3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6971
+msgid "Canon PIXUS iP4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6972
+msgid "Canon PIXMA MG2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6973
+msgid "Canon PIXMA MG3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6974
+msgid "Canon PIXMA MG4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6975
+msgid "Canon PIXMA MG5100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6976
+msgid "Canon PIXMA MG5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6977
+msgid "Canon PIXMA MG5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6978
+msgid "Canon PIXMA MG6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6979
+msgid "Canon PIXMA MG6200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6980
+msgid "Canon PIXMA MG8100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6981
+msgid "Canon PIXMA MG8200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6982
+msgid "Canon PIXMA MX300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6983
+msgid "Canon PIXMA MX310"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6984
+msgid "Canon PIXMA MX320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6985
+msgid "Canon PIXMA MX330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6986
+msgid "Canon PIXMA MX340"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6987
+msgid "Canon PIXMA MX350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6988
+msgid "Canon PIXMA MX360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6989
+msgid "Canon PIXMA MX370"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6990
+msgid "Canon PIXMA MX410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6991
+msgid "Canon PIXMA MX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6992
+msgid "Canon PIXMA MX430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6993
+msgid "Canon PIXMA MX510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6994
+msgid "Canon PIXMA MX700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6995
+msgid "Canon PIXMA MX710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6996
+msgid "Canon PIXMA MX850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6997
+msgid "Canon PIXMA MX860"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6998
+msgid "Canon PIXMA MX870"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6999
+msgid "Canon PIXMA MX880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7000
+msgid "Canon PIXMA MX890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7001
+msgid "Canon PIXMA MX7600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7002
+msgid "Canon PIXMA E500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7003
+msgid "Canon PIXMA E600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7004
+msgid "Canon 50i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7005
+msgid "Canon 80i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7006
+msgid "Canon 450i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7007
+msgid "Canon 455i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7008
+msgid "Canon 470PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7009
+msgid "Canon 475PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7010
+msgid "Canon 550i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7011
+msgid "Canon 560i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7012
+msgid "Canon 850i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7013
+msgid "Canon 860i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7014
+msgid "Canon 865R"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7015
+msgid "Canon 900PD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7016
+msgid "Canon 950i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7017
+msgid "Canon 960i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7018
+msgid "Canon 990i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7019
+msgid "Canon 6100i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7020
+msgid "Canon 6500i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7021
+msgid "Canon 9100i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7022
+msgid "Canon 9900i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7023
+msgid "Canon i70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7024
+msgid "Canon i80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7025
+msgid "Canon i450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7026
+msgid "Canon i450X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Canon i455"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7028
+msgid "Canon i455X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7029
+msgid "Canon i470D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7030
+msgid "Canon i475D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7031
+msgid "Canon i550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7032
+msgid "Canon i550X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7033
+msgid "Canon i560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7034
+msgid "Canon i560X"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Canon i850old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7036
+msgid "Canon i850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Canon i860old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7038
+msgid "Canon i860"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Canon i865old"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7040
+msgid "Canon i865"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7041
+msgid "Canon i900D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7042
+msgid "Canon i905D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7043
+msgid "Canon i950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7044
+msgid "Canon i960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7045
+msgid "Canon i965"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7046
+msgid "Canon i990"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7047
+msgid "Canon i6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7048
+msgid "Canon i6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7049
+msgid "Canon i9100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7050
+msgid "Canon i9900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7051
+msgid "Canon i9950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7052
+msgid "Epson Artisan 50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7053
+msgid "Epson Artisan 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7054
+msgid "Epson Artisan 710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7055
+msgid "Epson Artisan 800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7056
+msgid "Epson Artisan 810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7057
+msgid "Epson Artisan 835"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7058
+msgid "Epson B-300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7059
+msgid "Epson B-308"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7060
+msgid "Epson B-310"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7061
+msgid "Epson B-310N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7062
+msgid "Epson B-500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7063
+msgid "Epson B-508DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7064
+msgid "Epson B-510DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7065
+msgid "Epson Stylus C20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7066
+msgid "Epson Stylus C20SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7067
+msgid "Epson Stylus C20UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7068
+msgid "Epson Stylus C40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7069
+msgid "Epson Stylus C40SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7070
+msgid "Epson Stylus C40UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7071
+msgid "Epson Stylus C41"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7072
+msgid "Epson Stylus C41SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7073
+msgid "Epson Stylus C41UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7074
+msgid "Epson Stylus C42"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7075
+msgid "Epson Stylus C42SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7076
+msgid "Epson Stylus C42UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7077
+msgid "Epson Stylus C43"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7078
+msgid "Epson Stylus C43SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7079
+msgid "Epson Stylus C43UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7080
+msgid "Epson Stylus C44"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7081
+msgid "Epson Stylus C44SX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7082
+msgid "Epson Stylus C44UX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7083
+msgid "Epson Stylus C45"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7084
+msgid "Epson Stylus C46"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7085
+msgid "Epson Stylus C48"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7086
+msgid "Epson Stylus C50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7087
+msgid "Epson Stylus C60"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7088
+msgid "Epson Stylus C61"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7089
+msgid "Epson Stylus C62"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7090
+msgid "Epson Stylus C63"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7091
+msgid "Epson Stylus C64"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7092
+msgid "Epson Stylus C65"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7093
+msgid "Epson Stylus C66"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7094
+msgid "Epson Stylus C68"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7095
+msgid "Epson Stylus C70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7096
+msgid "Epson Stylus C79"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7097
+msgid "Epson Stylus C80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7098
+msgid "Epson Stylus C82"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7099
+msgid "Epson Stylus C83"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7100
+msgid "Epson Stylus C84"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7101
+msgid "Epson Stylus C85"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7102
+msgid "Epson Stylus C86"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7103
+msgid "Epson Stylus C87"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7104
+msgid "Epson Stylus C88"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7105
+msgid "Epson Stylus C110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7106
+msgid "Epson Stylus C120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7107
+msgid "Epson Stylus Color"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7108
+msgid "Epson Stylus Color I"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7109
+msgid "Epson Stylus Color II"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7110
+msgid "Epson Stylus Color IIs"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7111
+msgid "Epson Stylus Color PRO"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7112
+msgid "Epson Stylus Pro XL"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7113
+msgid "Epson Stylus Color 400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7114
+msgid "Epson Stylus Color 440"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7115
+msgid "Epson Stylus Color 460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7116
+msgid "Epson Stylus Color 480"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7117
+msgid "Epson Stylus Color 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7118
+msgid "Epson Stylus Color 580"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7119
+msgid "Epson Stylus Color 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7120
+msgid "Epson Stylus Color 640"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7121
+msgid "Epson Stylus Color 660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7122
+msgid "Epson Stylus Color 670"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7123
+msgid "Epson Stylus Color 680"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7124
+msgid "Epson Stylus Color 740"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Epson Stylus Color 760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Epson Stylus Color 777"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Epson Stylus Color 800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Epson Stylus Color 850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Epson Stylus Color 860"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Epson Stylus Color 880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Epson Stylus Color 8 3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Epson Stylus Color 900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Epson Stylus Color 980"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Epson Stylus Color 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Epson Stylus Color 1500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Epson Stylus Color 1520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Epson Stylus Color 3000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Epson Stylus Office B30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Epson Stylus Office B33"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Epson Stylus Office B40W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Epson Stylus Office B1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Epson Stylus Office T30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Epson Stylus Office T33"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Epson Stylus Office T40W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Epson Stylus Office T1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Epson Stylus Office T1110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7147
+msgid "Epson Stylus Office BX300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7148
+msgid "Epson Stylus Office BX535WD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7149
+msgid "Epson Stylus Office BX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7150
+msgid "Epson Stylus Office BX630FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7151
+msgid "Epson Stylus Office BX635FWD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7152
+msgid "Epson Stylus Office SX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7153
+msgid "Epson Stylus Office TX300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7154
+msgid "Epson Stylus Office TX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7155
+msgid "Epson Stylus Office TX620FWD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7156
+msgid "Epson Stylus Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7157
+msgid "Epson Stylus Photo 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7158
+msgid "Epson Stylus Photo EX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7159
+msgid "Epson Stylus Photo EX3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7160
+msgid "Epson Stylus Photo 720"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7161
+msgid "Epson Stylus Photo 750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7162
+msgid "Epson Stylus Photo 780"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7163
+msgid "Epson Stylus Photo 785"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7164
+msgid "Epson Stylus Photo 790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7165
+msgid "Epson Stylus Photo 810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7166
+msgid "Epson Stylus Photo 820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7167
+msgid "Epson Stylus Photo 825"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7168
+msgid "Epson Stylus Photo 830"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7169
+msgid "Epson Stylus Photo 830U"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7170
+msgid "Epson Stylus Photo 870"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7171
+msgid "Epson Stylus Photo 875"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7172
+msgid "Epson Stylus Photo 890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7173
+msgid "Epson Stylus Photo 895"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7174
+msgid "Epson Stylus Photo 900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7175
+msgid "Epson Stylus Photo 915"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7176
+msgid "Epson Stylus Photo 925"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7177
+msgid "Epson Stylus Photo 935"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7178
+msgid "Epson Stylus Photo 950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7179
+msgid "Epson Stylus Photo 960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7180
+msgid "Epson Stylus Photo 1200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7181
+msgid "Epson Stylus Photo 1270"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7182
+msgid "Epson Stylus Photo 1280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7183
+msgid "Epson Stylus Photo 1290"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7184
+msgid "Epson Stylus Photo 1290s"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7185
+msgid "Epson Stylus Photo 1400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7186
+msgid "Epson Stylus Photo 1410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7187
+msgid "Epson Stylus Photo 2000P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7188
+msgid "Epson Stylus Photo 2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7189
+msgid "Epson Stylus Photo 2200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7190
+msgid "Epson Stylus Photo P50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7191
+msgid "Epson Stylus Photo R200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7192
+msgid "Epson Stylus Photo R210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7193
+msgid "Epson Stylus Photo R220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7194
+msgid "Epson Stylus Photo R230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7195
+msgid "Epson Stylus Photo R240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7196
+msgid "Epson Stylus Photo R245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7197
+msgid "Epson Stylus Photo R260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7198
+msgid "Epson Stylus Photo R265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7199
+msgid "Epson Stylus Photo R270"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7200
+msgid "Epson Stylus Photo R280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7201
+msgid "Epson Stylus Photo R285"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7202
+msgid "Epson Stylus Photo R290"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7203
+msgid "Epson Stylus Photo R300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7204
+msgid "Epson Stylus Photo R310"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7205
+msgid "Epson Stylus Photo R320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7206
+msgid "Epson Stylus Photo R340"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7207
+msgid "Epson Stylus Photo R350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7208
+msgid "Epson Stylus Photo R360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7209
+msgid "Epson Stylus Photo R380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7210
+msgid "Epson Stylus Photo R390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7211
+msgid "Epson Stylus Photo R800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7212
+msgid "Epson Stylus Photo R1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7213
+msgid "Epson Stylus Photo R1900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7214
+msgid "Epson Stylus Photo R2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7215
+msgid "Epson Stylus Photo R2400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7216
+msgid "Epson Stylus Photo R2880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7217
+msgid "Epson Stylus Photo R3000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7218
+msgid "Epson Stylus Photo RX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7219
+msgid "Epson Stylus Photo RX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7220
+msgid "Epson Stylus Photo RX425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7221
+msgid "Epson Stylus Photo RX430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7222
+msgid "Epson Stylus Photo RX500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7223
+msgid "Epson Stylus Photo RX510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7224
+msgid "Epson Stylus Photo RX560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7225
+msgid "Epson Stylus Photo RX580"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7226
+msgid "Epson Stylus Photo RX585"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7227
+msgid "Epson Stylus Photo RX590"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7228
+msgid "Epson Stylus Photo RX595"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7229
+msgid "Epson Stylus Photo RX600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7230
+msgid "Epson Stylus Photo RX610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7231
+msgid "Epson Stylus Photo RX620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7232
+msgid "Epson Stylus Photo RX630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7233
+msgid "Epson Stylus Photo RX640"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7234
+msgid "Epson Stylus Photo RX650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7235
+msgid "Epson Stylus Photo RX680"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7236
+msgid "Epson Stylus Photo RX685"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7237
+msgid "Epson Stylus Photo RX690"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7238
+msgid "Epson Stylus Photo RX700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7239
+msgid "Epson Stylus Photo TX700W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7240
+msgid "Epson Stylus Photo TX710W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7241
+msgid "Epson Stylus Photo TX800FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7242
+msgid "Epson Stylus Photo TX810FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7243
+msgid "Epson Stylus Pro 3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7244
+msgid "Epson Stylus Pro 3880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7245
+msgid "Epson Stylus Pro 3885"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7246
+msgid "Epson Stylus Pro 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7247
+msgid "Epson Stylus Pro 4800/4880 Back Compatible"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7248
+msgid "Epson Stylus Pro 4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7249
+msgid "Epson Stylus Pro 4880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7250
+msgid "Epson Stylus Pro 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7251
+msgid "Epson Stylus Pro 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7252
+msgid "Epson Stylus Pro 7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7253
+msgid "Epson Stylus Pro 7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7254
+msgid "Epson Stylus Pro 7600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7255
+msgid "Epson Stylus Pro 7700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7256
+msgid "Epson Stylus Pro 7800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7257
+msgid "Epson Stylus Pro 7880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7258
+msgid "Epson Stylus Pro 7890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7259
+msgid "Epson Stylus Pro 7900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7260
+msgid "Epson Stylus Pro 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7261
+msgid "Epson Stylus Pro 9500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7262
+msgid "Epson Stylus Pro 9600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7263
+msgid "Epson Stylus Pro 9700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7264
+msgid "Epson Stylus Pro 9800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7265
+msgid "Epson Stylus Pro 9880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7266
+msgid "Epson Stylus Pro 9890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7267
+msgid "Epson Stylus Pro 9900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7268
+msgid "Epson Stylus Pro 10000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7269
+msgid "Epson Stylus Pro 11800/11880 Back Compatible"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7270
+msgid "Epson Stylus Pro 11800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7271
+msgid "Epson Stylus Pro 11880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7272
+msgid "Epson Stylus Scan 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7273
+msgid "Epson Stylus Scan 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7274
+msgid "Epson Stylus CX1500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7275
+msgid "Epson Stylus CX3100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7276
+msgid "Epson Stylus CX3200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7277
+msgid "Epson Stylus CX3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7278
+msgid "Epson Stylus CX3600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7279
+msgid "Epson Stylus CX3650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7280
+msgid "Epson Stylus CX3700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7281
+msgid "Epson Stylus CX3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7282
+msgid "Epson Stylus CX3805"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7283
+msgid "Epson Stylus CX3810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7284
+msgid "Epson Stylus CX3900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7285
+msgid "Epson Stylus CX4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7286
+msgid "Epson Stylus CX4200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7287
+msgid "Epson Stylus CX4400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7288
+msgid "Epson Stylus CX4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7289
+msgid "Epson Stylus CX4600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7290
+msgid "Epson Stylus CX4700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7291
+msgid "Epson Stylus CX4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7292
+msgid "Epson Stylus CX4900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7293
+msgid "Epson Stylus CX5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7294
+msgid "Epson Stylus CX5000F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7295
+msgid "Epson Stylus CX5100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7296
+msgid "Epson Stylus CX5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7297
+msgid "Epson Stylus CX5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7298
+msgid "Epson Stylus CX5400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7299
+msgid "Epson Stylus CX5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7300
+msgid "Epson Stylus CX5600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7301
+msgid "Epson Stylus CX5700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7302
+msgid "Epson Stylus CX5800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7303
+msgid "Epson Stylus CX6000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7304
+msgid "Epson Stylus CX6300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7305
+msgid "Epson Stylus CX6400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7306
+msgid "Epson Stylus CX6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7307
+msgid "Epson Stylus CX6600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7308
+msgid "Epson Stylus CX7000F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7309
+msgid "Epson Stylus CX7400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7310
+msgid "Epson Stylus CX7700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7311
+msgid "Epson Stylus CX7800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7312
+msgid "Epson Stylus CX8300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7313
+msgid "Epson Stylus CX8400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7314
+msgid "Epson Stylus CX9300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7315
+msgid "Epson Stylus CX9400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7316
+msgid "Epson Stylus CX9400F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7317
+msgid "Epson Stylus CX9475F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7318
+msgid "Epson Stylus D68"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7319
+msgid "Epson Stylus D88"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7320
+msgid "Epson Stylus D92"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7321
+msgid "Epson Stylus D120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7322
+msgid "Epson Stylus DX3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7323
+msgid "Epson Stylus DX3850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7324
+msgid "Epson Stylus DX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7325
+msgid "Epson Stylus DX4050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7326
+msgid "Epson Stylus DX4200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7327
+msgid "Epson Stylus DX4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Epson Stylus DX4400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Epson Stylus DX4450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7330
+msgid "Epson Stylus DX4800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7331
+msgid "Epson Stylus DX4850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7332
+msgid "Epson Stylus DX7000F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7333
+msgid "Epson Stylus DX7400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7334
+msgid "Epson Stylus DX7450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7335
+msgid "Epson Stylus DX8400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7336
+msgid "Epson Stylus DX8450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7337
+msgid "Epson Stylus DX9400F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7338
+msgid "Epson Stylus NX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Epson Stylus NX105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Epson Stylus NX115"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Epson Stylus NX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Epson Stylus NX215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7343
+msgid "Epson Stylus NX300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7344
+msgid "Epson Stylus NX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7345
+msgid "Epson Stylus NX415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7346
+msgid "Epson Stylus NX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7347
+msgid "Epson Stylus NX515"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7348
+msgid "Epson Stylus NX530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7349
+msgid "Epson Stylus NX635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7350
+msgid "Epson Stylus Photo PX650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7351
+msgid "Epson Stylus Photo PX700W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7352
+msgid "Epson Stylus Photo PX710W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7353
+msgid "Epson Stylus Photo PX800FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7354
+msgid "Epson Stylus Photo PX810FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Epson Stylus S20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7356
+msgid "Epson Stylus S21"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Epson Stylus S50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7358
+msgid "Epson Stylus SX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7359
+msgid "Epson Stylus SX105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7360
+msgid "Epson Stylus SX110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7361
+msgid "Epson Stylus SX115"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7362
+msgid "Epson Stylus SX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7363
+msgid "Epson Stylus SX205"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7364
+msgid "Epson Stylus SX210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7365
+msgid "Epson Stylus SX215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7366
+msgid "Epson Stylus SX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7367
+msgid "Epson Stylus SX405"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7368
+msgid "Epson Stylus SX410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7369
+msgid "Epson Stylus SX415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7370
+msgid "Epson Stylus SX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7371
+msgid "Epson Stylus SX510W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7372
+msgid "Epson Stylus SX515"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7373
+msgid "Epson Stylus SX525"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7374
+msgid "Epson Stylus SX535FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7375
+msgid "Epson Stylus SX600FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7376
+msgid "Epson Stylus SX610FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7377
+msgid "Epson Stylus SX615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7378
+msgid "Epson Stylus SX650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7379
+msgid "Epson Stylus T13"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7380
+msgid "Epson Stylus T20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7381
+msgid "Epson Stylus T21"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7382
+msgid "Epson Stylus T22"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7383
+msgid "Epson Stylus T22E"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7384
+msgid "Epson Stylus T26"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7385
+msgid "Epson Stylus T30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7386
+msgid "Epson Stylus T40W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7387
+msgid "Epson Stylus T50"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7388
+msgid "Epson Stylus T59"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7389
+msgid "Epson Stylus T60"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7390
+msgid "Epson Stylus TX100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7391
+msgid "Epson Stylus TX101"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7392
+msgid "Epson Stylus TX102"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7393
+msgid "Epson Stylus TX103"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7394
+msgid "Epson Stylus TX104"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7395
+msgid "Epson Stylus TX105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7396
+msgid "Epson Stylus TX106"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7397
+msgid "Epson Stylus TX109"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7398
+msgid "Epson Stylus TX110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7399
+msgid "Epson Stylus TX200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7400
+msgid "Epson Stylus TX210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7401
+msgid "Epson Stylus TX300F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7402
+msgid "Epson Stylus TX400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7403
+msgid "Epson Stylus TX410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7404
+msgid "Epson Stylus TX420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7405
+msgid "Epson Stylus TX510FN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7406
+msgid "Epson Stylus TX550W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7407
+msgid "Epson Stylus TX610FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7408
+msgid "Epson Stylus TX615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7409
+msgid "Epson Stylus TX650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7410
+msgid "Epson Stylus TX659"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7411
+msgid "Epson PictureMate"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7412
+msgid "Epson PictureMate Dash"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7413
+msgid "Epson PictureMate Deluxe"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7414
+msgid "Epson PictureMate Flash"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7415
+msgid "Epson PictureMate Pal"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7416
+msgid "Epson PictureMate Snap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7417
+msgid "Epson PictureMate 100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7418
+msgid "Epson PictureMate 200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Epson PictureMate 210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
+msgid "Epson PictureMate 215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7421
+msgid "Epson PictureMate 240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7422
+msgid "Epson PictureMate 250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7423
+msgid "Epson PictureMate 260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7424
+msgid "Epson PictureMate 270"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7425
+msgid "Epson PictureMate 280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7426
+msgid "Epson PictureMate 290"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7427
+msgid "Epson PictureMate 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7428
+msgid "Epson PictureMate 2005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7429
+msgid "Epson WorkForce 30"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7430
+msgid "Epson WorkForce 40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7431
+msgid "Epson WorkForce 310"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7432
+msgid "Epson WorkForce 315"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7433
+msgid "Epson WorkForce 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7434
+msgid "Epson WorkForce 545"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7435
+msgid "Epson WorkForce 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7436
+msgid "Epson WorkForce 610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7437
+msgid "Epson WorkForce 615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7438
+msgid "Epson WorkForce 630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Epson WorkForce 635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Epson WorkForce 645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
+msgid "Epson WorkForce 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7442
+msgid "Epson CL 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7443
+msgid "Epson CL 750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7444
+msgid "Epson CL 760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7445
+msgid "Epson E 100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7446
+msgid "Epson E 150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7447
+msgid "Epson E 200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7448
+msgid "Epson E 300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7449
+msgid "Epson E 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7450
+msgid "Epson E 520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7451
+msgid "Epson E 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7452
+msgid "Epson E 720"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7453
+msgid "Epson EM 900C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7454
+msgid "Epson EM 930C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7455
+msgid "Epson EP 302"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7456
+msgid "Epson EP 702A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7457
+msgid "Epson EP 801A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7458
+msgid "Epson EP 901A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7459
+msgid "Epson EP 901F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7460
+msgid "Epson MC 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7461
+msgid "Epson MC 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7462
+msgid "Epson MC 7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7463
+msgid "Epson MC 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7464
+msgid "Epson MC 10000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7465
+msgid "Epson ME 300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7466
+msgid "Epson ME 320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7467
+msgid "Epson ME Office 70"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7468
+msgid "Epson ME Office 80W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7469
+msgid "Epson ME Office 360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7470
+msgid "Epson ME Office 600F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7471
+msgid "Epson ME Office 620F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7472
+msgid "Epson ME Office 700FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7473
+msgid "Epson ME Office 940FW"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7474
+msgid "Epson ME Office 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7475
+msgid "Epson MJ 930C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7476
+msgid "Epson MJ 5100C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7477
+msgid "Epson MJ 6000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7478
+msgid "Epson MJ 8000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7479
+msgid "Epson PM 670C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7480
+msgid "Epson PM 700C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7481
+msgid "Epson PM 730C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7482
+msgid "Epson PM 740C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7483
+msgid "Epson PM 750C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7484
+msgid "Epson PM 760C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7485
+msgid "Epson PM 770C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7486
+msgid "Epson PM 780C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7487
+msgid "Epson PM 790PT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7488
+msgid "Epson PM 800C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7489
+msgid "Epson PM 850PT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7490
+msgid "Epson PM 870C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7491
+msgid "Epson PM 880C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7492
+msgid "Epson PM 930C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7493
+msgid "Epson PM 940C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7494
+msgid "Epson PM 950C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7495
+msgid "Epson PM 970C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7496
+msgid "Epson PM 980C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7497
+msgid "Epson PM 2000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7498
+msgid "Epson PM 2200C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7499
+msgid "Epson PM 3000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7500
+msgid "Epson PM 3300C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7501
+msgid "Epson PM 3500C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7502
+msgid "Epson PM 3700C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7503
+msgid "Epson PM 4000PX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7504
+msgid "Epson PM 5000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7505
+msgid "Epson PM 7000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7506
+msgid "Epson PM 9000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7507
+msgid "Epson PM 10000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7508
+msgid "Epson PM A650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7509
+msgid "Epson PM A750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7510
+msgid "Epson PM A820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7511
+msgid "Epson PM A890"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7512
+msgid "Epson PM A900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7513
+msgid "Epson PM A940"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7514
+msgid "Epson PM A950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7515
+msgid "Epson PM D600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7516
+msgid "Epson PM D750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7517
+msgid "Epson PM D770"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7518
+msgid "Epson PM D800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7519
+msgid "Epson PM D870"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7520
+msgid "Epson PM D1000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7521
+msgid "Epson PM G700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7522
+msgid "Epson PM G720"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7523
+msgid "Epson PM G730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7524
+msgid "Epson PM G800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7525
+msgid "Epson PM G820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7526
+msgid "Epson PM G850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7527
+msgid "Epson PM T960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7528
+msgid "Epson PM G4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7529
+msgid "Epson PX A650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7530
+msgid "Epson Offirio PX B300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7531
+msgid "Epson Offirio PX B500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7532
+msgid "Epson PX 7V"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7533
+msgid "Epson PX 101"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7534
+msgid "Epson PX 201"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7535
+msgid "Epson PX 204"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7536
+msgid "Epson PX 401A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7537
+msgid "Epson PX 504A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7538
+msgid "Epson PX 601F"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7539
+msgid "Epson PX 1001"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7540
+msgid "Epson PX G900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7541
+msgid "Epson PX G920"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7542
+msgid "Epson PX G5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7543
+msgid "Epson PX G5300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7544
+msgid "Epson PX V500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7545
+msgid "Epson PX V600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7546
+msgid "Epson PX V630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7547
+msgid "Epson PX V780"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7548
+msgid "Epson PX 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7549
+msgid "Epson PX G5600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7550
+msgid "Epson PX 7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7551
+msgid "Epson PX 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7552
+msgid "Apollo P-2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7553
+msgid "Apollo P-2150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7554
+msgid "Apollo P-2200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7555
+msgid "Apollo P-2250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7556
+msgid "Apollo P-2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7557
+msgid "Apollo P-2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7558
+msgid "Apollo P-2600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7559
+msgid "Apollo P-2650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7560
+msgid "Apple Color StyleWriter 4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7561
+msgid "Apple Color StyleWriter 4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7562
+msgid "Apple Color StyleWriter 6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7563
+msgid "Apple LaserWriter Select 360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7564
+msgid "Brother DCP-1200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7565
+msgid "Brother DCP-8045D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7566
+msgid "Brother HL-1040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7567
+msgid "Brother HL-1050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7568
+msgid "Brother HL-1060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7569
+msgid "Brother HL-1070"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7570
+msgid "Brother HL-10V"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7571
+msgid "Brother HL-10h"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7572
+msgid "Brother HL-1240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7573
+msgid "Brother HL-1250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7574
+msgid "Brother HL-1260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7575
+msgid "Brother HL-1270N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7576
+msgid "Brother HL-1430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7577
+msgid "Brother HL-1440"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7578
+msgid "Brother HL-1450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7579
+msgid "Brother HL-1470N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7580
+msgid "Brother HL-1650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7581
+msgid "Brother HL-1660e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7582
+msgid "Brother HL-1670N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7583
+msgid "Brother HL-1850"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7584
+msgid "Brother HL-1870N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7585
+msgid "Brother HL-2030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7586
+msgid "Brother HL-2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7587
+msgid "Brother HL-2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7588
+msgid "Brother HL-2460"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7589
+msgid "Brother HL-2460N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7590
+msgid "Brother HL-4Ve"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7591
+msgid "Brother HL-5030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7592
+msgid "Brother HL-5040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7593
+msgid "Brother HL-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7594
+msgid "Brother HL-5070N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7595
+msgid "Brother HL-5140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7596
+msgid "Brother HL-5150D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7597
+msgid "Brother HL-5170DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7598
+msgid "Brother HL-630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7599
+msgid "Brother HL-660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7600
+msgid "Brother HL-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7601
+msgid "Brother HL-7050N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7602
+msgid "Brother HL-760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7603
+msgid "Brother HL-960"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7604
+msgid "Brother MFC-6550MC"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7605
+msgid "Brother MFC-8300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7606
+msgid "Brother MFC-9500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7607
+msgid "Brother MFC-9600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7608
+msgid "Canon GP 335"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7609
+msgid "Canon LBP-4sx"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7610
+msgid "Canon LBP-430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7611
+msgid "Canon LBP-1000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7612
+msgid "Canon LBP-1260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7613
+msgid "Canon LBP-1760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7614
+msgid "Canon LBP-3360"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7615
+msgid "Canon imageRunner 330s"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7616
+msgid "Citizen ProJet II"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7617
+msgid "DEC 1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7618
+msgid "DEC LN17"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7619
+msgid "Epson ActionLaser 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7620
+msgid "Epson ActionLaser II"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7621
+msgid "Epson AL-C2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7622
+msgid "Epson AL-C2000 PS3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7623
+msgid "Epson AL-C8500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7624
+msgid "Epson AL-C8500PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7625
+msgid "Epson AL-C8600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7626
+msgid "Epson AL-C8600 PS3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7627
+msgid "Epson EPL-5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7628
+msgid "Epson EPL-5200+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7629
+msgid "Epson EPL-5700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7630
+msgid "Epson EPL-5700PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7631
+msgid "Epson EPL-5800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7632
+msgid "Epson EPL-5800PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7633
+msgid "Epson EPL-5900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7634
+msgid "Epson EPL-5900 PS3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7635
+msgid "Epson EPL-6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7636
+msgid "Epson EPL-6100 PS3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7637
+msgid "Epson EPL-7100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7638
+msgid "Epson EPL-N2050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7639
+msgid "Epson EPL-N2050+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7640
+msgid "Epson EPL-N2050PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7641
+msgid "Epson EPL-N2050PS+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7642
+msgid "Epson EPL-N2120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7643
+msgid "Epson EPL-N2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7644
+msgid "Epson EPL-N2500 PS3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7645
+msgid "Epson EPL-N2750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7646
+msgid "Epson EPL-N2750PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7647
+msgid "Fujitsu PrintPartner 10V"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7648
+msgid "Fujitsu PrintPartner 16DV"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7649
+msgid "Fujitsu PrintPartner 20W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7650
+msgid "Fujitsu PrintPartner 8000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7651
+msgid "Generic PCL 4 Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7652
+msgid "Generic PCL 4 LF Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7653
+msgid "Generic PCL 5 Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7654
+msgid "Generic PCL 5 LF Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7655
+msgid "Generic PCL 5c Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7656
+msgid "Generic PCL 5c LF Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7657
+msgid "Generic PCL 5e Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7658
+msgid "Generic PCL 5e LF Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7659
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7660
+msgid "Generic PCL 6/PCL XL LF Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7661
+msgid "Gestetner 10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7662
+msgid "Gestetner 2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7663
+msgid "Gestetner 2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7664
+msgid "Gestetner 3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7665
+msgid "Gestetner 3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7666
+msgid "Gestetner 3532/4235g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7667
+msgid "Gestetner 4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7668
+msgid "Gestetner 4532/4245g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7669
+msgid "Gestetner 6002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7670
+msgid "Gestetner 7502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7671
+msgid "Gestetner 9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7672
+msgid "Gestetner DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7673
+msgid "Gestetner DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7674
+msgid "Gestetner DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7675
+msgid "Gestetner DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7676
+msgid "Gestetner DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7677
+msgid "Gestetner DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7678
+msgid "Gestetner DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7679
+msgid "Gestetner DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7680
+msgid "Gestetner DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7681
+msgid "Gestetner DSm635/635G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7682
+msgid "Gestetner DSm645/645G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7683
+msgid "Gestetner DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7684
+msgid "Gestetner DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7685
+msgid "Gestetner DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7686
+msgid "Gestetner DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7687
+msgid "Gestetner DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7688
+msgid "Gestetner DSm735/735G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7689
+msgid "Gestetner DSm745/745G"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7690
+msgid "Gestetner MP1100/DSm7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7691
+msgid "Gestetner MP1350/DSm7135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7692
+msgid "Gestetner MP1600/DSm716"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7693
+msgid "Gestetner MP2000/DSm721d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7694
+msgid "Gestetner MP2500/DSm625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7695
+msgid "Gestetner MP3500/DSm735e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7696
+msgid "Gestetner MP4500/DSm745e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7697
+msgid "Gestetner MP5500/DSm755"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7698
+msgid "Gestetner MP6500/DSm765"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7699
+msgid "Gestetner MP7500/DSm775"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7700
+msgid "Gestetner MP9000/DSm790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7701
+msgid "Gestetner MP 161/DSm416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7702
+msgid "Gestetner MP 2510/DSm725e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7703
+msgid "Gestetner MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7704
+msgid "Gestetner MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7705
+msgid "Gestetner MP 3010/DSm730e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7706
+msgid "Gestetner MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7707
+msgid "Gestetner MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7708
+msgid "Gestetner MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7709
+msgid "Gestetner MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7710
+msgid "Gestetner MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7711
+msgid "Gestetner MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7712
+msgid "HP Business Inkjet 2200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7713
+msgid "HP Business Inkjet 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7714
+msgid "HP Business Inkjet 2250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7715
+msgid "HP Business Inkjet 2250TN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7716
+msgid "HP Business Inkjet 2280"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7717
+msgid "HP Color Inkjet Printer CP1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7718
+msgid "HP Color Inkjet Printer CP1700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7719
+msgid "HP Color LaserJet 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7720
+msgid "HP Color LaserJet 4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7721
+msgid "HP Color LaserJet 4550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7722
+msgid "HP Color LaserJet 4600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7723
+msgid "HP Color LaserJet 5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7724
+msgid "HP Color LaserJet 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7725
+msgid "HP Color LaserJet 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7726
+msgid "HP Color LaserJet 8550GN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7727
+msgid "HP DesignJet 230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7728
+msgid "HP DesignJet 250C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7729
+msgid "HP DesignJet 430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7730
+msgid "HP DesignJet 450C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7731
+msgid "HP DesignJet 455CA"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7732
+msgid "HP DesignJet 488CA"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7733
+msgid "HP DesignJet 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7734
+msgid "HP DesignJet 750C Plus"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7735
+msgid "HP DesignJet 750C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7736
+msgid "HP DesignJet 2500CP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7737
+msgid "HP DesignJet 3500CP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7738
+msgid "HP DesignJet ColorPro CAD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7739
+msgid "HP DeskJet 400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7740
+msgid "HP DeskJet 420C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7741
+msgid "HP DeskJet 450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7742
+msgid "HP DeskJet 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7743
+msgid "HP DeskJet 500C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7744
+msgid "HP DeskJet 505J Plus"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7745
+msgid "HP DeskJet 510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7746
+msgid "HP DeskJet 520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7747
+msgid "HP DeskJet 540C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7748
+msgid "HP DeskJet 550C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7749
+msgid "HP DeskJet 5550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7750
+msgid "HP DeskJet 5551"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7751
+msgid "HP DeskJet 560C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7752
+msgid "HP DeskJet 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7753
+msgid "HP DeskJet 600C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7754
+msgid "HP DeskJet 610C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7755
+msgid "HP DeskJet 610CL"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7756
+msgid "HP DeskJet 6122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7757
+msgid "HP DeskJet 6127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7758
+msgid "HP DeskJet 612C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7759
+msgid "HP DeskJet 640C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7760
+msgid "HP DeskJet 648C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7761
+msgid "HP DeskJet 660C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7762
+msgid "HP DeskJet 670C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7763
+msgid "HP DeskJet 670TV"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7764
+msgid "HP DeskJet 672C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7765
+msgid "HP DeskJet 680C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7766
+msgid "HP DeskJet 682C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7767
+msgid "HP DeskJet 690C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7768
+msgid "HP DeskJet 692C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7769
+msgid "HP DeskJet 693C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7770
+msgid "HP DeskJet 694C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7771
+msgid "HP DeskJet 695C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7772
+msgid "HP DeskJet 697C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7773
+msgid "HP DeskJet 810C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7774
+msgid "HP DeskJet 812C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7775
+msgid "HP DeskJet 815C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7776
+msgid "HP DeskJet 816C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7777
+msgid "HP DeskJet 825C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7778
+msgid "HP DeskJet 830C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7779
+msgid "HP DeskJet 832C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7780
+msgid "HP DeskJet 840C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7781
+msgid "HP DeskJet 841C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7782
+msgid "HP DeskJet 842C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7783
+msgid "HP DeskJet 843C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7784
+msgid "HP DeskJet 845C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7785
+msgid "HP DeskJet 850C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7786
+msgid "HP DeskJet 855C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7787
+msgid "HP DeskJet 870C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7788
+msgid "HP DeskJet 880C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7789
+msgid "HP DeskJet 882C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7790
+msgid "HP DeskJet 890C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7791
+msgid "HP DeskJet 895C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7792
+msgid "HP DeskJet 916C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7793
+msgid "HP DeskJet 920C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7794
+msgid "HP DeskJet 9300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7795
+msgid "HP DeskJet 930C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7796
+msgid "HP DeskJet 932C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7797
+msgid "HP DeskJet 933C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7798
+msgid "HP DeskJet 934C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7799
+msgid "HP DeskJet 935C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7800
+msgid "HP DeskJet 940C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7801
+msgid "HP DeskJet 948C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7802
+msgid "HP DeskJet 950C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7803
+msgid "HP DeskJet 952C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7804
+msgid "HP DeskJet 955C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7805
+msgid "HP DeskJet 957C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7806
+msgid "HP DeskJet 959C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7807
+msgid "HP DeskJet 960C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7808
+msgid "HP DeskJet 970C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7809
+msgid "HP DeskJet 975C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7810
+msgid "HP DeskJet 980C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7811
+msgid "HP DeskJet 990C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7812
+msgid "HP DeskJet 995C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7813
+msgid "HP DeskJet 1100C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7814
+msgid "HP DeskJet 1120C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7815
+msgid "HP DeskJet 1125C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7816
+msgid "HP DeskJet 1200C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7817
+msgid "HP DeskJet 1220C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7818
+msgid "HP DeskJet 1600C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7819
+msgid "HP DeskJet 1600CM"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7820
+msgid "HP DeskJet 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7821
+msgid "HP DeskJet 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7822
+msgid "HP DeskJet 2500CM"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7823
+msgid "HP DeskJet 340C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7824
+msgid "HP DeskJet 3810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7825
+msgid "HP DeskJet 3816"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7826
+msgid "HP DeskJet 3820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7827
+msgid "HP DeskJet 3822"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7828
+msgid "HP LaserJet 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7829
+msgid "HP LaserJet 2D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7830
+msgid "HP LaserJet 2P Plus"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7831
+msgid "HP LaserJet 2P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7832
+msgid "HP LaserJet 3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7833
+msgid "HP LaserJet 3D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7834
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7835
+msgid "HP LaserJet 3P w/PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7836
+msgid "HP LaserJet 4 Plus"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7837
+msgid "HP LaserJet 4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7838
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7839
+msgid "HP LaserJet 4M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7840
+msgid "HP LaserJet 4ML"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7841
+msgid "HP LaserJet 4P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7842
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7843
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7844
+msgid "HP LaserJet 5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7845
+msgid "HP LaserJet 5L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7846
+msgid "HP LaserJet 5M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7847
+msgid "HP LaserJet 5MP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7848
+msgid "HP LaserJet 5P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7849
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7850
+msgid "HP LaserJet 6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7851
+msgid "HP LaserJet 6L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7852
+msgid "HP LaserJet 6MP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7853
+msgid "HP LaserJet 6P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7854
+msgid "HP LaserJet 1010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7855
+msgid "HP LaserJet 1012"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7856
+msgid "HP LaserJet 1015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7857
+msgid "HP LaserJet 1022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7858
+msgid "HP LaserJet 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7859
+msgid "HP LaserJet 1100A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7860
+msgid "HP LaserJet 1150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7861
+msgid "HP LaserJet 1160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7862
+msgid "HP LaserJet 1200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7863
+msgid "HP LaserJet 1220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7864
+msgid "HP LaserJet 1300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7865
+msgid "HP LaserJet 1320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7866
+msgid "HP LaserJet 2100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7867
+msgid "HP LaserJet 2100M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7868
+msgid "HP LaserJet 2200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7869
+msgid "HP LaserJet 2300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7870
+msgid "HP LaserJet 2410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7871
+msgid "HP LaserJet 2420"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7872
+msgid "HP LaserJet 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7873
+msgid "HP LaserJet 3015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7874
+msgid "HP LaserJet 3020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7875
+msgid "HP LaserJet 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7876
+msgid "HP LaserJet 3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7877
+msgid "HP LaserJet 3052"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7878
+msgid "HP LaserJet 3055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7879
+msgid "HP LaserJet 3200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7880
+msgid "HP LaserJet 3200m"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7881
+msgid "HP LaserJet 3200se"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7882
+msgid "HP LaserJet 3300 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7883
+msgid "HP LaserJet 3310 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7884
+msgid "HP LaserJet 3320 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7885
+msgid "HP LaserJet 3320N MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7886
+msgid "HP LaserJet 3330 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7887
+msgid "HP LaserJet 3380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7888
+msgid "HP LaserJet 3390"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7889
+msgid "HP LaserJet 3392"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7890
+msgid "HP LaserJet 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7891
+msgid "HP LaserJet 4050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7892
+msgid "HP LaserJet 4100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7893
+msgid "HP LaserJet 4200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7894
+msgid "HP LaserJet 4240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7895
+msgid "HP LaserJet 4250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7896
+msgid "HP LaserJet 4300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7897
+msgid "HP LaserJet 4345 mfp"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7898
+msgid "HP LaserJet 4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7899
+msgid "HP LaserJet 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7900
+msgid "HP LaserJet 5100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7901
+msgid "HP LaserJet 5200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7902
+msgid "HP LaserJet 5200L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7903
+msgid "HP LaserJet 8000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7904
+msgid "HP LaserJet 8100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7905
+msgid "HP LaserJet 8150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7906
+msgid "HP LaserJet 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7907
+msgid "HP LaserJet 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7908
+msgid "HP LaserJet 9040 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7909
+msgid "HP LaserJet 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7910
+msgid "HP LaserJet 9050 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7911
+msgid "HP LaserJet M3027 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7912
+msgid "HP LaserJet M3035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7913
+msgid "HP LaserJet M4345 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7914
+msgid "HP LaserJet M5025 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7915
+msgid "HP LaserJet M5035 MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7916
+msgid "HP LaserJet P2010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7917
+msgid "HP LaserJet P2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7918
+msgid "HP LaserJet P3004"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7919
+msgid "HP LaserJet P3005"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7920
+msgid "HP Mopier 240"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7921
+msgid "HP Mopier 320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7922
+msgid "HP OfficeJet 300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7923
+msgid "HP OfficeJet 330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7924
+msgid "HP OfficeJet 350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7925
+msgid "HP OfficeJet 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7926
+msgid "HP OfficeJet 520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7927
+msgid "HP OfficeJet 570"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7928
+msgid "HP OfficeJet 580"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7929
+msgid "HP OfficeJet 590"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7930
+msgid "HP OfficeJet 600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7931
+msgid "HP OfficeJet 610"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7932
+msgid "HP OfficeJet 625"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7933
+msgid "HP OfficeJet 630"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7934
+msgid "HP OfficeJet 635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7935
+msgid "HP OfficeJet 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7936
+msgid "HP OfficeJet 710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7937
+msgid "HP OfficeJet 720"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7938
+msgid "HP OfficeJet 725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7939
+msgid "HP OfficeJet 5105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7940
+msgid "HP OfficeJet 5110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7941
+msgid "HP OfficeJet 5110xi"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7942
+msgid "HP OfficeJet 6105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7943
+msgid "HP OfficeJet 6110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7944
+msgid "HP OfficeJet 7110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7945
+msgid "HP OfficeJet 7130"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7946
+msgid "HP OfficeJet 7140"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7947
+msgid "HP OfficeJet D125"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7948
+msgid "HP OfficeJet D135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7949
+msgid "HP OfficeJet D145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7950
+msgid "HP OfficeJet D155"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7951
+msgid "HP OfficeJet G55"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7952
+msgid "HP OfficeJet G85"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7953
+msgid "HP OfficeJet G95"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7954
+msgid "HP OfficeJet K60"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7955
+msgid "HP OfficeJet K60xi"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7956
+msgid "HP OfficeJet K80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7957
+msgid "HP OfficeJet K80xi"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7958
+msgid "HP OfficeJet LX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7959
+msgid "HP OfficeJet Pro 1150C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7960
+msgid "HP OfficeJet Pro 1170C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7961
+msgid "HP OfficeJet Pro 1175C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7962
+msgid "HP OfficeJet R40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7963
+msgid "HP OfficeJet R45"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7964
+msgid "HP OfficeJet R60"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7965
+msgid "HP OfficeJet R65"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7966
+msgid "HP OfficeJet R80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7967
+msgid "HP OfficeJet T45"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7968
+msgid "HP OfficeJet T65"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7969
+msgid "HP OfficeJet V40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7970
+msgid "HP OfficeJet V40xi"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7971
+msgid "HP OfficeJet"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7972
+msgid "HP PSC 370"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7973
+msgid "HP PSC 380"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7974
+msgid "HP PSC 500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7975
+msgid "HP PSC 750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7976
+msgid "HP PSC 950"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7977
+msgid "HP PSC 950xi"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7978
+msgid "HP PSC 2110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7979
+msgid "HP PSC 2150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7980
+msgid "HP PSC 2210"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7981
+msgid "HP PhotoSmart 7150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7982
+msgid "HP PhotoSmart 7345"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7983
+msgid "HP PhotoSmart 7350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7984
+msgid "HP PhotoSmart 7550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7985
+msgid "HP PhotoSmart P100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7986
+msgid "HP PhotoSmart P130"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7987
+msgid "HP PhotoSmart P230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7988
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7989
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7990
+msgid "HP PhotoSmart P1115"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7991
+msgid "HP PhotoSmart P1215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7992
+msgid "HP PhotoSmart P1218"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7993
+msgid "HP PhotoSmart P1315"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7994
+msgid "HP e-printer e20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7995
+msgid "IBM 4019"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7996
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7997
+msgid "IBM 4312"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7998
+msgid "IBM Infoprint 12"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7999
+msgid "IBM Page Printer 3112"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8000
+msgid "Infotec 4353 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8001
+msgid "Infotec 4452 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8002
+msgid "Infotec 4651 MF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8003
+msgid "Infotec IS2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8004
+msgid "Infotec IS2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8005
+msgid "Infotec IS2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8006
+msgid "Infotec IS2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8007
+msgid "Infotec IS2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8008
+msgid "Infotec IS2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8009
+msgid "Infotec IS2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8010
+msgid "Infotec IS 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8011
+msgid "Infotec IS 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8012
+msgid "Infotec IS 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8013
+msgid "Infotec IS 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8014
+msgid "Infotec IS 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8015
+msgid "Infotec IS 2122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8016
+msgid "Infotec IS 2127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8017
+msgid "Infotec IS 2132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8018
+msgid "Infotec IS 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8019
+msgid "Infotec IS 2145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8020
+msgid "Infotec IS 2151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8021
+msgid "Infotec IS 2160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8022
+msgid "Infotec IS 2175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8023
+msgid "Infotec IS 2215"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8024
+msgid "Infotec IS 2216"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8025
+msgid "Infotec IS 2220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8026
+msgid "Infotec IS 2220D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8027
+msgid "Infotec IS 2225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8028
+msgid "Infotec IS 2230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8029
+msgid "Infotec IS 2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8030
+msgid "Infotec IS 2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8031
+msgid "Infotec IS 2255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8032
+msgid "Infotec IS 2265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8033
+msgid "Infotec IS 2275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8034
+msgid "Infotec IS 2316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8035
+msgid "Infotec IS 2320"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8036
+msgid "Infotec IS 2325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8037
+msgid "Infotec IS 2416"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8038
+msgid "Infotec IS 2425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8039
+msgid "Infotec IS 2430"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8040
+msgid "Infotec IS 2435"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8041
+msgid "Infotec IS 2445"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8042
+msgid "Infotec IS 3090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8043
+msgid "Infotec IS 3110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8044
+msgid "Infotec IS 3135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8045
+msgid "Infotec MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8046
+msgid "Infotec MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8047
+msgid "Infotec MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8048
+msgid "Infotec MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8049
+msgid "Infotec MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8050
+msgid "Infotec MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8051
+msgid "Infotec MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8052
+msgid "Infotec MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8053
+msgid "Kyocera CS-1815"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8054
+msgid "Kyocera F-1010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8055
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8056
+msgid "Kyocera FS-600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8057
+msgid "Kyocera FS-680"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8058
+msgid "Kyocera FS-800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8059
+msgid "Kyocera FS-920"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8060
+msgid "Kyocera FS-1000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8061
+msgid "Kyocera FS-1000+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8062
+msgid "Kyocera FS-1010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8063
+msgid "Kyocera FS-1018MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8064
+msgid "Kyocera FS-1020D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8065
+msgid "Kyocera FS-1030D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8066
+msgid "Kyocera FS-1050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8067
+msgid "Kyocera FS-1118MFP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8068
+msgid "Kyocera FS-1200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8069
+msgid "Kyocera FS-1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8070
+msgid "Kyocera FS-1600+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8071
+msgid "Kyocera FS-1700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8072
+msgid "Kyocera FS-1700+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8073
+msgid "Kyocera FS-1714M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8074
+msgid "Kyocera FS-1750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8075
+msgid "Kyocera FS-1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8076
+msgid "Kyocera FS-1800+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8077
+msgid "Kyocera FS-1900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8078
+msgid "Kyocera FS-1920"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8079
+msgid "Kyocera FS-2000D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8080
+msgid "Kyocera FS-3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8081
+msgid "Kyocera FS-3600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8082
+msgid "Kyocera FS-3600+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8083
+msgid "Kyocera FS-3700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8084
+msgid "Kyocera FS-3700+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8085
+msgid "Kyocera FS-3718M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8086
+msgid "Kyocera FS-3750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8087
+msgid "Kyocera FS-3800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8088
+msgid "Kyocera FS-3820N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8089
+msgid "Kyocera FS-3830N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8090
+msgid "Kyocera FS-3900DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8091
+msgid "Kyocera FS-4000DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8092
+msgid "Kyocera FS-5800C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8093
+msgid "Kyocera FS-5900C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8094
+msgid "Kyocera FS-6020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8095
+msgid "Kyocera FS-6026"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8096
+msgid "Kyocera FS-6300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8097
+msgid "Kyocera FS-6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8098
+msgid "Kyocera FS-6500+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8099
+msgid "Kyocera FS-6700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8100
+msgid "Kyocera FS-6750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8101
+msgid "Kyocera FS-6900"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8102
+msgid "Kyocera FS-6950DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8103
+msgid "Kyocera FS-7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8104
+msgid "Kyocera FS-7000+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8105
+msgid "Kyocera FS-7028M"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8106
+msgid "Kyocera FS-8000C"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8107
+msgid "Kyocera FS-9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8108
+msgid "Kyocera FS-9100DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8109
+msgid "Kyocera FS-9130DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8110
+msgid "Kyocera FS-9500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8111
+msgid "Kyocera FS-9530DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8112
+msgid "Kyocera KM-1510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8113
+msgid "Kyocera KM-1530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8114
+msgid "Kyocera KM-1810"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8115
+msgid "Kyocera KM-1815"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8116
+msgid "Kyocera KM-1820"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8117
+msgid "Kyocera KM-2030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8118
+msgid "Kyocera KM-2530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8119
+msgid "Kyocera KM-3050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8120
+msgid "Kyocera KM-3530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8121
+msgid "Kyocera KM-4050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8122
+msgid "Kyocera KM-4230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8123
+msgid "Kyocera KM-4230/5230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8124
+msgid "Kyocera KM-4530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8125
+msgid "Kyocera KM-5050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8126
+msgid "Kyocera KM-5230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8127
+msgid "Kyocera KM-5530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8128
+msgid "Kyocera KM-6030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8129
+msgid "Kyocera KM-6230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8130
+msgid "Kyocera KM-8030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8131
+msgid "Lanier 5622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8132
+msgid "Lanier 5627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8133
+msgid "Lanier 5632"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8134
+msgid "Lanier 5635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8135
+msgid "Lanier 5645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8136
+msgid "Lanier LD0105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8137
+msgid "Lanier LD015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8138
+msgid "Lanier LD035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8139
+msgid "Lanier LD045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8140
+msgid "Lanier LD060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8141
+msgid "Lanier LD075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8142
+msgid "Lanier LD090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8143
+msgid "Lanier LD115"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8144
+msgid "Lanier LD116"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8145
+msgid "Lanier LD118"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8146
+msgid "Lanier LD118d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8147
+msgid "Lanier LD120"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8148
+msgid "Lanier LD120d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8149
+msgid "Lanier LD122"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8150
+msgid "Lanier LD127"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8151
+msgid "Lanier LD132"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8152
+msgid "Lanier LD135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8153
+msgid "Lanier LD145"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8154
+msgid "Lanier LD151"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8155
+msgid "Lanier LD160"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8156
+msgid "Lanier LD175"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8157
+msgid "Lanier LD225"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8158
+msgid "Lanier LD230"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8159
+msgid "Lanier LD235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8160
+msgid "Lanier LD245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8161
+msgid "Lanier MP2500/LD125"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8162
+msgid "Lanier MP 1100/LD1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8163
+msgid "Lanier MP 1350/LD1135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8164
+msgid "Lanier MP 1600/LD316"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8165
+msgid "Lanier MP 161/LD016"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8166
+msgid "Lanier MP 2000/LD320d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8167
+msgid "Lanier MP 2510/LD325"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8168
+msgid "Lanier MP 2550B/LD425B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8169
+msgid "Lanier MP 2550/LD425"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8170
+msgid "Lanier MP 3010/LD330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8171
+msgid "Lanier MP 3350B/LD433B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8172
+msgid "Lanier MP 3350/LD433"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8173
+msgid "Lanier MP 3500/LD335"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8174
+msgid "Lanier MP 4000B/LD040B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8175
+msgid "Lanier MP 4000/LD040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8176
+msgid "Lanier MP 4500/LD345"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8177
+msgid "Lanier MP 5000B/LD050B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8178
+msgid "Lanier MP 5000/LD050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8179
+msgid "Lanier MP 5500/LD255"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8180
+msgid "Lanier MP 6500/LD265"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8181
+msgid "Lanier MP 7500/LD275"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8182
+msgid "Lanier MP 9000/LD190"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8183
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8184
+msgid "Lexmark Optra E"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8185
+msgid "Lexmark Optra E+"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8186
+msgid "Lexmark Optra E220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8187
+msgid "Lexmark Optra E321"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8188
+msgid "Lexmark Optra E323"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8189
+msgid "Lexmark Valuewriter 300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8190
+msgid "Minolta PagePro 6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8191
+msgid "Minolta PagePro 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8192
+msgid "Minolta PagePro 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8193
+msgid "Minolta PagePro 8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8194
+msgid "Minolta PagePro 8L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8195
+msgid "Minolta PagePro 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8196
+msgid "NEC SuperScript 660i"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8197
+msgid "NEC SuperScript 860"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8198
+msgid "NEC SuperScript 870"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8199
+msgid "NEC SuperScript 1260"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8200
+msgid "NEC SuperScript 1400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8201
+msgid "NEC SuperScript 1800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8202
+msgid "NRG 10515/10518/10512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8203
+msgid "NRG 2205/2238/2212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8204
+msgid "NRG 2705/2738/2712"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8205
+msgid "NRG 3205/3238/3212"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8206
+msgid "NRG 3525/3508/3502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8207
+msgid "NRG 3545/3518/3532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8208
+msgid "NRG 4525/4508/4502"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8209
+msgid "NRG 4545/4518/4532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8210
+msgid "NRG 6002/6005/6008"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8211
+msgid "NRG 7502/7505/7508"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8212
+msgid "NRG 9005/9008/9002"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8213
+msgid "NRG DSm415"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8214
+msgid "NRG DSm615"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8215
+msgid "NRG DSm616"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8216
+msgid "NRG DSm618"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8217
+msgid "NRG DSm618d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8218
+msgid "NRG DSm620"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8219
+msgid "NRG DSm620d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8220
+msgid "NRG DSm622"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8221
+msgid "NRG DSm627"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8222
+msgid "NRG DSm632"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8223
+msgid "NRG DSm635"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8224
+msgid "NRG DSm645"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8225
+msgid "NRG DSm651"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8226
+msgid "NRG DSm660"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8227
+msgid "NRG DSm675"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8228
+msgid "NRG DSm725"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8229
+msgid "NRG DSm730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8230
+msgid "NRG DSm735"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8231
+msgid "NRG DSm745"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8232
+msgid "NRG MP 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8233
+msgid "NRG MP 1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8234
+msgid "NRG MP 1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8235
+msgid "NRG MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8236
+msgid "NRG MP 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8237
+msgid "NRG MP 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8238
+msgid "NRG MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8239
+msgid "NRG MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8240
+msgid "NRG MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8241
+msgid "NRG MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8242
+msgid "NRG MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8243
+msgid "NRG MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8244
+msgid "NRG MP 3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8245
+msgid "NRG MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8246
+msgid "NRG MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8247
+msgid "NRG MP 4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8248
+msgid "NRG MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8249
+msgid "NRG MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8250
+msgid "NRG MP 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8251
+msgid "NRG MP 6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8252
+msgid "NRG MP 7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8253
+msgid "NRG MP 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8254
+msgid "Oki B4350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8255
+msgid "Oki OL400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8256
+msgid "Oki OL400e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8257
+msgid "Oki OL400ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8258
+msgid "Oki OL410e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8259
+msgid "Oki OL600e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8260
+msgid "Oki OL610e/S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8261
+msgid "Oki OL800"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8262
+msgid "Oki OL810ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8263
+msgid "Oki Okipage 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8264
+msgid "Oki Okipage 6ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8265
+msgid "Oki Okipage 8p"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8266
+msgid "Oki Okipage 10e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8267
+msgid "Oki Okipage 10ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8268
+msgid "Oki Okipage 14ex"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8269
+msgid "Oki Super 6e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8270
+msgid "Olivetti JP350S"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8271
+msgid "Olivetti PG 306"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8272
+msgid "PCPI 1030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8273
+msgid "Panasonic KX-P4410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8274
+msgid "Panasonic KX-P4450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8275
+msgid "Panasonic KX-P6150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8276
+msgid "Panasonic KX-P6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8277
+msgid "Raven LP-410"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8278
+msgid "Ricoh Aficio 1022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8279
+msgid "Ricoh Aficio 1027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8280
+msgid "Ricoh Aficio 1032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8281
+msgid "Ricoh Aficio 1035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8282
+msgid "Ricoh Aficio 1045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8283
+msgid "Ricoh Aficio 1060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8284
+msgid "Ricoh Aficio 1075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8285
+msgid "Ricoh Aficio 1515"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8286
+msgid "Ricoh Aficio 2015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8287
+msgid "Ricoh Aficio 2016"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8288
+msgid "Ricoh Aficio 2018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8289
+msgid "Ricoh Aficio 2018D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8290
+msgid "Ricoh Aficio 2020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8291
+msgid "Ricoh Aficio 2020D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8292
+msgid "Ricoh Aficio 2022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8293
+msgid "Ricoh Aficio 2027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8294
+msgid "Ricoh Aficio 2032"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8295
+msgid "Ricoh Aficio 2035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8296
+msgid "Ricoh Aficio 2035e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8297
+msgid "Ricoh Aficio 2045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8298
+msgid "Ricoh Aficio 2045e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8299
+msgid "Ricoh Aficio 2051"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8300
+msgid "Ricoh Aficio 2060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8301
+msgid "Ricoh Aficio 2075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8302
+msgid "Ricoh Aficio 2090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8303
+msgid "Ricoh Aficio 2105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8304
+msgid "Ricoh Aficio 220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8305
+msgid "Ricoh Aficio 3025"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8306
+msgid "Ricoh Aficio 3030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8307
+msgid "Ricoh Aficio 3035"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8308
+msgid "Ricoh Aficio 3045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8309
+msgid "Ricoh Aficio 401"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8310
+msgid "Ricoh Aficio 700"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8311
+msgid "Ricoh Aficio MP 1100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8312
+msgid "Ricoh Aficio MP 1350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8313
+msgid "Ricoh Aficio MP 1600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8314
+msgid "Ricoh Aficio MP 161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8315
+msgid "Ricoh Aficio MP 2000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8316
+msgid "Ricoh Aficio MP 2500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8317
+msgid "Ricoh Aficio MP 2510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8318
+msgid "Ricoh Aficio MP 2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8319
+msgid "Ricoh Aficio MP 2550B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8320
+msgid "Ricoh Aficio MP 3010"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8321
+msgid "Ricoh Aficio MP 3350"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8322
+msgid "Ricoh Aficio MP 3350B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8323
+msgid "Ricoh Aficio MP 3500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8324
+msgid "Ricoh Aficio MP 4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8325
+msgid "Ricoh Aficio MP 4000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8326
+msgid "Ricoh Aficio MP 4500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8327
+msgid "Ricoh Aficio MP 5000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8328
+msgid "Ricoh Aficio MP 5000B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8329
+msgid "Ricoh Aficio MP 5500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8330
+msgid "Ricoh Aficio MP 6500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8331
+msgid "Ricoh Aficio MP 7500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8332
+msgid "Ricoh Aficio MP 9000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8333
+msgid "Samsung ML-85"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8334
+msgid "Samsung ML-1250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8335
+msgid "Samsung ML-1450"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8336
+msgid "Samsung ML-1450PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8337
+msgid "Samsung ML-1650"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8338
+msgid "Samsung ML-1651N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8339
+msgid "Samsung ML-1750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8340
+msgid "Samsung ML-2150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8341
+msgid "Samsung ML-2150PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8342
+msgid "Samsung ML-2151N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8343
+msgid "Samsung ML-2151NPS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8344
+msgid "Samsung ML-2152W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8345
+msgid "Samsung ML-2152WPS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8346
+msgid "Samsung ML-2250"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8347
+msgid "Samsung ML-2550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8348
+msgid "Samsung ML-2551N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8349
+msgid "Samsung ML-2552W"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8350
+msgid "Samsung ML-4600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8351
+msgid "Samsung ML-5000a"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8352
+msgid "Samsung ML-6000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8353
+msgid "Samsung ML-6100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8354
+msgid "Samsung ML-7000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8355
+msgid "Samsung ML-7000N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8356
+msgid "Samsung ML-7000P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8357
+msgid "Samsung ML-7050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8358
+msgid "Samsung ML-7300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8359
+msgid "Samsung ML-7300N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8360
+msgid "Samsung QL-5100A"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8361
+msgid "Samsung QL-6050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8362
+msgid "Savin 2522"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8363
+msgid "Savin 2527"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8364
+msgid "Savin 2532"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8365
+msgid "Savin 2535/2235"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8366
+msgid "Savin 2545/2245"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8367
+msgid "Savin 2560"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8368
+msgid "Savin 2575"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8369
+msgid "Savin 3515"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8370
+msgid "Savin 40105"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8371
+msgid "Savin 4015"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8372
+msgid "Savin 4018"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8373
+msgid "Savin 4018d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8374
+msgid "Savin 4022"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8375
+msgid "Savin 4027"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8376
+msgid "Savin 4035/4135g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8377
+msgid "Savin 4035e/4135eG"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8378
+msgid "Savin 4045/4145g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8379
+msgid "Savin 4045e/4145eG"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8380
+msgid "Savin 4051"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8381
+msgid "Savin 4060"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8382
+msgid "Savin 4075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8383
+msgid "Savin 4090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8384
+msgid "Savin 7025"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8385
+msgid "Savin 8016"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8386
+msgid "Savin 8020"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8387
+msgid "Savin 8020d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8388
+msgid "Savin 8025"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8389
+msgid "Savin 8025e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8390
+msgid "Savin 8030"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8391
+msgid "Savin 8030e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8392
+msgid "Savin 8035/8035g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8393
+msgid "Savin 8035e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8394
+msgid "Savin 8045/8045g"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8395
+msgid "Savin 8045e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8396
+msgid "Savin 8055"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8397
+msgid "Savin 8065"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8398
+msgid "Savin 8075"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8399
+msgid "Savin 8090"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8400
+msgid "Savin 8110"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8401
+msgid "Savin 8135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8402
+msgid "Savin 816"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8403
+msgid "Savin 9016"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8404
+msgid "Savin 9021d"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8405
+msgid "Savin 9025"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8406
+msgid "Savin 9025b"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8407
+msgid "Savin 9033"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8408
+msgid "Savin 9033b"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8409
+msgid "Savin 9040"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8410
+msgid "Savin 9040b"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8411
+msgid "Savin 9050"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8412
+msgid "Savin 9050b"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8413
+msgid "Seiko SpeedJET 200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8414
+msgid "Sharp AR-161"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8415
+msgid "Sharp AR-M257"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8416
+msgid "Sony IJP-V100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8417
+msgid "Star LS-04"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8418
+msgid "Star LaserPrinter 8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8419
+msgid "Tally MT908"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8420
+msgid "Tektronix Phaser 750DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8421
+msgid "Tektronix Phaser 750DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8422
+msgid "Tektronix Phaser 750N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8423
+msgid "Tektronix Phaser 750P"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8424
+msgid "Xerox Able 1406"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8425
+msgid "Xerox DocuPrint 4508"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8426
+msgid "Xerox DocuPrint C20"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8427
+msgid "Xerox DocuPrint N4512"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8428
+msgid "Xerox DocuPrint N4512PS"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8429
+msgid "Xerox DocuPrint P12"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8430
+msgid "Xerox DocuPrint P1202"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8431
+msgid "Xerox DocuPrint P8e"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8432
+msgid "Xerox Document Centre 400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8433
+msgid "Xerox Phaser 2135"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8434
+msgid "Xerox Phaser 4400B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8435
+msgid "Xerox Phaser 4400DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8436
+msgid "Xerox Phaser 4400DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8437
+msgid "Xerox Phaser 4400N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8438
+msgid "Xerox Phaser 4500B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8439
+msgid "Xerox Phaser 4500DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8440
+msgid "Xerox Phaser 4500DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8441
+msgid "Xerox Phaser 4500N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8442
+msgid "Xerox Phaser 4510B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8443
+msgid "Xerox Phaser 4510DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8444
+msgid "Xerox Phaser 4510DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8445
+msgid "Xerox Phaser 4510N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8446
+msgid "Xerox Phaser 5500B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8447
+msgid "Xerox Phaser 5500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8448
+msgid "Xerox Phaser 5500DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8449
+msgid "Xerox Phaser 5500DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8450
+msgid "Xerox Phaser 5500N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8451
+msgid "Xerox Phaser 6130N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8452
+msgid "Xerox Phaser 6180DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8453
+msgid "Xerox Phaser 6180MFP-D"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8454
+msgid "Xerox Phaser 6200B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8455
+msgid "Xerox Phaser 6200DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8456
+msgid "Xerox Phaser 6200DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8457
+msgid "Xerox Phaser 6200N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8458
+msgid "Xerox Phaser 6250B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8459
+msgid "Xerox Phaser 6250DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8460
+msgid "Xerox Phaser 6250DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8461
+msgid "Xerox Phaser 6250DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8462
+msgid "Xerox Phaser 6250N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8463
+msgid "Xerox Phaser 6300DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8464
+msgid "Xerox Phaser 6300N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8465
+msgid "Xerox Phaser 6350DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8466
+msgid "Xerox Phaser 6350DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8467
+msgid "Xerox Phaser 6350DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8468
+msgid "Xerox Phaser 6360DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8469
+msgid "Xerox Phaser 6360DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8470
+msgid "Xerox Phaser 7300B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8471
+msgid "Xerox Phaser 7300DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8472
+msgid "Xerox Phaser 7300DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8473
+msgid "Xerox Phaser 7300DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8474
+msgid "Xerox Phaser 7300N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8475
+msgid "Xerox Phaser 7400DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8476
+msgid "Xerox Phaser 7400DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8477
+msgid "Xerox Phaser 7400DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8478
+msgid "Xerox Phaser 7400DXF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8479
+msgid "Xerox Phaser 7400N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8480
+msgid "Xerox Phaser 7700DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8481
+msgid "Xerox Phaser 7700DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8482
+msgid "Xerox Phaser 7700GX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8483
+msgid "Xerox Phaser 7750B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8484
+msgid "Xerox Phaser 7750DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8485
+msgid "Xerox Phaser 7750DXF"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8486
+msgid "Xerox Phaser 7750GX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8487
+msgid "Xerox Phaser 7760DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8488
+msgid "Xerox Phaser 7760DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8489
+msgid "Xerox Phaser 7760GX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8490
+msgid "Xerox Phaser 8400B"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8491
+msgid "Xerox Phaser 8400BD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8492
+msgid "Xerox Phaser 8400DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8493
+msgid "Xerox Phaser 8400DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8494
+msgid "Xerox Phaser 8400N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8495
+msgid "Xerox Phaser 8500DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8496
+msgid "Xerox Phaser 8500N"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8497
+msgid "Xerox Phaser 8550DP"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8498
+msgid "Xerox Phaser 8550DT"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8499
+msgid "Xerox Phaser 8550DX"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8500
+msgid "Xerox Phaser 8560DN"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8501
+msgid "Xerox WorkCentre 7345"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8502
+msgid "Xerox WorkCentre M118"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8503
+msgid "Compaq IJ1200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8504
+msgid "Lexmark X73"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8505
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8506
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8507
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8508
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8509
+msgid "Olympus P-10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8510
+msgid "Olympus P-11"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8511
+msgid "Olympus P-200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8512
+msgid "Olympus P-300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8513
+msgid "Olympus P-300E"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8514
+msgid "Olympus P-300U"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8515
+msgid "Olympus P-330E"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8516
+msgid "Olympus P-330NE"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8517
+msgid "Olympus P-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8518
+msgid "Olympus P-440"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8519
+msgid "Olympus P-S100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8520
+msgid "Canon CP-10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8521
+msgid "Canon CP-100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8522
+msgid "Canon CP-200"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8523
+msgid "Canon CP-220"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8524
+msgid "Canon CP-300"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8525
+msgid "Canon CP-330"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8526
+msgid "Canon SELPHY-CP400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8527
+msgid "Canon SELPHY-CP500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8528
+msgid "Canon SELPHY-CP510"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8529
+msgid "Canon SELPHY-CP520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8530
+msgid "Canon SELPHY-CP530"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8531
+msgid "Canon SELPHY-CP710"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8532
+msgid "Canon SELPHY-CP730"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8533
+msgid "Canon SELPHY-CP740"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8534
+msgid "Canon SELPHY-CP750"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8535
+msgid "Canon SELPHY-CP760"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8536
+msgid "Canon SELPHY-CP770"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8537
+msgid "Canon SELPHY-CP790"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8538
+msgid "Sony DPP-EX5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8539
+msgid "Sony DPP-EX7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8540
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8541
+msgid "Sony UP-DR100"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8542
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8543
+msgid "Fujifilm Printpix-CX-400"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8544
+msgid "Fujifilm Printpix-CX-550"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8545
+msgid "Fujifilm FinePix-NX-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8546
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8547
+msgid "Kodak EasyShare-G600-Printer-Dock"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8548
+msgid "Kodak PD-4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8549
+msgid "Kodak PD-6000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8550
+msgid "Kodak Photo-Printer"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8551
+msgid "Kodak Photo-Printer-500"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8552
+msgid "Kodak Printer-Dock-Plus"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8553
+msgid "Kodak Printer-Dock-Plus-S3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8554
+msgid "Shinko CHC-S9045"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8555
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8556
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8557
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:8558
+msgid "RAW DATA 8 bit"
+msgstr ""
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 614bc88..1b16c52 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b814653..cbf4a5b 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: 2011-05-01 21:33-0400\n"
+"POT-Creation-Date: 2012-06-04 22:38-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
-#: src/main/print-escp2.c:2329 src/main/print-pcl.c:1872
+#: src/main/print-escp2.c:2341 src/main/print-pcl.c:1872
 msgid "Default"
 msgstr "�設"
 
@@ -137,286 +137,286 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
-#: src/main/print-canon.c:202 src/main/print-escp2.c:168
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1863
+#: src/main/print-canon.c:219 src/main/print-escp2.c:168
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:2000
 #: src/main/print-pcl.c:1346 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "��尺寸"
 
-#: src/main/print-canon.c:203 src/main/print-escp2.c:169
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1864
+#: src/main/print-canon.c:220 src/main/print-escp2.c:169
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:2001
 #: src/main/print-pcl.c:1347 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
-#: src/main/print-canon.c:208 src/main/print-escp2.c:174
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1869
-#: src/main/print-pcl.c:1352 src/cups/genppd.c:1921 src/cups/genppd.c:2384
+#: src/main/print-canon.c:225 src/main/print-escp2.c:174
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:2006
+#: src/main/print-pcl.c:1352 src/cups/genppd.c:1927 src/cups/genppd.c:2391
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: src/main/print-canon.c:209 src/main/print-escp2.c:175
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1870
+#: src/main/print-canon.c:226 src/main/print-escp2.c:175
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:2007
 #: src/main/print-pcl.c:1353
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
-#: src/main/print-canon.c:214 src/main/print-escp2.c:180
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1875
-#: src/main/print-pcl.c:1358 src/cups/genppd.c:1956 src/cups/genppd.c:2403
+#: src/main/print-canon.c:231 src/main/print-escp2.c:180
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:2012
+#: src/main/print-pcl.c:1358 src/cups/genppd.c:1962 src/cups/genppd.c:2410
 msgid "Media Source"
 msgstr "紙張來�"
 
-#: src/main/print-canon.c:215 src/main/print-escp2.c:181
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1876
+#: src/main/print-canon.c:232 src/main/print-escp2.c:181
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:2013
 #: src/main/print-pcl.c:1359
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
 
-#: src/main/print-canon.c:220 src/main/print-escp2.c:192
+#: src/main/print-canon.c:237 src/main/print-escp2.c:192
 msgid "CD Hub Size"
 msgstr ""
 
-#: src/main/print-canon.c:221 src/main/print-escp2.c:193
+#: src/main/print-canon.c:238 src/main/print-escp2.c:193
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
 msgstr ""
 
-#: src/main/print-canon.c:226 src/main/print-escp2.c:198
+#: src/main/print-canon.c:243 src/main/print-escp2.c:198
 msgid "CD Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:227 src/main/print-escp2.c:199
+#: src/main/print-canon.c:244 src/main/print-escp2.c:199
 msgid "Variable adjustment for the outer diameter of CD"
 msgstr ""
 
-#: src/main/print-canon.c:232 src/main/print-escp2.c:204
+#: src/main/print-canon.c:249 src/main/print-escp2.c:204
 msgid "CD Hub Size (Custom)"
 msgstr ""
 
-#: src/main/print-canon.c:233 src/main/print-escp2.c:205
+#: src/main/print-canon.c:250 src/main/print-escp2.c:205
 #, fuzzy
 msgid "Variable adjustment to the inner hub of the CD"
 msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
 
-#: src/main/print-canon.c:238 src/main/print-escp2.c:210
+#: src/main/print-canon.c:255 src/main/print-escp2.c:210
 msgid "CD Horizontal Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:239 src/main/print-canon.c:245
+#: src/main/print-canon.c:256 src/main/print-canon.c:262
 #: src/main/print-escp2.c:211 src/main/print-escp2.c:217
 msgid "Fine adjustment to horizontal position for CD printing"
 msgstr ""
 
-#: src/main/print-canon.c:244 src/main/print-escp2.c:216
+#: src/main/print-canon.c:261 src/main/print-escp2.c:216
 msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:250 src/main/print-escp2.c:228
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1881
-#: src/main/print-pcl.c:1370 src/cups/genppd.c:2046 src/cups/genppd.c:2439
+#: src/main/print-canon.c:267 src/main/print-escp2.c:228
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:2018
+#: src/main/print-pcl.c:1370 src/cups/genppd.c:2052 src/cups/genppd.c:2446
 msgid "Resolution"
 msgstr "解�度"
 
-#: src/main/print-canon.c:251 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1882
+#: src/main/print-canon.c:268 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:2019
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
-#: src/main/print-canon.c:256 src/main/print-escp2.c:239
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1887
+#: src/main/print-canon.c:278 src/main/print-escp2.c:239
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:2024
 #: src/main/print-pcl.c:1376 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
-#: src/main/print-canon.c:257 src/main/print-escp2.c:240
+#: src/main/print-canon.c:279 src/main/print-escp2.c:240
 #: src/main/print-escp2.c:252 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1888 src/main/print-pcl.c:1377
+#: src/main/print-olympus.c:2025 src/main/print-pcl.c:1377
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
 
-#: src/main/print-canon.c:262 src/main/print-canon.c:263
+#: src/main/print-canon.c:284 src/main/print-canon.c:285
 #: src/main/print-escp2.c:323 src/main/print-escp2.c:324
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1382 src/main/print-pcl.c:1383
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:268 src/main/print-escp2.c:341
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1909
+#: src/main/print-canon.c:295 src/main/print-escp2.c:341
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:2046
 #: src/main/print-pcl.c:1388 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
-#: src/main/print-canon.c:269 src/main/print-escp2.c:342
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1910
+#: src/main/print-canon.c:296 src/main/print-escp2.c:342
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:2047
 #: src/main/print-pcl.c:1389 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:274 src/main/print-escp2.c:186
+#: src/main/print-canon.c:306 src/main/print-escp2.c:251
+msgid "Ink Set"
+msgstr ""
+
+#: src/main/print-canon.c:307
+#, fuzzy
+msgid "Type of inkset in the printer"
+msgstr "�表機墨水的類型"
+
+#: src/main/print-canon.c:312 src/main/print-escp2.c:263
+#: src/main/print-olympus.c:2040
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-canon.c:313 src/main/print-escp2.c:264
+#: src/main/print-olympus.c:2041
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-canon.c:318 src/main/print-escp2.c:186
 #: src/main/print-pcl.c:1394
 msgid "Double-Sided Printing"
 msgstr "雙�列�"
 
-#: src/main/print-canon.c:275 src/main/print-escp2.c:187
+#: src/main/print-canon.c:319 src/main/print-escp2.c:187
 #: src/main/print-pcl.c:1395
 msgid "Duplex/Tumble Setting"
 msgstr ""
 
-#: src/main/print-canon.c:280 src/main/print-canon.c:281
+#: src/main/print-canon.c:324 src/main/print-canon.c:325
 #: src/main/print-escp2.c:162 src/main/print-escp2.c:163
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #: src/main/generic-options.c:62 src/main/generic-options.c:63
 msgid "Print Quality"
 msgstr "列��質"
 
-#: src/main/print-canon.c:303 src/main/print-escp2.c:454
+#: src/main/print-canon.c:347 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1417
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:304 src/main/print-escp2.c:455
+#: src/main/print-canon.c:348 src/main/print-escp2.c:455
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1418
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:311 src/main/print-escp2.c:462
+#: src/main/print-canon.c:355 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1425
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:312 src/main/print-escp2.c:463
+#: src/main/print-canon.c:356 src/main/print-escp2.c:463
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1426
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:319 src/main/print-escp2.c:470
+#: src/main/print-canon.c:363 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1433
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:320 src/main/print-escp2.c:471
+#: src/main/print-canon.c:364 src/main/print-escp2.c:471
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1434
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:327 src/main/print-escp2.c:478
+#: src/main/print-canon.c:371 src/main/print-escp2.c:478
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1441
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:328 src/main/print-escp2.c:479
+#: src/main/print-canon.c:372 src/main/print-escp2.c:479
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1442
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: src/main/print-canon.c:335 src/main/print-canon.c:336
+#: src/main/print-canon.c:379 src/main/print-canon.c:380
 #: src/main/print-escp2.c:550 src/main/print-escp2.c:551
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1449 src/main/print-pcl.c:1450
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:343 src/main/print-canon.c:344
+#: src/main/print-canon.c:387 src/main/print-canon.c:388
 #: src/main/print-escp2.c:582 src/main/print-escp2.c:583
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1457 src/main/print-pcl.c:1458
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:351 src/main/print-canon.c:352
+#: src/main/print-canon.c:395 src/main/print-canon.c:396
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:371 src/main/print-escp2.c:2503
-#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6546
-#: src/xml/xmli18n-tmp.h:6551 src/xml/xmli18n-tmp.h:6557
-#: src/xml/xmli18n-tmp.h:6564
+#: src/main/print-canon.c:414 src/main/print-escp2.c:2512
+#: src/main/print-pcl.c:1683 src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6565 src/xml/xmli18n-tmp.h:6571
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:372 src/main/print-escp2.c:2505
+#: src/main/print-canon.c:415 src/main/print-escp2.c:2514
 #: src/main/print-pcl.c:1684
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-canon.c:373 src/main/print-pcl.c:1685
+#: src/main/print-canon.c:416 src/main/print-pcl.c:1685
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:666 src/main/print-escp2.c:2216
-#: src/xml/xmli18n-tmp.h:6613
+#: src/main/print-canon.c:2658 src/main/print-escp2.c:2228
+#: src/xml/xmli18n-tmp.h:6636
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-canon.c:668 src/main/print-escp2.c:2218
-#: src/xml/xmli18n-tmp.h:6614
+#: src/main/print-canon.c:2660 src/main/print-escp2.c:2230
+#: src/xml/xmli18n-tmp.h:6637
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-canon.c:670 src/main/print-escp2.c:2220
-#: src/xml/xmli18n-tmp.h:6615
+#: src/main/print-canon.c:2662 src/main/print-escp2.c:2232
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "CD - Custom"
 msgstr "自�"
 
-#: src/main/print-canon.c:693 src/main/print-escp2.c:2254
-#: src/cups/genppd.c:1321 src/cups/genppd.c:2173 src/cups/genppd.c:2371
-#: src/cups/genppd.c:2462
+#: src/main/print-canon.c:2685 src/main/print-escp2.c:2266
+#: src/cups/genppd.c:1324 src/cups/genppd.c:2180 src/cups/genppd.c:2378
+#: src/cups/genppd.c:2469
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:695 src/main/print-escp2.c:2256
+#: src/main/print-canon.c:2687 src/main/print-escp2.c:2268
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:810 src/main/print-canon.c:864
-#: src/main/print-escp2.c:2669 src/main/print-lexmark.c:1279
-#: src/main/print-olympus.c:2164 src/main/print-pcl.c:1997
-#: src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/main/print-canon.c:2865 src/main/print-canon.c:2881
+#: src/main/print-canon.c:2898 src/main/print-canon.c:2928
+#: src/main/print-canon.c:2963 src/main/print-canon.c:2967
+#: src/main/print-canon.c:3043 src/main/print-escp2.c:2678
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2301
+#: src/main/print-pcl.c:1997 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:812 src/main/print-escp2.c:2671
-#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1999
-#: src/main/print-ps.c:331 src/main/print-raw.c:137
+#: src/main/print-canon.c:2871 src/main/print-canon.c:2913
+#: src/main/print-canon.c:2934 src/main/print-canon.c:2942
+#: src/main/print-escp2.c:2680 src/main/print-lexmark.c:1281
+#: src/main/print-pcl.c:1999 src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "黑白"
 
-#: src/main/print-canon.c:851 src/main/print-escp2.c:2309
-#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
-#: src/main/generic-options.c:230
-msgid "Manual Control"
-msgstr ""
-
-#: src/main/print-canon.c:853 src/main/print-escp2.c:2351
-#: src/main/print-escp2.c:2449 src/main/print-escp2.c:2461
-#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
-#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
-#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4118
-#: src/xml/xmli18n-tmp.h:4123 src/xml/xmli18n-tmp.h:4127
-#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4133
-#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4141
-#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4150
-#: src/xml/xmli18n-tmp.h:4166 src/xml/xmli18n-tmp.h:5672
-#: src/xml/xmli18n-tmp.h:5683 src/xml/xmli18n-tmp.h:6569
-#: src/xml/xmli18n-tmp.h:6576 src/xml/xmli18n-tmp.h:6585
-#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6602
-msgid "Standard"
-msgstr "標準"
-
-#: src/main/print-canon.c:862 src/gutenprintui2/panel.c:1716
+#: src/main/print-canon.c:2957 src/main/print-canon.c:3041
+#: src/gutenprintui2/panel.c:1716
 msgid "Both"
 msgstr "兩者"
 
-#: src/main/print-canon.c:866 src/main/print-color.c:314
+#: src/main/print-canon.c:2960 src/main/print-canon.c:2969
+#: src/main/print-canon.c:3045 src/main/print-color.c:314
 #: src/main/print-lexmark.c:613 src/gutenprintui2/panel.c:2376
-#: src/escputil/escputil.c:1024 src/escputil/escputil.c:1046
-#: src/escputil/escputil.c:1314 src/xml/xmli18n-tmp.h:2584
+#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1062
+#: src/escputil/escputil.c:1330 src/xml/xmli18n-tmp.h:2584
 #: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2608
 #: src/xml/xmli18n-tmp.h:2621 src/xml/xmli18n-tmp.h:2635
 #: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2661
@@ -465,154 +465,195 @@ msgstr "兩者"
 #: src/xml/xmli18n-tmp.h:3911 src/xml/xmli18n-tmp.h:3964
 #: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4055
 #: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4077
-#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4170
-#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4192
-#: src/xml/xmli18n-tmp.h:4198 src/xml/xmli18n-tmp.h:4209
-#: src/xml/xmli18n-tmp.h:4217 src/xml/xmli18n-tmp.h:4226
-#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4238
-#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4253
-#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4268
-#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4280
-#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4292
-#: src/xml/xmli18n-tmp.h:4301 src/xml/xmli18n-tmp.h:4307
-#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
-#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4334
-#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4346
-#: src/xml/xmli18n-tmp.h:4352 src/xml/xmli18n-tmp.h:4358
-#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4380
-#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4397
-#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4411
-#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4430
-#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:4456
-#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4470
-#: src/xml/xmli18n-tmp.h:4476 src/xml/xmli18n-tmp.h:4485
-#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4507
-#: src/xml/xmli18n-tmp.h:4516 src/xml/xmli18n-tmp.h:4522
-#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4535
-#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4561
-#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4575
-#: src/xml/xmli18n-tmp.h:4581 src/xml/xmli18n-tmp.h:4590
-#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4612
-#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4627
-#: src/xml/xmli18n-tmp.h:4632 src/xml/xmli18n-tmp.h:4640
-#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4655
-#: src/xml/xmli18n-tmp.h:4661 src/xml/xmli18n-tmp.h:4667
-#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4676
-#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4691
-#: src/xml/xmli18n-tmp.h:4697 src/xml/xmli18n-tmp.h:4703
-#: src/xml/xmli18n-tmp.h:4709 src/xml/xmli18n-tmp.h:4722
-#: src/xml/xmli18n-tmp.h:4731 src/xml/xmli18n-tmp.h:4737
-#: src/xml/xmli18n-tmp.h:4748 src/xml/xmli18n-tmp.h:4756
-#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4784
-#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4799
-#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4817
-#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4834
-#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4856
-#: src/xml/xmli18n-tmp.h:4859 src/xml/xmli18n-tmp.h:4861
-#: src/xml/xmli18n-tmp.h:4868 src/xml/xmli18n-tmp.h:4879
-#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4895
-#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4916
-#: src/xml/xmli18n-tmp.h:4925 src/xml/xmli18n-tmp.h:4928
-#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4937
-#: src/xml/xmli18n-tmp.h:4948 src/xml/xmli18n-tmp.h:4955
-#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4973
-#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4994
-#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5013
-#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5030
-#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5052
-#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5071
-#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5092
-#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5111
-#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
-#: src/xml/xmli18n-tmp.h:5141 src/xml/xmli18n-tmp.h:5150
-#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5169
-#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5190
-#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5209
-#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5226
-#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5248
-#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5267
-#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5279
-#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5301
-#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5318
-#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5332
-#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5346
-#: src/xml/xmli18n-tmp.h:5359 src/xml/xmli18n-tmp.h:5368
-#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5385
-#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5399
-#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5413
-#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5435
-#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5452
-#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5466
-#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
-#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5502
-#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5519
-#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5533
-#: src/xml/xmli18n-tmp.h:5539 src/xml/xmli18n-tmp.h:5547
-#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5562
-#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
-#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5593
-#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5608
-#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5627
-#: src/xml/xmli18n-tmp.h:5640 src/xml/xmli18n-tmp.h:5649
-#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5666
-#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5679
-#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5692
-#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
-#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5723
-#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5738
-#: src/xml/xmli18n-tmp.h:5749 src/xml/xmli18n-tmp.h:5757
-#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5769
-#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5790
-#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5805
-#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5824
-#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5836
-#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5857
-#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5872
-#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5891
-#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5912
-#: src/xml/xmli18n-tmp.h:5921 src/xml/xmli18n-tmp.h:5924
-#: src/xml/xmli18n-tmp.h:5926 src/xml/xmli18n-tmp.h:5933
-#: src/xml/xmli18n-tmp.h:5944 src/xml/xmli18n-tmp.h:5951
-#: src/xml/xmli18n-tmp.h:5960 src/xml/xmli18n-tmp.h:5968
-#: src/xml/xmli18n-tmp.h:5981 src/xml/xmli18n-tmp.h:5990
-#: src/xml/xmli18n-tmp.h:5993 src/xml/xmli18n-tmp.h:5995
-#: src/xml/xmli18n-tmp.h:6002 src/xml/xmli18n-tmp.h:6013
-#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6029
-#: src/xml/xmli18n-tmp.h:6038 src/xml/xmli18n-tmp.h:6046
-#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6068
-#: src/xml/xmli18n-tmp.h:6078 src/xml/xmli18n-tmp.h:6087
-#: src/xml/xmli18n-tmp.h:6095 src/xml/xmli18n-tmp.h:6108
-#: src/xml/xmli18n-tmp.h:6117 src/xml/xmli18n-tmp.h:6127
-#: src/xml/xmli18n-tmp.h:6136 src/xml/xmli18n-tmp.h:6142
-#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
-#: src/xml/xmli18n-tmp.h:6166 src/xml/xmli18n-tmp.h:6174
-#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6196
-#: src/xml/xmli18n-tmp.h:6206 src/xml/xmli18n-tmp.h:6215
-#: src/xml/xmli18n-tmp.h:6223 src/xml/xmli18n-tmp.h:6236
-#: src/xml/xmli18n-tmp.h:6245 src/xml/xmli18n-tmp.h:6255
-#: src/xml/xmli18n-tmp.h:6264 src/xml/xmli18n-tmp.h:6270
-#: src/xml/xmli18n-tmp.h:6275 src/xml/xmli18n-tmp.h:6281
-#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
-#: src/xml/xmli18n-tmp.h:6302 src/xml/xmli18n-tmp.h:6308
-#: src/xml/xmli18n-tmp.h:6314 src/xml/xmli18n-tmp.h:6323
-#: src/xml/xmli18n-tmp.h:6329 src/xml/xmli18n-tmp.h:6335
-#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6347
-#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6368
-#: src/xml/xmli18n-tmp.h:6377 src/xml/xmli18n-tmp.h:6380
-#: src/xml/xmli18n-tmp.h:6382 src/xml/xmli18n-tmp.h:6389
-#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6407
-#: src/xml/xmli18n-tmp.h:6416 src/xml/xmli18n-tmp.h:6424
-#: src/xml/xmli18n-tmp.h:6437 src/xml/xmli18n-tmp.h:6446
-#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6451
-#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6469
-#: src/xml/xmli18n-tmp.h:6476 src/xml/xmli18n-tmp.h:6485
-#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6500
-#: src/xml/xmli18n-tmp.h:6506 src/xml/xmli18n-tmp.h:6515
-#: src/xml/xmli18n-tmp.h:6521 src/xml/xmli18n-tmp.h:6527
-#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:4231 src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:4273 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4288 src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4339 src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4366 src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4470
+#: src/xml/xmli18n-tmp.h:4472 src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:4490 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4577 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:4635 src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:4687 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4699 src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:4723 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:4785 src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4824 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4861 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:4900 src/xml/xmli18n-tmp.h:4909
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4930
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4942
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:4962 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4987
+#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5036 src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:5057 src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:5155 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5183
+#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:5232 src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:5253 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5315
+#: src/xml/xmli18n-tmp.h:5321 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5382
+#: src/xml/xmli18n-tmp.h:5388 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5413
+#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5449
+#: src/xml/xmli18n-tmp.h:5455 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5474 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5486 src/xml/xmli18n-tmp.h:5494
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5516
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5533
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5547
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5570 src/xml/xmli18n-tmp.h:5576
+#: src/xml/xmli18n-tmp.h:5582 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5607
+#: src/xml/xmli18n-tmp.h:5616 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5633 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5680
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5777 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5804
+#: src/xml/xmli18n-tmp.h:5813 src/xml/xmli18n-tmp.h:5819
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5844 src/xml/xmli18n-tmp.h:5850
+#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5886
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+#: src/xml/xmli18n-tmp.h:5913 src/xml/xmli18n-tmp.h:5926
+#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5938
+#: src/xml/xmli18n-tmp.h:5940 src/xml/xmli18n-tmp.h:5947
+#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:5965
+#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:5982
+#: src/xml/xmli18n-tmp.h:5995 src/xml/xmli18n-tmp.h:6004
+#: src/xml/xmli18n-tmp.h:6007 src/xml/xmli18n-tmp.h:6009
+#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6027
+#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6043
+#: src/xml/xmli18n-tmp.h:6052 src/xml/xmli18n-tmp.h:6060
+#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6082
+#: src/xml/xmli18n-tmp.h:6092 src/xml/xmli18n-tmp.h:6101
+#: src/xml/xmli18n-tmp.h:6109 src/xml/xmli18n-tmp.h:6122
+#: src/xml/xmli18n-tmp.h:6131 src/xml/xmli18n-tmp.h:6141
+#: src/xml/xmli18n-tmp.h:6150 src/xml/xmli18n-tmp.h:6156
+#: src/xml/xmli18n-tmp.h:6165 src/xml/xmli18n-tmp.h:6171
+#: src/xml/xmli18n-tmp.h:6180 src/xml/xmli18n-tmp.h:6188
+#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6210
+#: src/xml/xmli18n-tmp.h:6220 src/xml/xmli18n-tmp.h:6229
+#: src/xml/xmli18n-tmp.h:6237 src/xml/xmli18n-tmp.h:6250
+#: src/xml/xmli18n-tmp.h:6259 src/xml/xmli18n-tmp.h:6269
+#: src/xml/xmli18n-tmp.h:6278 src/xml/xmli18n-tmp.h:6284
+#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6295
+#: src/xml/xmli18n-tmp.h:6304 src/xml/xmli18n-tmp.h:6310
+#: src/xml/xmli18n-tmp.h:6316 src/xml/xmli18n-tmp.h:6322
+#: src/xml/xmli18n-tmp.h:6328 src/xml/xmli18n-tmp.h:6337
+#: src/xml/xmli18n-tmp.h:6343 src/xml/xmli18n-tmp.h:6349
+#: src/xml/xmli18n-tmp.h:6355 src/xml/xmli18n-tmp.h:6361
+#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6382
+#: src/xml/xmli18n-tmp.h:6391 src/xml/xmli18n-tmp.h:6394
+#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
+#: src/xml/xmli18n-tmp.h:6414 src/xml/xmli18n-tmp.h:6421
+#: src/xml/xmli18n-tmp.h:6430 src/xml/xmli18n-tmp.h:6438
+#: src/xml/xmli18n-tmp.h:6451 src/xml/xmli18n-tmp.h:6460
+#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6465
+#: src/xml/xmli18n-tmp.h:6472 src/xml/xmli18n-tmp.h:6483
+#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6499
+#: src/xml/xmli18n-tmp.h:6508 src/xml/xmli18n-tmp.h:6514
+#: src/xml/xmli18n-tmp.h:6520 src/xml/xmli18n-tmp.h:6529
+#: src/xml/xmli18n-tmp.h:6535 src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6556
 msgid "Black"
 msgstr "黑"
 
+#: src/main/print-canon.c:2971 src/main/print-pcl.c:284
+#: src/main/print-pcl.c:285 src/main/generic-options.c:38
+#: src/xml/xmli18n-tmp.h:6585 src/xml/xmli18n-tmp.h:6591
+#: src/xml/xmli18n-tmp.h:6601 src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6619 src/xml/xmli18n-tmp.h:6627
+msgid "Photo"
+msgstr "相片"
+
+#: src/main/print-canon.c:2975 src/main/print-olympus.c:281
+#: src/cups/genppd.c:1448 src/cups/genppd.c:1482 src/cups/genppd.c:1515
+#: src/cups/genppd.c:1570 src/cups/genppd.c:1616 src/cups/genppd.c:1662
+#: src/cups/genppd.c:1675 src/cups/genppd.c:1695 src/cups/genppd.c:1717
+#: src/cups/genppd.c:1734
+msgid "None"
+msgstr ""
+
+#: src/main/print-canon.c:3028 src/main/print-escp2.c:2321
+#: src/main/print-pcl.c:1890 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr ""
+
+#: src/main/print-canon.c:3030 src/main/print-escp2.c:2363
+#: src/main/print-escp2.c:2458 src/main/print-escp2.c:2470
+#: src/main/print-pcl.c:237 src/main/print-pcl.c:281 src/main/print-pcl.c:283
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2846
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1761
+#: src/xml/xmli18n-tmp.h:4130 src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:4149 src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:4160 src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:5686
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:6583
+#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
+#: src/xml/xmli18n-tmp.h:6608 src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Standard"
+msgstr "標準"
+
 #: src/main/print-color.c:50
 msgid "High Accuracy"
 msgstr ""
@@ -646,7 +687,7 @@ msgid "Pre-Dithered"
 msgstr ""
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1266 src/cups/genppd.c:2354
+#: src/cups/genppd.c:1269 src/cups/genppd.c:2361
 msgid "Grayscale"
 msgstr "�階"
 
@@ -662,11 +703,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1297 src/cups/genppd.c:2361
+#: src/main/print-color.c:129 src/cups/genppd.c:1300 src/cups/genppd.c:2368
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1304 src/cups/genppd.c:2362
+#: src/main/print-color.c:131 src/cups/genppd.c:1307 src/cups/genppd.c:2369
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -769,8 +810,8 @@ msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
-#: src/escputil/escputil.c:1027 src/escputil/escputil.c:1047
-#: src/escputil/escputil.c:1315 src/xml/xmli18n-tmp.h:2585
+#: src/escputil/escputil.c:1043 src/escputil/escputil.c:1063
+#: src/escputil/escputil.c:1331 src/xml/xmli18n-tmp.h:2585
 #: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2609
 #: src/xml/xmli18n-tmp.h:2622 src/xml/xmli18n-tmp.h:2636
 #: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2662
@@ -822,178 +863,178 @@ msgstr "程�使用的 Gamma 值"
 #: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3961
 #: src/xml/xmli18n-tmp.h:4028 src/xml/xmli18n-tmp.h:4056
 #: src/xml/xmli18n-tmp.h:4066 src/xml/xmli18n-tmp.h:4078
-#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4171
-#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4184
-#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
-#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
-#: src/xml/xmli18n-tmp.h:4218 src/xml/xmli18n-tmp.h:4222
-#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4233
-#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4243
-#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4254
-#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4264
-#: src/xml/xmli18n-tmp.h:4270 src/xml/xmli18n-tmp.h:4275
-#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4297
-#: src/xml/xmli18n-tmp.h:4303 src/xml/xmli18n-tmp.h:4308
-#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4330
-#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4341
-#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4365
-#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4376
-#: src/xml/xmli18n-tmp.h:4382 src/xml/xmli18n-tmp.h:4387
-#: src/xml/xmli18n-tmp.h:4391 src/xml/xmli18n-tmp.h:4398
-#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4431
-#: src/xml/xmli18n-tmp.h:4438 src/xml/xmli18n-tmp.h:4446
-#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4461
-#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4471
-#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4486
-#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4501
-#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4512
-#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4523
-#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4536
-#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
-#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4566
-#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4576
-#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4591
-#: src/xml/xmli18n-tmp.h:4600 src/xml/xmli18n-tmp.h:4606
-#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4617
-#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4628
-#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4641
-#: src/xml/xmli18n-tmp.h:4645 src/xml/xmli18n-tmp.h:4651
-#: src/xml/xmli18n-tmp.h:4656 src/xml/xmli18n-tmp.h:4677
-#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
-#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4710
-#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4723
-#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
-#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4742
-#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4757
-#: src/xml/xmli18n-tmp.h:4764 src/xml/xmli18n-tmp.h:4772
-#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4785
-#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
-#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4804
-#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4818
-#: src/xml/xmli18n-tmp.h:4828 src/xml/xmli18n-tmp.h:4835
-#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4848
-#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4864
-#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4873
-#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4888
-#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4904
-#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4917
-#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4933
-#: src/xml/xmli18n-tmp.h:4938 src/xml/xmli18n-tmp.h:4942
-#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4957
-#: src/xml/xmli18n-tmp.h:4967 src/xml/xmli18n-tmp.h:4975
-#: src/xml/xmli18n-tmp.h:4982 src/xml/xmli18n-tmp.h:4988
-#: src/xml/xmli18n-tmp.h:4995 src/xml/xmli18n-tmp.h:4999
-#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5016
-#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5031
-#: src/xml/xmli18n-tmp.h:5037 src/xml/xmli18n-tmp.h:5044
-#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5055
-#: src/xml/xmli18n-tmp.h:5065 src/xml/xmli18n-tmp.h:5073
-#: src/xml/xmli18n-tmp.h:5080 src/xml/xmli18n-tmp.h:5086
-#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5097
-#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5114
-#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5129
-#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5142
-#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5153
-#: src/xml/xmli18n-tmp.h:5163 src/xml/xmli18n-tmp.h:5171
-#: src/xml/xmli18n-tmp.h:5178 src/xml/xmli18n-tmp.h:5184
-#: src/xml/xmli18n-tmp.h:5191 src/xml/xmli18n-tmp.h:5195
-#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5212
-#: src/xml/xmli18n-tmp.h:5220 src/xml/xmli18n-tmp.h:5227
-#: src/xml/xmli18n-tmp.h:5233 src/xml/xmli18n-tmp.h:5240
-#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5251
-#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5263
-#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5274
-#: src/xml/xmli18n-tmp.h:5280 src/xml/xmli18n-tmp.h:5286
-#: src/xml/xmli18n-tmp.h:5293 src/xml/xmli18n-tmp.h:5297
-#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5308
-#: src/xml/xmli18n-tmp.h:5312 src/xml/xmli18n-tmp.h:5319
-#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5353
-#: src/xml/xmli18n-tmp.h:5360 src/xml/xmli18n-tmp.h:5364
-#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5375
-#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5386
-#: src/xml/xmli18n-tmp.h:5414 src/xml/xmli18n-tmp.h:5420
-#: src/xml/xmli18n-tmp.h:5427 src/xml/xmli18n-tmp.h:5431
-#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5442
-#: src/xml/xmli18n-tmp.h:5446 src/xml/xmli18n-tmp.h:5453
-#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5487
-#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5498
-#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5509
-#: src/xml/xmli18n-tmp.h:5513 src/xml/xmli18n-tmp.h:5520
-#: src/xml/xmli18n-tmp.h:5548 src/xml/xmli18n-tmp.h:5552
-#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5563
-#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5587
-#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5598
-#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5609
-#: src/xml/xmli18n-tmp.h:5613 src/xml/xmli18n-tmp.h:5620
-#: src/xml/xmli18n-tmp.h:5628 src/xml/xmli18n-tmp.h:5634
-#: src/xml/xmli18n-tmp.h:5641 src/xml/xmli18n-tmp.h:5645
-#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5656
-#: src/xml/xmli18n-tmp.h:5660 src/xml/xmli18n-tmp.h:5667
-#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5680
-#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5693
-#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5705
-#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5717
-#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5728
-#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5739
-#: src/xml/xmli18n-tmp.h:5743 src/xml/xmli18n-tmp.h:5750
-#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5784
-#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5795
-#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5806
-#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5817
-#: src/xml/xmli18n-tmp.h:5845 src/xml/xmli18n-tmp.h:5851
-#: src/xml/xmli18n-tmp.h:5858 src/xml/xmli18n-tmp.h:5862
-#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5873
-#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5884
-#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
-#: src/xml/xmli18n-tmp.h:5906 src/xml/xmli18n-tmp.h:5913
-#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5929
-#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:5938
-#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5953
-#: src/xml/xmli18n-tmp.h:5962 src/xml/xmli18n-tmp.h:5969
-#: src/xml/xmli18n-tmp.h:5975 src/xml/xmli18n-tmp.h:5982
-#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5998
-#: src/xml/xmli18n-tmp.h:6003 src/xml/xmli18n-tmp.h:6007
-#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6022
-#: src/xml/xmli18n-tmp.h:6032 src/xml/xmli18n-tmp.h:6040
-#: src/xml/xmli18n-tmp.h:6047 src/xml/xmli18n-tmp.h:6053
-#: src/xml/xmli18n-tmp.h:6060 src/xml/xmli18n-tmp.h:6064
-#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6081
-#: src/xml/xmli18n-tmp.h:6089 src/xml/xmli18n-tmp.h:6096
-#: src/xml/xmli18n-tmp.h:6102 src/xml/xmli18n-tmp.h:6109
-#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6120
-#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6132
-#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6143
-#: src/xml/xmli18n-tmp.h:6147 src/xml/xmli18n-tmp.h:6152
-#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6168
-#: src/xml/xmli18n-tmp.h:6175 src/xml/xmli18n-tmp.h:6181
-#: src/xml/xmli18n-tmp.h:6188 src/xml/xmli18n-tmp.h:6192
-#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6209
-#: src/xml/xmli18n-tmp.h:6217 src/xml/xmli18n-tmp.h:6224
-#: src/xml/xmli18n-tmp.h:6230 src/xml/xmli18n-tmp.h:6237
-#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6248
-#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6260
-#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6271
-#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6282
-#: src/xml/xmli18n-tmp.h:6286 src/xml/xmli18n-tmp.h:6292
-#: src/xml/xmli18n-tmp.h:6297 src/xml/xmli18n-tmp.h:6315
-#: src/xml/xmli18n-tmp.h:6319 src/xml/xmli18n-tmp.h:6325
-#: src/xml/xmli18n-tmp.h:6330 src/xml/xmli18n-tmp.h:6349
-#: src/xml/xmli18n-tmp.h:6356 src/xml/xmli18n-tmp.h:6362
-#: src/xml/xmli18n-tmp.h:6369 src/xml/xmli18n-tmp.h:6373
-#: src/xml/xmli18n-tmp.h:6385 src/xml/xmli18n-tmp.h:6390
-#: src/xml/xmli18n-tmp.h:6394 src/xml/xmli18n-tmp.h:6401
-#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6418
-#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6431
-#: src/xml/xmli18n-tmp.h:6438 src/xml/xmli18n-tmp.h:6442
-#: src/xml/xmli18n-tmp.h:6454 src/xml/xmli18n-tmp.h:6459
-#: src/xml/xmli18n-tmp.h:6463 src/xml/xmli18n-tmp.h:6470
-#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6486
-#: src/xml/xmli18n-tmp.h:6490 src/xml/xmli18n-tmp.h:6496
-#: src/xml/xmli18n-tmp.h:6501 src/xml/xmli18n-tmp.h:6507
-#: src/xml/xmli18n-tmp.h:6511 src/xml/xmli18n-tmp.h:6517
-#: src/xml/xmli18n-tmp.h:6522 src/xml/xmli18n-tmp.h:6528
-#: src/xml/xmli18n-tmp.h:6532 src/xml/xmli18n-tmp.h:6538
-#: src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:4090 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4213 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4232 src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:4317 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4340 src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:4396 src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:4405 src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4465 src/xml/xmli18n-tmp.h:4475
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:4491 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:4522 src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4730 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:4778 src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4803 src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:4814 src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:4825 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4911 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4971
+#: src/xml/xmli18n-tmp.h:4981 src/xml/xmli18n-tmp.h:4989
+#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5038 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5079 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5136 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5149 src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:5234 src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5277
+#: src/xml/xmli18n-tmp.h:5283 src/xml/xmli18n-tmp.h:5288
+#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5311
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5367
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5378
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5441 src/xml/xmli18n-tmp.h:5445
+#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5467
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5512
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5527 src/xml/xmli18n-tmp.h:5534
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5566
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5577
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5612
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5623
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5634
+#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5655 src/xml/xmli18n-tmp.h:5659
+#: src/xml/xmli18n-tmp.h:5665 src/xml/xmli18n-tmp.h:5670
+#: src/xml/xmli18n-tmp.h:5674 src/xml/xmli18n-tmp.h:5681
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5694
+#: src/xml/xmli18n-tmp.h:5700 src/xml/xmli18n-tmp.h:5707
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5719
+#: 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:5748 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5757 src/xml/xmli18n-tmp.h:5764
+#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5798
+#: src/xml/xmli18n-tmp.h:5805 src/xml/xmli18n-tmp.h:5809
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5824 src/xml/xmli18n-tmp.h:5831
+#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5865
+#: src/xml/xmli18n-tmp.h:5872 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5891 src/xml/xmli18n-tmp.h:5898
+#: src/xml/xmli18n-tmp.h:5907 src/xml/xmli18n-tmp.h:5914
+#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5927
+#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5943
+#: src/xml/xmli18n-tmp.h:5948 src/xml/xmli18n-tmp.h:5952
+#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:5967
+#: src/xml/xmli18n-tmp.h:5976 src/xml/xmli18n-tmp.h:5983
+#: src/xml/xmli18n-tmp.h:5989 src/xml/xmli18n-tmp.h:5996
+#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6012
+#: src/xml/xmli18n-tmp.h:6017 src/xml/xmli18n-tmp.h:6021
+#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6036
+#: src/xml/xmli18n-tmp.h:6046 src/xml/xmli18n-tmp.h:6054
+#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6067
+#: src/xml/xmli18n-tmp.h:6074 src/xml/xmli18n-tmp.h:6078
+#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6095
+#: src/xml/xmli18n-tmp.h:6103 src/xml/xmli18n-tmp.h:6110
+#: src/xml/xmli18n-tmp.h:6116 src/xml/xmli18n-tmp.h:6123
+#: src/xml/xmli18n-tmp.h:6127 src/xml/xmli18n-tmp.h:6134
+#: src/xml/xmli18n-tmp.h:6142 src/xml/xmli18n-tmp.h:6146
+#: src/xml/xmli18n-tmp.h:6151 src/xml/xmli18n-tmp.h:6157
+#: src/xml/xmli18n-tmp.h:6161 src/xml/xmli18n-tmp.h:6166
+#: src/xml/xmli18n-tmp.h:6174 src/xml/xmli18n-tmp.h:6182
+#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6195
+#: src/xml/xmli18n-tmp.h:6202 src/xml/xmli18n-tmp.h:6206
+#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6223
+#: src/xml/xmli18n-tmp.h:6231 src/xml/xmli18n-tmp.h:6238
+#: src/xml/xmli18n-tmp.h:6244 src/xml/xmli18n-tmp.h:6251
+#: src/xml/xmli18n-tmp.h:6255 src/xml/xmli18n-tmp.h:6262
+#: src/xml/xmli18n-tmp.h:6270 src/xml/xmli18n-tmp.h:6274
+#: src/xml/xmli18n-tmp.h:6279 src/xml/xmli18n-tmp.h:6285
+#: src/xml/xmli18n-tmp.h:6290 src/xml/xmli18n-tmp.h:6296
+#: src/xml/xmli18n-tmp.h:6300 src/xml/xmli18n-tmp.h:6306
+#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6329
+#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:6344 src/xml/xmli18n-tmp.h:6363
+#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6376
+#: src/xml/xmli18n-tmp.h:6383 src/xml/xmli18n-tmp.h:6387
+#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6404
+#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:6423 src/xml/xmli18n-tmp.h:6432
+#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:6452 src/xml/xmli18n-tmp.h:6456
+#: src/xml/xmli18n-tmp.h:6468 src/xml/xmli18n-tmp.h:6473
+#: src/xml/xmli18n-tmp.h:6477 src/xml/xmli18n-tmp.h:6484
+#: src/xml/xmli18n-tmp.h:6492 src/xml/xmli18n-tmp.h:6500
+#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6510
+#: src/xml/xmli18n-tmp.h:6515 src/xml/xmli18n-tmp.h:6521
+#: src/xml/xmli18n-tmp.h:6525 src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:6536 src/xml/xmli18n-tmp.h:6542
+#: src/xml/xmli18n-tmp.h:6546 src/xml/xmli18n-tmp.h:6552
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Cyan"
 msgstr "æ°°è—�"
 
@@ -1002,8 +1043,8 @@ msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
-#: src/escputil/escputil.c:1028 src/escputil/escputil.c:1048
-#: src/escputil/escputil.c:1316 src/xml/xmli18n-tmp.h:2586
+#: src/escputil/escputil.c:1044 src/escputil/escputil.c:1064
+#: src/escputil/escputil.c:1332 src/xml/xmli18n-tmp.h:2586
 #: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2610
 #: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2637
 #: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
@@ -1055,178 +1096,178 @@ msgstr "調整氰�色 gamma 值"
 #: src/xml/xmli18n-tmp.h:3962 src/xml/xmli18n-tmp.h:4029
 #: src/xml/xmli18n-tmp.h:4057 src/xml/xmli18n-tmp.h:4067
 #: src/xml/xmli18n-tmp.h:4079 src/xml/xmli18n-tmp.h:4091
-#: src/xml/xmli18n-tmp.h:4173 src/xml/xmli18n-tmp.h:4179
-#: src/xml/xmli18n-tmp.h:4185 src/xml/xmli18n-tmp.h:4189
-#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
-#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4212
-#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4223
-#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4234
-#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4244
-#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4255
-#: src/xml/xmli18n-tmp.h:4261 src/xml/xmli18n-tmp.h:4265
-#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4276
-#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4298
-#: src/xml/xmli18n-tmp.h:4304 src/xml/xmli18n-tmp.h:4309
-#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4331
-#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4342
-#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
-#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4377
-#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
-#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4400
-#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4432
-#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4447
-#: src/xml/xmli18n-tmp.h:4452 src/xml/xmli18n-tmp.h:4462
-#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4472
-#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4487
-#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4502
-#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4513
-#: src/xml/xmli18n-tmp.h:4519 src/xml/xmli18n-tmp.h:4524
-#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4537
-#: src/xml/xmli18n-tmp.h:4544 src/xml/xmli18n-tmp.h:4552
-#: src/xml/xmli18n-tmp.h:4557 src/xml/xmli18n-tmp.h:4567
-#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4577
-#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4592
-#: src/xml/xmli18n-tmp.h:4601 src/xml/xmli18n-tmp.h:4607
-#: src/xml/xmli18n-tmp.h:4614 src/xml/xmli18n-tmp.h:4618
-#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4629
-#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4642
-#: src/xml/xmli18n-tmp.h:4646 src/xml/xmli18n-tmp.h:4652
-#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4678
-#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
-#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4712
-#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
-#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
-#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4744
-#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4759
-#: src/xml/xmli18n-tmp.h:4766 src/xml/xmli18n-tmp.h:4774
-#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4786
-#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
-#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4806
-#: src/xml/xmli18n-tmp.h:4813 src/xml/xmli18n-tmp.h:4820
-#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4837
-#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4849
-#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4865
-#: src/xml/xmli18n-tmp.h:4870 src/xml/xmli18n-tmp.h:4875
-#: src/xml/xmli18n-tmp.h:4882 src/xml/xmli18n-tmp.h:4890
-#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4906
-#: src/xml/xmli18n-tmp.h:4912 src/xml/xmli18n-tmp.h:4918
-#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4934
-#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4944
-#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:4959
-#: src/xml/xmli18n-tmp.h:4969 src/xml/xmli18n-tmp.h:4977
-#: src/xml/xmli18n-tmp.h:4984 src/xml/xmli18n-tmp.h:4990
-#: src/xml/xmli18n-tmp.h:4996 src/xml/xmli18n-tmp.h:5000
-#: src/xml/xmli18n-tmp.h:5008 src/xml/xmli18n-tmp.h:5018
-#: src/xml/xmli18n-tmp.h:5026 src/xml/xmli18n-tmp.h:5033
-#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
-#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5057
-#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5075
-#: src/xml/xmli18n-tmp.h:5082 src/xml/xmli18n-tmp.h:5088
-#: src/xml/xmli18n-tmp.h:5094 src/xml/xmli18n-tmp.h:5098
-#: src/xml/xmli18n-tmp.h:5106 src/xml/xmli18n-tmp.h:5116
-#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5131
-#: src/xml/xmli18n-tmp.h:5137 src/xml/xmli18n-tmp.h:5143
-#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5155
-#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5173
-#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5186
-#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5196
-#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5214
-#: src/xml/xmli18n-tmp.h:5222 src/xml/xmli18n-tmp.h:5229
-#: src/xml/xmli18n-tmp.h:5235 src/xml/xmli18n-tmp.h:5241
-#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5253
-#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
-#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5275
-#: src/xml/xmli18n-tmp.h:5282 src/xml/xmli18n-tmp.h:5288
-#: src/xml/xmli18n-tmp.h:5294 src/xml/xmli18n-tmp.h:5298
-#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
-#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5321
-#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5355
-#: src/xml/xmli18n-tmp.h:5361 src/xml/xmli18n-tmp.h:5365
-#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
-#: src/xml/xmli18n-tmp.h:5381 src/xml/xmli18n-tmp.h:5388
-#: src/xml/xmli18n-tmp.h:5416 src/xml/xmli18n-tmp.h:5422
-#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5432
-#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
-#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5455
-#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5489
-#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5499
-#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
-#: src/xml/xmli18n-tmp.h:5515 src/xml/xmli18n-tmp.h:5522
-#: src/xml/xmli18n-tmp.h:5549 src/xml/xmli18n-tmp.h:5553
-#: src/xml/xmli18n-tmp.h:5559 src/xml/xmli18n-tmp.h:5564
-#: src/xml/xmli18n-tmp.h:5583 src/xml/xmli18n-tmp.h:5589
-#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5599
-#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
-#: src/xml/xmli18n-tmp.h:5615 src/xml/xmli18n-tmp.h:5622
-#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5636
-#: src/xml/xmli18n-tmp.h:5642 src/xml/xmli18n-tmp.h:5646
-#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
-#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5669
-#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5681
-#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5694
-#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5706
-#: src/xml/xmli18n-tmp.h:5713 src/xml/xmli18n-tmp.h:5719
-#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5729
-#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
-#: src/xml/xmli18n-tmp.h:5745 src/xml/xmli18n-tmp.h:5752
-#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5786
-#: src/xml/xmli18n-tmp.h:5792 src/xml/xmli18n-tmp.h:5796
-#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5807
-#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5819
-#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5853
-#: src/xml/xmli18n-tmp.h:5859 src/xml/xmli18n-tmp.h:5863
-#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
-#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5886
-#: src/xml/xmli18n-tmp.h:5895 src/xml/xmli18n-tmp.h:5902
-#: src/xml/xmli18n-tmp.h:5908 src/xml/xmli18n-tmp.h:5914
-#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5930
-#: src/xml/xmli18n-tmp.h:5935 src/xml/xmli18n-tmp.h:5940
-#: src/xml/xmli18n-tmp.h:5947 src/xml/xmli18n-tmp.h:5955
-#: src/xml/xmli18n-tmp.h:5964 src/xml/xmli18n-tmp.h:5971
-#: src/xml/xmli18n-tmp.h:5977 src/xml/xmli18n-tmp.h:5983
-#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5999
-#: src/xml/xmli18n-tmp.h:6004 src/xml/xmli18n-tmp.h:6009
-#: src/xml/xmli18n-tmp.h:6016 src/xml/xmli18n-tmp.h:6024
-#: src/xml/xmli18n-tmp.h:6034 src/xml/xmli18n-tmp.h:6042
-#: src/xml/xmli18n-tmp.h:6049 src/xml/xmli18n-tmp.h:6055
-#: src/xml/xmli18n-tmp.h:6061 src/xml/xmli18n-tmp.h:6065
-#: src/xml/xmli18n-tmp.h:6073 src/xml/xmli18n-tmp.h:6083
-#: src/xml/xmli18n-tmp.h:6091 src/xml/xmli18n-tmp.h:6098
-#: src/xml/xmli18n-tmp.h:6104 src/xml/xmli18n-tmp.h:6110
-#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6122
-#: src/xml/xmli18n-tmp.h:6129 src/xml/xmli18n-tmp.h:6133
-#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
-#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
-#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6170
-#: src/xml/xmli18n-tmp.h:6177 src/xml/xmli18n-tmp.h:6183
-#: src/xml/xmli18n-tmp.h:6189 src/xml/xmli18n-tmp.h:6193
-#: src/xml/xmli18n-tmp.h:6201 src/xml/xmli18n-tmp.h:6211
-#: src/xml/xmli18n-tmp.h:6219 src/xml/xmli18n-tmp.h:6226
-#: src/xml/xmli18n-tmp.h:6232 src/xml/xmli18n-tmp.h:6238
-#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6250
-#: src/xml/xmli18n-tmp.h:6257 src/xml/xmli18n-tmp.h:6261
-#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
-#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6283
-#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6293
-#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6316
-#: src/xml/xmli18n-tmp.h:6320 src/xml/xmli18n-tmp.h:6326
-#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6351
-#: src/xml/xmli18n-tmp.h:6358 src/xml/xmli18n-tmp.h:6364
-#: src/xml/xmli18n-tmp.h:6370 src/xml/xmli18n-tmp.h:6374
-#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6391
-#: src/xml/xmli18n-tmp.h:6396 src/xml/xmli18n-tmp.h:6403
-#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6420
-#: src/xml/xmli18n-tmp.h:6427 src/xml/xmli18n-tmp.h:6433
-#: src/xml/xmli18n-tmp.h:6439 src/xml/xmli18n-tmp.h:6443
-#: src/xml/xmli18n-tmp.h:6455 src/xml/xmli18n-tmp.h:6460
-#: src/xml/xmli18n-tmp.h:6465 src/xml/xmli18n-tmp.h:6472
-#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
-#: src/xml/xmli18n-tmp.h:6491 src/xml/xmli18n-tmp.h:6497
-#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6508
-#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6518
-#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6529
-#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6539
-#: src/xml/xmli18n-tmp.h:6544
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:4209 src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4233 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4269
+#: 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:4308 src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:4318 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4341 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4446
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:4558 src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4615 src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4753 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:4780 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:4804 src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:4815 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4827 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4844 src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:4884 src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4904
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4920
+#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4932
+#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4965 src/xml/xmli18n-tmp.h:4973
+#: src/xml/xmli18n-tmp.h:4983 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:5010 src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:5022 src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:5161 src/xml/xmli18n-tmp.h:5169
+#: src/xml/xmli18n-tmp.h:5179 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5218 src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5278
+#: src/xml/xmli18n-tmp.h:5284 src/xml/xmli18n-tmp.h:5289
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5318 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5335
+#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5375 src/xml/xmli18n-tmp.h:5379
+#: src/xml/xmli18n-tmp.h:5385 src/xml/xmli18n-tmp.h:5390
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5430 src/xml/xmli18n-tmp.h:5436
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5536
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5603
+#: src/xml/xmli18n-tmp.h:5609 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5629 src/xml/xmli18n-tmp.h:5636
+#: src/xml/xmli18n-tmp.h:5644 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5690 src/xml/xmli18n-tmp.h:5695
+#: src/xml/xmli18n-tmp.h:5701 src/xml/xmli18n-tmp.h:5708
+#: src/xml/xmli18n-tmp.h:5713 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:5749 src/xml/xmli18n-tmp.h:5754
+#: src/xml/xmli18n-tmp.h:5759 src/xml/xmli18n-tmp.h:5766
+#: src/xml/xmli18n-tmp.h:5794 src/xml/xmli18n-tmp.h:5800
+#: src/xml/xmli18n-tmp.h:5806 src/xml/xmli18n-tmp.h:5810
+#: src/xml/xmli18n-tmp.h:5816 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5833
+#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5873 src/xml/xmli18n-tmp.h:5877
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5893 src/xml/xmli18n-tmp.h:5900
+#: src/xml/xmli18n-tmp.h:5909 src/xml/xmli18n-tmp.h:5916
+#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5928
+#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:5944
+#: src/xml/xmli18n-tmp.h:5949 src/xml/xmli18n-tmp.h:5954
+#: src/xml/xmli18n-tmp.h:5961 src/xml/xmli18n-tmp.h:5969
+#: src/xml/xmli18n-tmp.h:5978 src/xml/xmli18n-tmp.h:5985
+#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5997
+#: src/xml/xmli18n-tmp.h:6001 src/xml/xmli18n-tmp.h:6013
+#: src/xml/xmli18n-tmp.h:6018 src/xml/xmli18n-tmp.h:6023
+#: src/xml/xmli18n-tmp.h:6030 src/xml/xmli18n-tmp.h:6038
+#: src/xml/xmli18n-tmp.h:6048 src/xml/xmli18n-tmp.h:6056
+#: src/xml/xmli18n-tmp.h:6063 src/xml/xmli18n-tmp.h:6069
+#: src/xml/xmli18n-tmp.h:6075 src/xml/xmli18n-tmp.h:6079
+#: src/xml/xmli18n-tmp.h:6087 src/xml/xmli18n-tmp.h:6097
+#: src/xml/xmli18n-tmp.h:6105 src/xml/xmli18n-tmp.h:6112
+#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6124
+#: src/xml/xmli18n-tmp.h:6128 src/xml/xmli18n-tmp.h:6136
+#: src/xml/xmli18n-tmp.h:6143 src/xml/xmli18n-tmp.h:6147
+#: src/xml/xmli18n-tmp.h:6152 src/xml/xmli18n-tmp.h:6158
+#: src/xml/xmli18n-tmp.h:6162 src/xml/xmli18n-tmp.h:6167
+#: src/xml/xmli18n-tmp.h:6176 src/xml/xmli18n-tmp.h:6184
+#: src/xml/xmli18n-tmp.h:6191 src/xml/xmli18n-tmp.h:6197
+#: src/xml/xmli18n-tmp.h:6203 src/xml/xmli18n-tmp.h:6207
+#: src/xml/xmli18n-tmp.h:6215 src/xml/xmli18n-tmp.h:6225
+#: src/xml/xmli18n-tmp.h:6233 src/xml/xmli18n-tmp.h:6240
+#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6252
+#: src/xml/xmli18n-tmp.h:6256 src/xml/xmli18n-tmp.h:6264
+#: src/xml/xmli18n-tmp.h:6271 src/xml/xmli18n-tmp.h:6275
+#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6286
+#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6297
+#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
+#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6330
+#: src/xml/xmli18n-tmp.h:6334 src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:6345 src/xml/xmli18n-tmp.h:6365
+#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6378
+#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6388
+#: src/xml/xmli18n-tmp.h:6400 src/xml/xmli18n-tmp.h:6405
+#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6417
+#: src/xml/xmli18n-tmp.h:6425 src/xml/xmli18n-tmp.h:6434
+#: src/xml/xmli18n-tmp.h:6441 src/xml/xmli18n-tmp.h:6447
+#: src/xml/xmli18n-tmp.h:6453 src/xml/xmli18n-tmp.h:6457
+#: src/xml/xmli18n-tmp.h:6469 src/xml/xmli18n-tmp.h:6474
+#: src/xml/xmli18n-tmp.h:6479 src/xml/xmli18n-tmp.h:6486
+#: src/xml/xmli18n-tmp.h:6494 src/xml/xmli18n-tmp.h:6501
+#: src/xml/xmli18n-tmp.h:6505 src/xml/xmli18n-tmp.h:6511
+#: src/xml/xmli18n-tmp.h:6516 src/xml/xmli18n-tmp.h:6522
+#: src/xml/xmli18n-tmp.h:6526 src/xml/xmli18n-tmp.h:6532
+#: src/xml/xmli18n-tmp.h:6537 src/xml/xmli18n-tmp.h:6543
+#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6553
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
@@ -1235,8 +1276,8 @@ msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
-#: src/escputil/escputil.c:1029 src/escputil/escputil.c:1049
-#: src/escputil/escputil.c:1317 src/xml/xmli18n-tmp.h:2587
+#: src/escputil/escputil.c:1045 src/escputil/escputil.c:1065
+#: src/escputil/escputil.c:1333 src/xml/xmli18n-tmp.h:2587
 #: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2611
 #: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2638
 #: src/xml/xmli18n-tmp.h:2651 src/xml/xmli18n-tmp.h:2664
@@ -1288,178 +1329,178 @@ msgstr "調整洋紅色 gamma 值"
 #: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3963
 #: src/xml/xmli18n-tmp.h:4030 src/xml/xmli18n-tmp.h:4058
 #: src/xml/xmli18n-tmp.h:4068 src/xml/xmli18n-tmp.h:4080
-#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4175
-#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
-#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4196
-#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4207
-#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
-#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4230
-#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
-#: src/xml/xmli18n-tmp.h:4245 src/xml/xmli18n-tmp.h:4251
-#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4262
-#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4272
-#: src/xml/xmli18n-tmp.h:4277 src/xml/xmli18n-tmp.h:4295
-#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4305
-#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4328
-#: src/xml/xmli18n-tmp.h:4332 src/xml/xmli18n-tmp.h:4338
-#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4363
-#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4374
-#: src/xml/xmli18n-tmp.h:4378 src/xml/xmli18n-tmp.h:4384
-#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
-#: src/xml/xmli18n-tmp.h:4402 src/xml/xmli18n-tmp.h:4427
-#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:4440
-#: src/xml/xmli18n-tmp.h:4448 src/xml/xmli18n-tmp.h:4453
-#: src/xml/xmli18n-tmp.h:4463 src/xml/xmli18n-tmp.h:4467
-#: src/xml/xmli18n-tmp.h:4473 src/xml/xmli18n-tmp.h:4479
-#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4497
-#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4510
-#: src/xml/xmli18n-tmp.h:4514 src/xml/xmli18n-tmp.h:4520
-#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4530
-#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4545
-#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4558
-#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4572
-#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4584
-#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4602
-#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4615
-#: src/xml/xmli18n-tmp.h:4619 src/xml/xmli18n-tmp.h:4625
-#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4635
-#: src/xml/xmli18n-tmp.h:4643 src/xml/xmli18n-tmp.h:4647
-#: src/xml/xmli18n-tmp.h:4653 src/xml/xmli18n-tmp.h:4658
-#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4683
-#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4694
-#: src/xml/xmli18n-tmp.h:4714 src/xml/xmli18n-tmp.h:4720
-#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4729
-#: src/xml/xmli18n-tmp.h:4735 src/xml/xmli18n-tmp.h:4740
-#: src/xml/xmli18n-tmp.h:4746 src/xml/xmli18n-tmp.h:4753
-#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4769
-#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4782
-#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4791
-#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4802
-#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4815
-#: src/xml/xmli18n-tmp.h:4823 src/xml/xmli18n-tmp.h:4832
-#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4845
-#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4854
-#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4871
-#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4884
-#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4901
-#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4914
-#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4923
-#: src/xml/xmli18n-tmp.h:4935 src/xml/xmli18n-tmp.h:4940
-#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:4953
-#: src/xml/xmli18n-tmp.h:4961 src/xml/xmli18n-tmp.h:4971
-#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4986
-#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4997
-#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
-#: src/xml/xmli18n-tmp.h:5020 src/xml/xmli18n-tmp.h:5028
-#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5041
-#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5050
-#: src/xml/xmli18n-tmp.h:5059 src/xml/xmli18n-tmp.h:5069
-#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5084
-#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5095
-#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5108
-#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5126
-#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
-#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5148
-#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5167
-#: src/xml/xmli18n-tmp.h:5175 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:5206
-#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5224
-#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5237
-#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5246
-#: src/xml/xmli18n-tmp.h:5255 src/xml/xmli18n-tmp.h:5261
-#: src/xml/xmli18n-tmp.h:5265 src/xml/xmli18n-tmp.h:5271
-#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5284
-#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5295
-#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5305
-#: src/xml/xmli18n-tmp.h:5310 src/xml/xmli18n-tmp.h:5316
-#: src/xml/xmli18n-tmp.h:5323 src/xml/xmli18n-tmp.h:5351
-#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5362
-#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5372
-#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5383
-#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5418
-#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5429
-#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5439
-#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5450
-#: src/xml/xmli18n-tmp.h:5457 src/xml/xmli18n-tmp.h:5485
-#: src/xml/xmli18n-tmp.h:5491 src/xml/xmli18n-tmp.h:5496
-#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5506
-#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5517
-#: src/xml/xmli18n-tmp.h:5524 src/xml/xmli18n-tmp.h:5550
-#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5560
-#: src/xml/xmli18n-tmp.h:5565 src/xml/xmli18n-tmp.h:5585
-#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5596
-#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5606
-#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5617
-#: src/xml/xmli18n-tmp.h:5624 src/xml/xmli18n-tmp.h:5632
-#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5643
-#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5653
-#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
-#: src/xml/xmli18n-tmp.h:5671 src/xml/xmli18n-tmp.h:5677
-#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5688
-#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5700
-#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5715
-#: src/xml/xmli18n-tmp.h:5721 src/xml/xmli18n-tmp.h:5726
-#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5736
-#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5747
-#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5782
-#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5793
-#: src/xml/xmli18n-tmp.h:5797 src/xml/xmli18n-tmp.h:5803
-#: src/xml/xmli18n-tmp.h:5808 src/xml/xmli18n-tmp.h:5814
-#: src/xml/xmli18n-tmp.h:5821 src/xml/xmli18n-tmp.h:5849
-#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:5860
-#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5870
-#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5881
-#: src/xml/xmli18n-tmp.h:5888 src/xml/xmli18n-tmp.h:5897
-#: src/xml/xmli18n-tmp.h:5904 src/xml/xmli18n-tmp.h:5910
-#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5919
-#: src/xml/xmli18n-tmp.h:5931 src/xml/xmli18n-tmp.h:5936
-#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:5949
-#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:5966
-#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:5979
-#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5988
-#: src/xml/xmli18n-tmp.h:6000 src/xml/xmli18n-tmp.h:6005
-#: src/xml/xmli18n-tmp.h:6011 src/xml/xmli18n-tmp.h:6018
-#: src/xml/xmli18n-tmp.h:6026 src/xml/xmli18n-tmp.h:6036
-#: src/xml/xmli18n-tmp.h:6044 src/xml/xmli18n-tmp.h:6051
-#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6062
-#: src/xml/xmli18n-tmp.h:6066 src/xml/xmli18n-tmp.h:6075
-#: src/xml/xmli18n-tmp.h:6085 src/xml/xmli18n-tmp.h:6093
-#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6106
-#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6115
-#: src/xml/xmli18n-tmp.h:6124 src/xml/xmli18n-tmp.h:6130
-#: src/xml/xmli18n-tmp.h:6134 src/xml/xmli18n-tmp.h:6139
-#: src/xml/xmli18n-tmp.h:6145 src/xml/xmli18n-tmp.h:6149
-#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6164
-#: src/xml/xmli18n-tmp.h:6172 src/xml/xmli18n-tmp.h:6179
-#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6190
-#: src/xml/xmli18n-tmp.h:6194 src/xml/xmli18n-tmp.h:6203
-#: src/xml/xmli18n-tmp.h:6213 src/xml/xmli18n-tmp.h:6221
-#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6234
-#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6243
-#: src/xml/xmli18n-tmp.h:6252 src/xml/xmli18n-tmp.h:6258
-#: src/xml/xmli18n-tmp.h:6262 src/xml/xmli18n-tmp.h:6267
-#: src/xml/xmli18n-tmp.h:6273 src/xml/xmli18n-tmp.h:6278
-#: src/xml/xmli18n-tmp.h:6284 src/xml/xmli18n-tmp.h:6288
-#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6299
-#: src/xml/xmli18n-tmp.h:6317 src/xml/xmli18n-tmp.h:6321
-#: src/xml/xmli18n-tmp.h:6327 src/xml/xmli18n-tmp.h:6332
-#: src/xml/xmli18n-tmp.h:6353 src/xml/xmli18n-tmp.h:6360
-#: src/xml/xmli18n-tmp.h:6366 src/xml/xmli18n-tmp.h:6371
-#: src/xml/xmli18n-tmp.h:6375 src/xml/xmli18n-tmp.h:6387
-#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6398
-#: src/xml/xmli18n-tmp.h:6405 src/xml/xmli18n-tmp.h:6413
-#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6429
-#: src/xml/xmli18n-tmp.h:6435 src/xml/xmli18n-tmp.h:6440
-#: src/xml/xmli18n-tmp.h:6444 src/xml/xmli18n-tmp.h:6456
-#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6467
-#: src/xml/xmli18n-tmp.h:6474 src/xml/xmli18n-tmp.h:6482
-#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6492
-#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6503
-#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6513
-#: src/xml/xmli18n-tmp.h:6519 src/xml/xmli18n-tmp.h:6524
-#: src/xml/xmli18n-tmp.h:6530 src/xml/xmli18n-tmp.h:6534
-#: src/xml/xmli18n-tmp.h:6540 src/xml/xmli18n-tmp.h:6545
+#: src/xml/xmli18n-tmp.h:4092 src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:4195 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4249 src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4265
+#: 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:4309
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4383 src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4462 src/xml/xmli18n-tmp.h:4467
+#: src/xml/xmli18n-tmp.h:4477 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:4487 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4502 src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:4592 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4633 src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:4657 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4693 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:4801 src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:4811 src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4864 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4880 src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4915
+#: src/xml/xmli18n-tmp.h:4922 src/xml/xmli18n-tmp.h:4928
+#: src/xml/xmli18n-tmp.h:4933 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4949 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:4985
+#: src/xml/xmli18n-tmp.h:4993 src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:5049 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:5073 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:5189 src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:5202 src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:5245 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5279 src/xml/xmli18n-tmp.h:5285
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5313 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5330
+#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5365
+#: src/xml/xmli18n-tmp.h:5371 src/xml/xmli18n-tmp.h:5376
+#: src/xml/xmli18n-tmp.h:5380 src/xml/xmli18n-tmp.h:5386
+#: src/xml/xmli18n-tmp.h:5391 src/xml/xmli18n-tmp.h:5397
+#: src/xml/xmli18n-tmp.h:5404 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5438 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5447 src/xml/xmli18n-tmp.h:5453
+#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5464
+#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5499
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5510
+#: src/xml/xmli18n-tmp.h:5514 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5525 src/xml/xmli18n-tmp.h:5531
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5564
+#: src/xml/xmli18n-tmp.h:5568 src/xml/xmli18n-tmp.h:5574
+#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5614 src/xml/xmli18n-tmp.h:5620
+#: src/xml/xmli18n-tmp.h:5625 src/xml/xmli18n-tmp.h:5631
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5652 src/xml/xmli18n-tmp.h:5657
+#: src/xml/xmli18n-tmp.h:5661 src/xml/xmli18n-tmp.h:5667
+#: src/xml/xmli18n-tmp.h:5672 src/xml/xmli18n-tmp.h:5678
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5714
+#: src/xml/xmli18n-tmp.h:5721 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:5750
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5761
+#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5802 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:5835 src/xml/xmli18n-tmp.h:5863
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5874
+#: src/xml/xmli18n-tmp.h:5878 src/xml/xmli18n-tmp.h:5884
+#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5902 src/xml/xmli18n-tmp.h:5911
+#: src/xml/xmli18n-tmp.h:5918 src/xml/xmli18n-tmp.h:5924
+#: src/xml/xmli18n-tmp.h:5929 src/xml/xmli18n-tmp.h:5933
+#: src/xml/xmli18n-tmp.h:5945 src/xml/xmli18n-tmp.h:5950
+#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5963
+#: src/xml/xmli18n-tmp.h:5971 src/xml/xmli18n-tmp.h:5980
+#: src/xml/xmli18n-tmp.h:5987 src/xml/xmli18n-tmp.h:5993
+#: src/xml/xmli18n-tmp.h:5998 src/xml/xmli18n-tmp.h:6002
+#: src/xml/xmli18n-tmp.h:6014 src/xml/xmli18n-tmp.h:6019
+#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6032
+#: src/xml/xmli18n-tmp.h:6040 src/xml/xmli18n-tmp.h:6050
+#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6065
+#: src/xml/xmli18n-tmp.h:6071 src/xml/xmli18n-tmp.h:6076
+#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6089
+#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6107
+#: src/xml/xmli18n-tmp.h:6114 src/xml/xmli18n-tmp.h:6120
+#: src/xml/xmli18n-tmp.h:6125 src/xml/xmli18n-tmp.h:6129
+#: src/xml/xmli18n-tmp.h:6138 src/xml/xmli18n-tmp.h:6144
+#: src/xml/xmli18n-tmp.h:6148 src/xml/xmli18n-tmp.h:6153
+#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6163
+#: src/xml/xmli18n-tmp.h:6168 src/xml/xmli18n-tmp.h:6178
+#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6193
+#: src/xml/xmli18n-tmp.h:6199 src/xml/xmli18n-tmp.h:6204
+#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6217
+#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6235
+#: src/xml/xmli18n-tmp.h:6242 src/xml/xmli18n-tmp.h:6248
+#: src/xml/xmli18n-tmp.h:6253 src/xml/xmli18n-tmp.h:6257
+#: src/xml/xmli18n-tmp.h:6266 src/xml/xmli18n-tmp.h:6272
+#: src/xml/xmli18n-tmp.h:6276 src/xml/xmli18n-tmp.h:6281
+#: src/xml/xmli18n-tmp.h:6287 src/xml/xmli18n-tmp.h:6292
+#: src/xml/xmli18n-tmp.h:6298 src/xml/xmli18n-tmp.h:6302
+#: src/xml/xmli18n-tmp.h:6308 src/xml/xmli18n-tmp.h:6313
+#: src/xml/xmli18n-tmp.h:6331 src/xml/xmli18n-tmp.h:6335
+#: src/xml/xmli18n-tmp.h:6341 src/xml/xmli18n-tmp.h:6346
+#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6374
+#: src/xml/xmli18n-tmp.h:6380 src/xml/xmli18n-tmp.h:6385
+#: src/xml/xmli18n-tmp.h:6389 src/xml/xmli18n-tmp.h:6401
+#: src/xml/xmli18n-tmp.h:6406 src/xml/xmli18n-tmp.h:6412
+#: src/xml/xmli18n-tmp.h:6419 src/xml/xmli18n-tmp.h:6427
+#: src/xml/xmli18n-tmp.h:6436 src/xml/xmli18n-tmp.h:6443
+#: src/xml/xmli18n-tmp.h:6449 src/xml/xmli18n-tmp.h:6454
+#: src/xml/xmli18n-tmp.h:6458 src/xml/xmli18n-tmp.h:6470
+#: src/xml/xmli18n-tmp.h:6475 src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:6488 src/xml/xmli18n-tmp.h:6496
+#: src/xml/xmli18n-tmp.h:6502 src/xml/xmli18n-tmp.h:6506
+#: src/xml/xmli18n-tmp.h:6512 src/xml/xmli18n-tmp.h:6517
+#: src/xml/xmli18n-tmp.h:6523 src/xml/xmli18n-tmp.h:6527
+#: src/xml/xmli18n-tmp.h:6533 src/xml/xmli18n-tmp.h:6538
+#: src/xml/xmli18n-tmp.h:6544 src/xml/xmli18n-tmp.h:6548
+#: src/xml/xmli18n-tmp.h:6554 src/xml/xmli18n-tmp.h:6559
 msgid "Yellow"
 msgstr "黃"
 
@@ -1468,18 +1509,18 @@ msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
-#: src/escputil/escputil.c:1036 src/escputil/escputil.c:1055
+#: src/escputil/escputil.c:1052 src/escputil/escputil.c:1071
 #: src/xml/xmli18n-tmp.h:3429 src/xml/xmli18n-tmp.h:3473
 #: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4434
-#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4480
-#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4498
-#: src/xml/xmli18n-tmp.h:4504 src/xml/xmli18n-tmp.h:4531
-#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4546
-#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4594
-#: src/xml/xmli18n-tmp.h:4603 src/xml/xmli18n-tmp.h:4609
-#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:5689
-#: src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:3800 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4455 src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:4503 src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4553 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4599 src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:4617 src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Red"
 msgstr "ç´…"
 
@@ -1496,14 +1537,14 @@ msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
-#: src/escputil/escputil.c:1037 src/escputil/escputil.c:1056
+#: src/escputil/escputil.c:1053 src/escputil/escputil.c:1072
 #: src/xml/xmli18n-tmp.h:3430 src/xml/xmli18n-tmp.h:3474
 #: src/xml/xmli18n-tmp.h:3492 src/xml/xmli18n-tmp.h:3569
-#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4442
-#: src/xml/xmli18n-tmp.h:4481 src/xml/xmli18n-tmp.h:4490
-#: src/xml/xmli18n-tmp.h:4499 src/xml/xmli18n-tmp.h:4505
-#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:5690
-#: src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:4449 src/xml/xmli18n-tmp.h:4456
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4513 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5716
 msgid "Blue"
 msgstr "è—�"
 
@@ -1515,7 +1556,7 @@ msgstr "調整�色 gamma 值"
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1932
+#: src/main/print-color.c:322 src/main/print-olympus.c:2069
 msgid "Cyan Balance"
 msgstr "氰�色平衡"
 
@@ -1523,7 +1564,7 @@ msgstr "氰�色平衡"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1940
+#: src/main/print-color.c:330 src/main/print-olympus.c:2077
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
@@ -1531,7 +1572,7 @@ msgstr "洋紅色平衡"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1948
+#: src/main/print-color.c:338 src/main/print-olympus.c:2085
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
@@ -1811,10 +1852,6 @@ msgstr ""
 msgid "Add gloss enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:251
-msgid "Ink Set"
-msgstr ""
-
 #: src/main/print-escp2.c:257
 msgid "Printing Direction"
 msgstr "列�方�"
@@ -1823,14 +1860,6 @@ msgstr "列�方�"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:263 src/main/print-olympus.c:1903
-msgid "Borderless"
-msgstr ""
-
-#: src/main/print-escp2.c:264 src/main/print-olympus.c:1904
-msgid "Print without borders"
-msgstr ""
-
 #: src/main/print-escp2.c:269
 msgid "Interleave Method"
 msgstr ""
@@ -1840,7 +1869,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:275 src/main/print-escp2.c:276
-#: src/cups/genppd.c:2168 src/cups/genppd.c:2461
+#: src/cups/genppd.c:2175 src/cups/genppd.c:2468
 msgid "Output Order"
 msgstr ""
 
@@ -2198,140 +2227,148 @@ msgid "Hextone Gray 1 (Lightest) Density Scale"
 msgstr "洋紅色密度"
 
 #: src/main/print-escp2.c:902
-msgid "Drying Time Per Page"
+msgid "Subchannel Cutoff"
 msgstr ""
 
 #: src/main/print-escp2.c:903
-msgid "Set drying time per page"
+msgid "Upper limit for using light ink"
 msgstr ""
 
 #: src/main/print-escp2.c:910
-msgid "Drying Time Per Scan"
+msgid "Drying Time Per Page"
 msgstr ""
 
 #: src/main/print-escp2.c:911
-msgid "Set drying time per scan"
+msgid "Set drying time per page"
 msgstr ""
 
 #: src/main/print-escp2.c:918
-msgid "Minimum Drying Time Per Scan"
+msgid "Drying Time Per Scan"
 msgstr ""
 
 #: src/main/print-escp2.c:919
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:927
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:934
+#: src/main/print-escp2.c:942
 msgid "Quality Enhancement"
 msgstr ""
 
-#: src/main/print-escp2.c:935
+#: src/main/print-escp2.c:943
 msgid "Enhance print quality by additional passes"
 msgstr ""
 
-#: src/main/print-escp2.c:942
+#: src/main/print-escp2.c:950
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "紙張尺寸"
 
-#: src/main/print-escp2.c:943
+#: src/main/print-escp2.c:951
 msgid "Set printer paper thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:950
+#: src/main/print-escp2.c:958
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "黑色密度"
 
-#: src/main/print-escp2.c:951
+#: src/main/print-escp2.c:959
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:958
+#: src/main/print-escp2.c:966
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:959
+#: src/main/print-escp2.c:967
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:966
+#: src/main/print-escp2.c:974
 #, fuzzy
 msgid "Print Method"
 msgstr "列�模�"
 
-#: src/main/print-escp2.c:967
+#: src/main/print-escp2.c:975
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:974
+#: src/main/print-escp2.c:982
 #, fuzzy
 msgid "Platen Gap"
 msgstr "普通紙張"
 
-#: src/main/print-escp2.c:975
+#: src/main/print-escp2.c:983
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:982
+#: src/main/print-escp2.c:990
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:984
+#: src/main/print-escp2.c:992
 #, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:2202
+#: src/main/print-escp2.c:2214
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2204
+#: src/main/print-escp2.c:2216
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2428 src/cups/genppd.c:2084 src/cups/genppd.c:2442
+#: src/main/print-escp2.c:2437 src/cups/genppd.c:2090 src/cups/genppd.c:2449
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:2430
+#: src/main/print-escp2.c:2439
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2432
+#: src/main/print-escp2.c:2441
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2463
+#: src/main/print-escp2.c:2472
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2465
+#: src/main/print-escp2.c:2474
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2467
+#: src/main/print-escp2.c:2476
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2469
+#: src/main/print-escp2.c:2478
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2471
+#: src/main/print-escp2.c:2480
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2507
+#: src/main/print-escp2.c:2516
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:3125
+#: src/main/print-escp2.c:3134
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4380 src/main/print-olympus.c:2638
+#: src/main/print-escp2.c:4386 src/main/print-olympus.c:2775
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -2385,104 +2422,104 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:4182 src/xml/xmli18n-tmp.h:4216
-#: src/xml/xmli18n-tmp.h:4237 src/xml/xmli18n-tmp.h:4258
-#: src/xml/xmli18n-tmp.h:4291 src/xml/xmli18n-tmp.h:4324
-#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4444
-#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4549
-#: src/xml/xmli18n-tmp.h:4611 src/xml/xmli18n-tmp.h:4639
-#: src/xml/xmli18n-tmp.h:4675 src/xml/xmli18n-tmp.h:4721
-#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4846
-#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4993
-#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5091
-#: src/xml/xmli18n-tmp.h:5140 src/xml/xmli18n-tmp.h:5189
-#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5257
-#: src/xml/xmli18n-tmp.h:5291 src/xml/xmli18n-tmp.h:5358
-#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5492
-#: src/xml/xmli18n-tmp.h:5546 src/xml/xmli18n-tmp.h:5592
-#: src/xml/xmli18n-tmp.h:5639 src/xml/xmli18n-tmp.h:5722
-#: src/xml/xmli18n-tmp.h:5789 src/xml/xmli18n-tmp.h:5856
-#: src/xml/xmli18n-tmp.h:5911 src/xml/xmli18n-tmp.h:5980
-#: src/xml/xmli18n-tmp.h:6058 src/xml/xmli18n-tmp.h:6107
-#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6141
-#: src/xml/xmli18n-tmp.h:6186 src/xml/xmli18n-tmp.h:6235
-#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6269
-#: src/xml/xmli18n-tmp.h:6280 src/xml/xmli18n-tmp.h:6313
-#: src/xml/xmli18n-tmp.h:6367 src/xml/xmli18n-tmp.h:6436
-#: src/xml/xmli18n-tmp.h:6484 src/xml/xmli18n-tmp.h:6505
-#: src/xml/xmli18n-tmp.h:6526
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4458
+#: src/xml/xmli18n-tmp.h:4520 src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4689 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5271
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5606
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5803 src/xml/xmli18n-tmp.h:5870
+#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
+#: src/xml/xmli18n-tmp.h:6072 src/xml/xmli18n-tmp.h:6121
+#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6155
+#: src/xml/xmli18n-tmp.h:6200 src/xml/xmli18n-tmp.h:6249
+#: src/xml/xmli18n-tmp.h:6268 src/xml/xmli18n-tmp.h:6283
+#: src/xml/xmli18n-tmp.h:6294 src/xml/xmli18n-tmp.h:6327
+#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:6498 src/xml/xmli18n-tmp.h:6519
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4221
-#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4263
-#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4329
-#: src/xml/xmli18n-tmp.h:4375 src/xml/xmli18n-tmp.h:4424
-#: src/xml/xmli18n-tmp.h:4450 src/xml/xmli18n-tmp.h:4511
-#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4616
-#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4680
-#: src/xml/xmli18n-tmp.h:4726 src/xml/xmli18n-tmp.h:4788
-#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4920
-#: src/xml/xmli18n-tmp.h:4998 src/xml/xmli18n-tmp.h:5047
-#: src/xml/xmli18n-tmp.h:5096 src/xml/xmli18n-tmp.h:5145
-#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5243
-#: src/xml/xmli18n-tmp.h:5262 src/xml/xmli18n-tmp.h:5296
-#: src/xml/xmli18n-tmp.h:5363 src/xml/xmli18n-tmp.h:5430
-#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5551
-#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5644
-#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5794
-#: src/xml/xmli18n-tmp.h:5861 src/xml/xmli18n-tmp.h:5916
-#: src/xml/xmli18n-tmp.h:5985 src/xml/xmli18n-tmp.h:6063
-#: src/xml/xmli18n-tmp.h:6112 src/xml/xmli18n-tmp.h:6131
-#: src/xml/xmli18n-tmp.h:6146 src/xml/xmli18n-tmp.h:6191
-#: src/xml/xmli18n-tmp.h:6240 src/xml/xmli18n-tmp.h:6259
-#: src/xml/xmli18n-tmp.h:6285 src/xml/xmli18n-tmp.h:6318
-#: src/xml/xmli18n-tmp.h:6372 src/xml/xmli18n-tmp.h:6441
-#: src/xml/xmli18n-tmp.h:6489 src/xml/xmli18n-tmp.h:6510
-#: src/xml/xmli18n-tmp.h:6531
+#: src/xml/xmli18n-tmp.h:4201 src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:4256 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:4658 src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4865 src/xml/xmli18n-tmp.h:4934
+#: src/xml/xmli18n-tmp.h:5012 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:5208 src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:5276 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5444
+#: src/xml/xmli18n-tmp.h:5511 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5611 src/xml/xmli18n-tmp.h:5658
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5875 src/xml/xmli18n-tmp.h:5930
+#: src/xml/xmli18n-tmp.h:5999 src/xml/xmli18n-tmp.h:6077
+#: src/xml/xmli18n-tmp.h:6126 src/xml/xmli18n-tmp.h:6145
+#: src/xml/xmli18n-tmp.h:6160 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:6254 src/xml/xmli18n-tmp.h:6273
+#: src/xml/xmli18n-tmp.h:6299 src/xml/xmli18n-tmp.h:6332
+#: src/xml/xmli18n-tmp.h:6386 src/xml/xmli18n-tmp.h:6455
+#: src/xml/xmli18n-tmp.h:6503 src/xml/xmli18n-tmp.h:6524
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4357
-#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:4493
-#: src/xml/xmli18n-tmp.h:4534 src/xml/xmli18n-tmp.h:4598
-#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4770
-#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4902
-#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5029
-#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5127
-#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5225
-#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5345
-#: src/xml/xmli18n-tmp.h:5412 src/xml/xmli18n-tmp.h:5479
-#: src/xml/xmli18n-tmp.h:5579 src/xml/xmli18n-tmp.h:5626
-#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5709
-#: src/xml/xmli18n-tmp.h:5776 src/xml/xmli18n-tmp.h:5843
-#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5967
-#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6094
-#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6222
-#: src/xml/xmli18n-tmp.h:6354 src/xml/xmli18n-tmp.h:6423
+#: src/xml/xmli18n-tmp.h:4183 src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:4548 src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:4722 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4847 src/xml/xmli18n-tmp.h:4916
+#: src/xml/xmli18n-tmp.h:4994 src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:5092 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:5292 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5493
+#: src/xml/xmli18n-tmp.h:5593 src/xml/xmli18n-tmp.h:5640
+#: src/xml/xmli18n-tmp.h:5698 src/xml/xmli18n-tmp.h:5723
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5912 src/xml/xmli18n-tmp.h:5981
+#: src/xml/xmli18n-tmp.h:6059 src/xml/xmli18n-tmp.h:6108
+#: src/xml/xmli18n-tmp.h:6187 src/xml/xmli18n-tmp.h:6236
+#: src/xml/xmli18n-tmp.h:6368 src/xml/xmli18n-tmp.h:6437
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:4176 src/xml/xmli18n-tmp.h:4364
-#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4500
-#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4605
-#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4777
-#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4909
-#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:5036
-#: src/xml/xmli18n-tmp.h:5085 src/xml/xmli18n-tmp.h:5134
-#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5232
-#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5352
-#: src/xml/xmli18n-tmp.h:5419 src/xml/xmli18n-tmp.h:5486
-#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5633
-#: src/xml/xmli18n-tmp.h:5716 src/xml/xmli18n-tmp.h:5783
-#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5905
-#: src/xml/xmli18n-tmp.h:5974 src/xml/xmli18n-tmp.h:6052
-#: src/xml/xmli18n-tmp.h:6101 src/xml/xmli18n-tmp.h:6180
-#: src/xml/xmli18n-tmp.h:6229 src/xml/xmli18n-tmp.h:6361
-#: src/xml/xmli18n-tmp.h:6430
+#: src/xml/xmli18n-tmp.h:4190 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4451 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4556 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:5197 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5299 src/xml/xmli18n-tmp.h:5366
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5500
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5647
+#: src/xml/xmli18n-tmp.h:5730 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5864 src/xml/xmli18n-tmp.h:5919
+#: src/xml/xmli18n-tmp.h:5988 src/xml/xmli18n-tmp.h:6066
+#: src/xml/xmli18n-tmp.h:6115 src/xml/xmli18n-tmp.h:6194
+#: src/xml/xmli18n-tmp.h:6243 src/xml/xmli18n-tmp.h:6375
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Five Color Photo Composite"
 msgstr ""
 
@@ -2808,24 +2845,17 @@ msgstr ""
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:281 src/cups/genppd.c:1445 src/cups/genppd.c:1479
-#: src/cups/genppd.c:1512 src/cups/genppd.c:1567 src/cups/genppd.c:1613
-#: src/cups/genppd.c:1659 src/cups/genppd.c:1672 src/cups/genppd.c:1692
-#: src/cups/genppd.c:1714 src/cups/genppd.c:1731
-msgid "None"
-msgstr ""
-
-#: src/main/print-olympus.c:996 src/main/print-olympus.c:1059
-#: src/main/print-olympus.c:1162
+#: src/main/print-olympus.c:1052 src/main/print-olympus.c:1115
+#: src/main/print-olympus.c:1218
 msgid "Glossy"
 msgstr "光�"
 
-#: src/main/print-olympus.c:997 src/main/print-olympus.c:1060
-#: src/main/print-olympus.c:1163
+#: src/main/print-olympus.c:1053 src/main/print-olympus.c:1116
+#: src/main/print-olympus.c:1219
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1061 src/main/print-olympus.c:1164
+#: src/main/print-olympus.c:1117 src/main/print-olympus.c:1220
 msgid "Matte"
 msgstr ""
 
@@ -2833,32 +2863,32 @@ msgstr ""
 #. 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:1897 src/main/print-olympus.c:1898
+#: src/main/print-olympus.c:2034 src/main/print-olympus.c:2035
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1932 src/main/print-olympus.c:1940
-#: src/main/print-olympus.c:1948 src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2069 src/main/print-olympus.c:2077
+#: src/main/print-olympus.c:2085 src/main/print-olympus.c:2093
 msgid "Output Level Adjustment"
 msgstr ""
 
-#: src/main/print-olympus.c:1933
+#: src/main/print-olympus.c:2070
 msgid "Adjust the cyan balance"
 msgstr "調整氰�色色彩平衡"
 
-#: src/main/print-olympus.c:1941
+#: src/main/print-olympus.c:2078
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1949
+#: src/main/print-olympus.c:2086
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1956
+#: src/main/print-olympus.c:2093
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1957
+#: src/main/print-olympus.c:2094
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
@@ -2890,7 +2920,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6630
+#: src/main/print-pcl.c:238 src/xml/xmli18n-tmp.h:6653
 msgid "Manual"
 msgstr "自�"
 
@@ -2980,26 +3010,19 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:6568 src/xml/xmli18n-tmp.h:6575
-#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6593
-#: src/xml/xmli18n-tmp.h:6601
+#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6589
+#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6607
+#: src/xml/xmli18n-tmp.h:6616 src/xml/xmli18n-tmp.h:6624
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6578
-#: src/xml/xmli18n-tmp.h:6586 src/xml/xmli18n-tmp.h:6595
-#: src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6584 src/xml/xmli18n-tmp.h:6592
+#: src/xml/xmli18n-tmp.h:6600 src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6618 src/xml/xmli18n-tmp.h:6626
 msgid "High"
 msgstr ""
 
-#: src/main/print-pcl.c:284 src/main/print-pcl.c:285
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:6571
-#: src/xml/xmli18n-tmp.h:6577 src/xml/xmli18n-tmp.h:6587
-#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6604
-msgid "Photo"
-msgstr "相片"
-
 #: src/main/print-pcl.c:1671
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -3029,15 +3052,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6608
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:6631
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6653
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:6676
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6772
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6800
 msgid "Custom"
 msgstr "自�"
 
@@ -3045,7 +3068,7 @@ msgstr "自�"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/print-weave.c:1492
+#: src/main/print-weave.c:1492 src/main/print-weave.c:1543
 msgid "Fatal error!"
 msgstr ""
 
@@ -3054,33 +3077,36 @@ 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:6566
-#: src/xml/xmli18n-tmp.h:6582 src/xml/xmli18n-tmp.h:6591
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:6580
+#: src/xml/xmli18n-tmp.h:6596 src/xml/xmli18n-tmp.h:6605
+#: src/xml/xmli18n-tmp.h:6614
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6567
-#: src/xml/xmli18n-tmp.h:6583 src/xml/xmli18n-tmp.h:6592
-#: src/xml/xmli18n-tmp.h:6600
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:6581
+#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6606
+#: src/xml/xmli18n-tmp.h:6615 src/xml/xmli18n-tmp.h:6623
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6572
-#: src/xml/xmli18n-tmp.h:6579 src/xml/xmli18n-tmp.h:6588
-#: src/xml/xmli18n-tmp.h:6597 src/xml/xmli18n-tmp.h:6605
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:6586
+#: src/xml/xmli18n-tmp.h:6593 src/xml/xmli18n-tmp.h:6602
+#: src/xml/xmli18n-tmp.h:6611 src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6573
-#: src/xml/xmli18n-tmp.h:6580 src/xml/xmli18n-tmp.h:6589
-#: src/xml/xmli18n-tmp.h:6598 src/xml/xmli18n-tmp.h:6606
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:6587
+#: src/xml/xmli18n-tmp.h:6594 src/xml/xmli18n-tmp.h:6603
+#: src/xml/xmli18n-tmp.h:6612 src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1324 src/cups/genppd.c:2372
-#: src/xml/xmli18n-tmp.h:6574 src/xml/xmli18n-tmp.h:6581
-#: src/xml/xmli18n-tmp.h:6590 src/xml/xmli18n-tmp.h:6599
-#: src/xml/xmli18n-tmp.h:6607
+#: src/main/generic-options.c:41 src/cups/genppd.c:1327 src/cups/genppd.c:2379
+#: src/xml/xmli18n-tmp.h:6588 src/xml/xmli18n-tmp.h:6595
+#: src/xml/xmli18n-tmp.h:6604 src/xml/xmli18n-tmp.h:6613
+#: src/xml/xmli18n-tmp.h:6622 src/xml/xmli18n-tmp.h:6630
 msgid "Best"
 msgstr ""
 
@@ -3753,120 +3779,120 @@ msgstr "�表機"
 msgid "(Default Printer)"
 msgstr "(�設�表機)"
 
-#: src/cups/genppd.c:152
+#: src/cups/genppd.c:154
 msgid "Printer Features"
 msgstr "�表機功能"
 
-#: src/cups/genppd.c:153
+#: src/cups/genppd.c:155
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:158
+#: src/cups/genppd.c:160
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:159
+#: src/cups/genppd.c:161
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:160
+#: src/cups/genppd.c:162
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:161
+#: src/cups/genppd.c:163
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:162
+#: src/cups/genppd.c:164
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:163
+#: src/cups/genppd.c:165
 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:952
+#: src/cups/genppd.c:960
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:1153 src/cups/genppd.c:1171 src/cups/genppd.c:2317
-#: src/cups/genppd.c:2318
+#: src/cups/genppd.c:1156 src/cups/genppd.c:1174 src/cups/genppd.c:2324
+#: src/cups/genppd.c:2325
 #, fuzzy
 msgid "Media Size"
 msgstr "紙張尺寸："
 
-#: src/cups/genppd.c:1246 src/cups/genppd.c:2353
+#: src/cups/genppd.c:1249 src/cups/genppd.c:2360
 #, fuzzy
 msgid "Color Model"
 msgstr "彩色"
 
-#: src/cups/genppd.c:1273 src/cups/genppd.c:2355
+#: src/cups/genppd.c:1276 src/cups/genppd.c:2362
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "�階"
 
-#: src/cups/genppd.c:1283 src/cups/genppd.c:2359
+#: src/cups/genppd.c:1286 src/cups/genppd.c:2366
 #, fuzzy
 msgid "RGB Color"
 msgstr "彩色"
 
-#: src/cups/genppd.c:1290 src/cups/genppd.c:2360
+#: src/cups/genppd.c:1293 src/cups/genppd.c:2367
 msgid "CMY Color"
 msgstr "CMY 色系"
 
-#: src/cups/genppd.c:1315 src/cups/genppd.c:2370
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2377
 #, fuzzy
 msgid "Color Precision"
 msgstr "色彩修正"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1484 src/cups/genppd.c:1674
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1487 src/cups/genppd.c:1677
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1473 src/cups/genppd.c:1482 src/cups/genppd.c:1673
+#: src/cups/genppd.c:1476 src/cups/genppd.c:1485 src/cups/genppd.c:1676
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1523 src/cups/genppd.c:1589 src/cups/genppd.c:1630
-#: src/cups/genppd.c:1694 src/cups/genppd.c:1725 src/cups/genppd.c:1741
+#: src/cups/genppd.c:1526 src/cups/genppd.c:1592 src/cups/genppd.c:1633
+#: src/cups/genppd.c:1697 src/cups/genppd.c:1728 src/cups/genppd.c:1744
 #, fuzzy
 msgid "Value"
 msgstr "è—�"
 
-#: src/cups/genppd.c:1531 src/cups/genppd.c:1699
+#: src/cups/genppd.c:1534 src/cups/genppd.c:1702
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1574 src/cups/genppd.c:1719
+#: src/cups/genppd.c:1577 src/cups/genppd.c:1722
 #, c-format
 msgid "%.1f mm"
 msgstr ""
 
-#: src/cups/genppd.c:2174 src/cups/genppd.c:2463
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2470
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:2195 src/cups/genppd.c:2479
+#: src/cups/genppd.c:2202 src/cups/genppd.c:2486
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "雙�列�"
 
-#: src/cups/genppd.c:2220 src/cups/genppd.c:2496
+#: src/cups/genppd.c:2227 src/cups/genppd.c:2503
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:2225 src/cups/genppd.c:2497
+#: src/cups/genppd.c:2232 src/cups/genppd.c:2504
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:2226 src/cups/genppd.c:2498
+#: src/cups/genppd.c:2233 src/cups/genppd.c:2505
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:2227 src/cups/genppd.c:2499
+#: src/cups/genppd.c:2234 src/cups/genppd.c:2506
 msgid "Expand (use maximum page area)"
 msgstr ""
 
@@ -4063,28 +4089,28 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "無法由 %s 讀�資料：%s\n"
 
-#: src/escputil/escputil.c:767
+#: src/escputil/escputil.c:769
 #, c-format
 msgid "Please specify a raw device\n"
 msgstr ""
 
-#: src/escputil/escputil.c:774
+#: src/escputil/escputil.c:776
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:821
+#: src/escputil/escputil.c:823
 #, fuzzy, c-format
 msgid "Unknown printer %s!\n"
 msgstr "�明�項 %s\n"
 
-#: src/escputil/escputil.c:876 src/escputil/escputil.c:1500
+#: src/escputil/escputil.c:878 src/escputil/escputil.c:1522
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:927 src/escputil/escputil.c:1479
-#: src/escputil/escputil.c:1586
+#: src/escputil/escputil.c:929 src/escputil/escputil.c:1501
+#: src/escputil/escputil.c:1608
 #, c-format
 msgid ""
 "\n"
@@ -4093,7 +4119,7 @@ msgstr ""
 "\n"
 "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:956
+#: src/escputil/escputil.c:972
 #, c-format
 msgid ""
 "\n"
@@ -4101,7 +4127,7 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1025 src/xml/xmli18n-tmp.h:618
+#: src/escputil/escputil.c:1041 src/xml/xmli18n-tmp.h:618
 #: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:624
 #: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:630
 #: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:636
@@ -4143,22 +4169,22 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2292
 #: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:3428
 #: src/xml/xmli18n-tmp.h:3472 src/xml/xmli18n-tmp.h:3490
-#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4428
-#: src/xml/xmli18n-tmp.h:4533 src/xml/xmli18n-tmp.h:4962
-#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5158
-#: src/xml/xmli18n-tmp.h:6027 src/xml/xmli18n-tmp.h:6125
-#: src/xml/xmli18n-tmp.h:6155 src/xml/xmli18n-tmp.h:6253
+#: src/xml/xmli18n-tmp.h:3799 src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4976
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6139
+#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6267
 msgid "Photo Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1026 src/escputil/escputil.c:1032
-#: src/escputil/escputil.c:1033 src/escputil/escputil.c:1286
-#: src/escputil/escputil.c:1350 src/escputil/escputil.c:1387
+#: src/escputil/escputil.c:1042 src/escputil/escputil.c:1048
+#: src/escputil/escputil.c:1049 src/escputil/escputil.c:1302
+#: src/escputil/escputil.c:1371 src/escputil/escputil.c:1408
 msgid "Unknown"
 msgstr "�詳"
 
-#: src/escputil/escputil.c:1030 src/escputil/escputil.c:1050
-#: src/escputil/escputil.c:1318 src/xml/xmli18n-tmp.h:2678
+#: src/escputil/escputil.c:1046 src/escputil/escputil.c:1066
+#: src/escputil/escputil.c:1334 src/xml/xmli18n-tmp.h:2678
 #: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2710
 #: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2789
 #: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2878
@@ -4180,83 +4206,83 @@ msgstr "�詳"
 #: src/xml/xmli18n-tmp.h:3876 src/xml/xmli18n-tmp.h:3892
 #: src/xml/xmli18n-tmp.h:3909 src/xml/xmli18n-tmp.h:4025
 #: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4081
-#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4172
-#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4204
-#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4211
-#: src/xml/xmli18n-tmp.h:4360 src/xml/xmli18n-tmp.h:4366
-#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4399
-#: src/xml/xmli18n-tmp.h:4711 src/xml/xmli18n-tmp.h:4717
-#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4750
-#: src/xml/xmli18n-tmp.h:4758 src/xml/xmli18n-tmp.h:4765
-#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4779
-#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4812
-#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4829
-#: src/xml/xmli18n-tmp.h:4836 src/xml/xmli18n-tmp.h:4842
-#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
-#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4898
-#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4911
-#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4950
-#: src/xml/xmli18n-tmp.h:4958 src/xml/xmli18n-tmp.h:4968
-#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:4983
-#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:5007
-#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5025
-#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5038
-#: src/xml/xmli18n-tmp.h:5056 src/xml/xmli18n-tmp.h:5066
-#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5081
-#: src/xml/xmli18n-tmp.h:5087 src/xml/xmli18n-tmp.h:5105
-#: src/xml/xmli18n-tmp.h:5115 src/xml/xmli18n-tmp.h:5123
-#: src/xml/xmli18n-tmp.h:5130 src/xml/xmli18n-tmp.h:5136
-#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5164
-#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5179
-#: src/xml/xmli18n-tmp.h:5185 src/xml/xmli18n-tmp.h:5203
-#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5221
-#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5234
-#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5281
-#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5313
-#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5348
-#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5380
-#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5415
-#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5447
-#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5482
-#: src/xml/xmli18n-tmp.h:5488 src/xml/xmli18n-tmp.h:5514
-#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5582
-#: src/xml/xmli18n-tmp.h:5588 src/xml/xmli18n-tmp.h:5614
-#: src/xml/xmli18n-tmp.h:5621 src/xml/xmli18n-tmp.h:5629
-#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5661
-#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5712
-#: src/xml/xmli18n-tmp.h:5718 src/xml/xmli18n-tmp.h:5744
-#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5779
-#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5811
-#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5846
-#: src/xml/xmli18n-tmp.h:5852 src/xml/xmli18n-tmp.h:5878
-#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
-#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5907
-#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:5946
-#: src/xml/xmli18n-tmp.h:5954 src/xml/xmli18n-tmp.h:5963
-#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5976
-#: src/xml/xmli18n-tmp.h:6008 src/xml/xmli18n-tmp.h:6015
-#: src/xml/xmli18n-tmp.h:6023 src/xml/xmli18n-tmp.h:6033
-#: src/xml/xmli18n-tmp.h:6041 src/xml/xmli18n-tmp.h:6048
-#: src/xml/xmli18n-tmp.h:6054 src/xml/xmli18n-tmp.h:6072
-#: src/xml/xmli18n-tmp.h:6082 src/xml/xmli18n-tmp.h:6090
-#: src/xml/xmli18n-tmp.h:6097 src/xml/xmli18n-tmp.h:6103
-#: src/xml/xmli18n-tmp.h:6121 src/xml/xmli18n-tmp.h:6161
-#: src/xml/xmli18n-tmp.h:6169 src/xml/xmli18n-tmp.h:6176
-#: src/xml/xmli18n-tmp.h:6182 src/xml/xmli18n-tmp.h:6200
-#: src/xml/xmli18n-tmp.h:6210 src/xml/xmli18n-tmp.h:6218
-#: src/xml/xmli18n-tmp.h:6225 src/xml/xmli18n-tmp.h:6231
-#: src/xml/xmli18n-tmp.h:6249 src/xml/xmli18n-tmp.h:6350
-#: src/xml/xmli18n-tmp.h:6357 src/xml/xmli18n-tmp.h:6363
-#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6402
-#: src/xml/xmli18n-tmp.h:6410 src/xml/xmli18n-tmp.h:6419
-#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6432
-#: src/xml/xmli18n-tmp.h:6464 src/xml/xmli18n-tmp.h:6471
-#: src/xml/xmli18n-tmp.h:6479
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4224 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4374 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4757 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:4787 src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:4833 src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:4850 src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4903 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4919 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4957 src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:4972 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5003 src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:5031 src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:5046 src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:5070 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5101 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5129 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5144 src/xml/xmli18n-tmp.h:5150
+#: src/xml/xmli18n-tmp.h:5168 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5186 src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:5199 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5242 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5266 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5301 src/xml/xmli18n-tmp.h:5327
+#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5394
+#: src/xml/xmli18n-tmp.h:5401 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5435 src/xml/xmli18n-tmp.h:5461
+#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5496
+#: src/xml/xmli18n-tmp.h:5502 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5596
+#: src/xml/xmli18n-tmp.h:5602 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5643
+#: src/xml/xmli18n-tmp.h:5649 src/xml/xmli18n-tmp.h:5675
+#: src/xml/xmli18n-tmp.h:5682 src/xml/xmli18n-tmp.h:5726
+#: src/xml/xmli18n-tmp.h:5732 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5793
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5825
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5860
+#: src/xml/xmli18n-tmp.h:5866 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5899 src/xml/xmli18n-tmp.h:5908
+#: src/xml/xmli18n-tmp.h:5915 src/xml/xmli18n-tmp.h:5921
+#: src/xml/xmli18n-tmp.h:5953 src/xml/xmli18n-tmp.h:5960
+#: src/xml/xmli18n-tmp.h:5968 src/xml/xmli18n-tmp.h:5977
+#: src/xml/xmli18n-tmp.h:5984 src/xml/xmli18n-tmp.h:5990
+#: src/xml/xmli18n-tmp.h:6022 src/xml/xmli18n-tmp.h:6029
+#: src/xml/xmli18n-tmp.h:6037 src/xml/xmli18n-tmp.h:6047
+#: src/xml/xmli18n-tmp.h:6055 src/xml/xmli18n-tmp.h:6062
+#: src/xml/xmli18n-tmp.h:6068 src/xml/xmli18n-tmp.h:6086
+#: src/xml/xmli18n-tmp.h:6096 src/xml/xmli18n-tmp.h:6104
+#: src/xml/xmli18n-tmp.h:6111 src/xml/xmli18n-tmp.h:6117
+#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6175
+#: src/xml/xmli18n-tmp.h:6183 src/xml/xmli18n-tmp.h:6190
+#: src/xml/xmli18n-tmp.h:6196 src/xml/xmli18n-tmp.h:6214
+#: src/xml/xmli18n-tmp.h:6224 src/xml/xmli18n-tmp.h:6232
+#: src/xml/xmli18n-tmp.h:6239 src/xml/xmli18n-tmp.h:6245
+#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6364
+#: src/xml/xmli18n-tmp.h:6371 src/xml/xmli18n-tmp.h:6377
+#: src/xml/xmli18n-tmp.h:6409 src/xml/xmli18n-tmp.h:6416
+#: src/xml/xmli18n-tmp.h:6424 src/xml/xmli18n-tmp.h:6433
+#: src/xml/xmli18n-tmp.h:6440 src/xml/xmli18n-tmp.h:6446
+#: src/xml/xmli18n-tmp.h:6478 src/xml/xmli18n-tmp.h:6485
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Light Cyan"
 msgstr ""
 
-#: src/escputil/escputil.c:1031 src/escputil/escputil.c:1051
-#: src/escputil/escputil.c:1319 src/xml/xmli18n-tmp.h:2679
+#: src/escputil/escputil.c:1047 src/escputil/escputil.c:1067
+#: src/escputil/escputil.c:1335 src/xml/xmli18n-tmp.h:2679
 #: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2711
 #: src/xml/xmli18n-tmp.h:2776 src/xml/xmli18n-tmp.h:2790
 #: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2879
@@ -4278,114 +4304,114 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:3879 src/xml/xmli18n-tmp.h:3893
 #: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4070
 #: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4094
-#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4180
-#: src/xml/xmli18n-tmp.h:4206 src/xml/xmli18n-tmp.h:4213
-#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
-#: src/xml/xmli18n-tmp.h:4394 src/xml/xmli18n-tmp.h:4401
-#: src/xml/xmli18n-tmp.h:4713 src/xml/xmli18n-tmp.h:4719
-#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4752
-#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4767
-#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4781
-#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
-#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4831
-#: src/xml/xmli18n-tmp.h:4838 src/xml/xmli18n-tmp.h:4844
-#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4883
-#: src/xml/xmli18n-tmp.h:4891 src/xml/xmli18n-tmp.h:4900
-#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4913
-#: src/xml/xmli18n-tmp.h:4945 src/xml/xmli18n-tmp.h:4952
-#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4970
-#: src/xml/xmli18n-tmp.h:4978 src/xml/xmli18n-tmp.h:4985
-#: src/xml/xmli18n-tmp.h:4991 src/xml/xmli18n-tmp.h:5009
-#: src/xml/xmli18n-tmp.h:5019 src/xml/xmli18n-tmp.h:5027
-#: src/xml/xmli18n-tmp.h:5034 src/xml/xmli18n-tmp.h:5040
-#: src/xml/xmli18n-tmp.h:5058 src/xml/xmli18n-tmp.h:5068
-#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5083
-#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5107
-#: src/xml/xmli18n-tmp.h:5117 src/xml/xmli18n-tmp.h:5125
-#: src/xml/xmli18n-tmp.h:5132 src/xml/xmli18n-tmp.h:5138
-#: src/xml/xmli18n-tmp.h:5156 src/xml/xmli18n-tmp.h:5166
-#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5181
-#: src/xml/xmli18n-tmp.h:5187 src/xml/xmli18n-tmp.h:5205
-#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5223
-#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5236
-#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5283
-#: src/xml/xmli18n-tmp.h:5289 src/xml/xmli18n-tmp.h:5315
-#: src/xml/xmli18n-tmp.h:5322 src/xml/xmli18n-tmp.h:5350
-#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5382
-#: src/xml/xmli18n-tmp.h:5389 src/xml/xmli18n-tmp.h:5417
-#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5449
-#: src/xml/xmli18n-tmp.h:5456 src/xml/xmli18n-tmp.h:5484
-#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5516
-#: src/xml/xmli18n-tmp.h:5523 src/xml/xmli18n-tmp.h:5584
-#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5616
-#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5631
-#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5663
-#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5714
-#: src/xml/xmli18n-tmp.h:5720 src/xml/xmli18n-tmp.h:5746
-#: src/xml/xmli18n-tmp.h:5753 src/xml/xmli18n-tmp.h:5781
-#: src/xml/xmli18n-tmp.h:5787 src/xml/xmli18n-tmp.h:5813
-#: src/xml/xmli18n-tmp.h:5820 src/xml/xmli18n-tmp.h:5848
-#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:5880
-#: src/xml/xmli18n-tmp.h:5887 src/xml/xmli18n-tmp.h:5896
-#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:5909
-#: src/xml/xmli18n-tmp.h:5941 src/xml/xmli18n-tmp.h:5948
-#: src/xml/xmli18n-tmp.h:5956 src/xml/xmli18n-tmp.h:5965
-#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:5978
-#: src/xml/xmli18n-tmp.h:6010 src/xml/xmli18n-tmp.h:6017
-#: src/xml/xmli18n-tmp.h:6025 src/xml/xmli18n-tmp.h:6035
-#: src/xml/xmli18n-tmp.h:6043 src/xml/xmli18n-tmp.h:6050
-#: src/xml/xmli18n-tmp.h:6056 src/xml/xmli18n-tmp.h:6074
-#: src/xml/xmli18n-tmp.h:6084 src/xml/xmli18n-tmp.h:6092
-#: src/xml/xmli18n-tmp.h:6099 src/xml/xmli18n-tmp.h:6105
-#: src/xml/xmli18n-tmp.h:6123 src/xml/xmli18n-tmp.h:6163
-#: src/xml/xmli18n-tmp.h:6171 src/xml/xmli18n-tmp.h:6178
-#: src/xml/xmli18n-tmp.h:6184 src/xml/xmli18n-tmp.h:6202
-#: src/xml/xmli18n-tmp.h:6212 src/xml/xmli18n-tmp.h:6220
-#: src/xml/xmli18n-tmp.h:6227 src/xml/xmli18n-tmp.h:6233
-#: src/xml/xmli18n-tmp.h:6251 src/xml/xmli18n-tmp.h:6352
-#: src/xml/xmli18n-tmp.h:6359 src/xml/xmli18n-tmp.h:6365
-#: src/xml/xmli18n-tmp.h:6397 src/xml/xmli18n-tmp.h:6404
-#: src/xml/xmli18n-tmp.h:6412 src/xml/xmli18n-tmp.h:6421
-#: src/xml/xmli18n-tmp.h:6428 src/xml/xmli18n-tmp.h:6434
-#: src/xml/xmli18n-tmp.h:6466 src/xml/xmli18n-tmp.h:6473
-#: src/xml/xmli18n-tmp.h:6481
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:4220 src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4727 src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:4789 src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:4821 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4835 src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4921 src/xml/xmli18n-tmp.h:4927
+#: src/xml/xmli18n-tmp.h:4959 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5005 src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:5048 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:5188 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5229 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5336 src/xml/xmli18n-tmp.h:5364
+#: src/xml/xmli18n-tmp.h:5370 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5463
+#: src/xml/xmli18n-tmp.h:5470 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5504 src/xml/xmli18n-tmp.h:5530
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5598
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5630
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5645
+#: src/xml/xmli18n-tmp.h:5651 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5728
+#: src/xml/xmli18n-tmp.h:5734 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5767 src/xml/xmli18n-tmp.h:5795
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5827
+#: src/xml/xmli18n-tmp.h:5834 src/xml/xmli18n-tmp.h:5862
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5901 src/xml/xmli18n-tmp.h:5910
+#: src/xml/xmli18n-tmp.h:5917 src/xml/xmli18n-tmp.h:5923
+#: src/xml/xmli18n-tmp.h:5955 src/xml/xmli18n-tmp.h:5962
+#: src/xml/xmli18n-tmp.h:5970 src/xml/xmli18n-tmp.h:5979
+#: src/xml/xmli18n-tmp.h:5986 src/xml/xmli18n-tmp.h:5992
+#: src/xml/xmli18n-tmp.h:6024 src/xml/xmli18n-tmp.h:6031
+#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6049
+#: src/xml/xmli18n-tmp.h:6057 src/xml/xmli18n-tmp.h:6064
+#: src/xml/xmli18n-tmp.h:6070 src/xml/xmli18n-tmp.h:6088
+#: src/xml/xmli18n-tmp.h:6098 src/xml/xmli18n-tmp.h:6106
+#: src/xml/xmli18n-tmp.h:6113 src/xml/xmli18n-tmp.h:6119
+#: src/xml/xmli18n-tmp.h:6137 src/xml/xmli18n-tmp.h:6177
+#: src/xml/xmli18n-tmp.h:6185 src/xml/xmli18n-tmp.h:6192
+#: src/xml/xmli18n-tmp.h:6198 src/xml/xmli18n-tmp.h:6216
+#: src/xml/xmli18n-tmp.h:6226 src/xml/xmli18n-tmp.h:6234
+#: src/xml/xmli18n-tmp.h:6241 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:6265 src/xml/xmli18n-tmp.h:6366
+#: src/xml/xmli18n-tmp.h:6373 src/xml/xmli18n-tmp.h:6379
+#: src/xml/xmli18n-tmp.h:6411 src/xml/xmli18n-tmp.h:6418
+#: src/xml/xmli18n-tmp.h:6426 src/xml/xmli18n-tmp.h:6435
+#: src/xml/xmli18n-tmp.h:6442 src/xml/xmli18n-tmp.h:6448
+#: src/xml/xmli18n-tmp.h:6480 src/xml/xmli18n-tmp.h:6487
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Light Magenta"
 msgstr ""
 
-#: src/escputil/escputil.c:1034 src/xml/xmli18n-tmp.h:3206
+#: src/escputil/escputil.c:1050 src/xml/xmli18n-tmp.h:3206
 #: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3910
-#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4827
-#: src/xml/xmli18n-tmp.h:4857 src/xml/xmli18n-tmp.h:4862
-#: src/xml/xmli18n-tmp.h:4887 src/xml/xmli18n-tmp.h:4896
-#: src/xml/xmli18n-tmp.h:4926 src/xml/xmli18n-tmp.h:4931
-#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4965
-#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5004
-#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5023
-#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5063
-#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5102
-#: src/xml/xmli18n-tmp.h:5112 src/xml/xmli18n-tmp.h:5121
-#: src/xml/xmli18n-tmp.h:5151 src/xml/xmli18n-tmp.h:5161
-#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5200
-#: src/xml/xmli18n-tmp.h:5210 src/xml/xmli18n-tmp.h:5219
-#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5892
-#: src/xml/xmli18n-tmp.h:5922 src/xml/xmli18n-tmp.h:5927
-#: src/xml/xmli18n-tmp.h:5952 src/xml/xmli18n-tmp.h:5961
-#: src/xml/xmli18n-tmp.h:5991 src/xml/xmli18n-tmp.h:5996
-#: src/xml/xmli18n-tmp.h:6021 src/xml/xmli18n-tmp.h:6030
-#: src/xml/xmli18n-tmp.h:6039 src/xml/xmli18n-tmp.h:6069
-#: src/xml/xmli18n-tmp.h:6079 src/xml/xmli18n-tmp.h:6088
-#: src/xml/xmli18n-tmp.h:6118 src/xml/xmli18n-tmp.h:6158
-#: src/xml/xmli18n-tmp.h:6167 src/xml/xmli18n-tmp.h:6197
-#: src/xml/xmli18n-tmp.h:6207 src/xml/xmli18n-tmp.h:6216
-#: src/xml/xmli18n-tmp.h:6246 src/xml/xmli18n-tmp.h:6348
-#: src/xml/xmli18n-tmp.h:6378 src/xml/xmli18n-tmp.h:6383
-#: src/xml/xmli18n-tmp.h:6408 src/xml/xmli18n-tmp.h:6417
-#: src/xml/xmli18n-tmp.h:6447 src/xml/xmli18n-tmp.h:6452
-#: src/xml/xmli18n-tmp.h:6477
+#: src/xml/xmli18n-tmp.h:4026 src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:4871 src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:4901 src/xml/xmli18n-tmp.h:4910
+#: src/xml/xmli18n-tmp.h:4940 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4970 src/xml/xmli18n-tmp.h:4979
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5067 src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:5165 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5184 src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5263 src/xml/xmli18n-tmp.h:5906
+#: src/xml/xmli18n-tmp.h:5936 src/xml/xmli18n-tmp.h:5941
+#: src/xml/xmli18n-tmp.h:5966 src/xml/xmli18n-tmp.h:5975
+#: src/xml/xmli18n-tmp.h:6005 src/xml/xmli18n-tmp.h:6010
+#: src/xml/xmli18n-tmp.h:6035 src/xml/xmli18n-tmp.h:6044
+#: src/xml/xmli18n-tmp.h:6053 src/xml/xmli18n-tmp.h:6083
+#: src/xml/xmli18n-tmp.h:6093 src/xml/xmli18n-tmp.h:6102
+#: src/xml/xmli18n-tmp.h:6132 src/xml/xmli18n-tmp.h:6172
+#: src/xml/xmli18n-tmp.h:6181 src/xml/xmli18n-tmp.h:6211
+#: src/xml/xmli18n-tmp.h:6221 src/xml/xmli18n-tmp.h:6230
+#: src/xml/xmli18n-tmp.h:6260 src/xml/xmli18n-tmp.h:6362
+#: src/xml/xmli18n-tmp.h:6392 src/xml/xmli18n-tmp.h:6397
+#: src/xml/xmli18n-tmp.h:6422 src/xml/xmli18n-tmp.h:6431
+#: src/xml/xmli18n-tmp.h:6461 src/xml/xmli18n-tmp.h:6466
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1035 src/xml/xmli18n-tmp.h:619
+#: src/escputil/escputil.c:1051 src/xml/xmli18n-tmp.h:619
 #: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:625
 #: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:631
 #: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:637
@@ -4427,334 +4453,334 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2293
 #: src/xml/xmli18n-tmp.h:2296 src/xml/xmli18n-tmp.h:3427
 #: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4484
-#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4597
-#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5109
-#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:6076
-#: src/xml/xmli18n-tmp.h:6140 src/xml/xmli18n-tmp.h:6204
-#: src/xml/xmli18n-tmp.h:6268
+#: src/xml/xmli18n-tmp.h:3798 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:6090
+#: src/xml/xmli18n-tmp.h:6154 src/xml/xmli18n-tmp.h:6218
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Matte Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1038 src/xml/xmli18n-tmp.h:3431
+#: src/escputil/escputil.c:1054 src/xml/xmli18n-tmp.h:3431
 #: src/xml/xmli18n-tmp.h:3475 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4436
-#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4449
-#: src/xml/xmli18n-tmp.h:4454 src/xml/xmli18n-tmp.h:4459
-#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4474
-#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4491
-#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4548
-#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4559
-#: src/xml/xmli18n-tmp.h:4564 src/xml/xmli18n-tmp.h:4573
-#: src/xml/xmli18n-tmp.h:4579 src/xml/xmli18n-tmp.h:4587
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4482 src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:4555 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:4578 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4610
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1039 src/xml/xmli18n-tmp.h:3533
+#: src/escputil/escputil.c:1055 src/xml/xmli18n-tmp.h:3533
 #: src/xml/xmli18n-tmp.h:3907 src/xml/xmli18n-tmp.h:4023
-#: src/xml/xmli18n-tmp.h:4966 src/xml/xmli18n-tmp.h:5005
-#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5054
-#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5103
-#: src/xml/xmli18n-tmp.h:5113 src/xml/xmli18n-tmp.h:5152
-#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5201
-#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5250
-#: src/xml/xmli18n-tmp.h:6031 src/xml/xmli18n-tmp.h:6070
-#: src/xml/xmli18n-tmp.h:6080 src/xml/xmli18n-tmp.h:6119
-#: src/xml/xmli18n-tmp.h:6159 src/xml/xmli18n-tmp.h:6198
-#: src/xml/xmli18n-tmp.h:6208 src/xml/xmli18n-tmp.h:6247
+#: src/xml/xmli18n-tmp.h:4980 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5029 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5078 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5176 src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:6045 src/xml/xmli18n-tmp.h:6084
+#: src/xml/xmli18n-tmp.h:6094 src/xml/xmli18n-tmp.h:6133
+#: src/xml/xmli18n-tmp.h:6173 src/xml/xmli18n-tmp.h:6212
+#: src/xml/xmli18n-tmp.h:6222 src/xml/xmli18n-tmp.h:6261
 msgid "Light Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1040 src/escputil/escputil.c:1059
-#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4540
-#: src/xml/xmli18n-tmp.h:4547 src/xml/xmli18n-tmp.h:4586
-#: src/xml/xmli18n-tmp.h:4595 src/xml/xmli18n-tmp.h:4604
-#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4637
+#: src/escputil/escputil.c:1056 src/escputil/escputil.c:1075
+#: src/xml/xmli18n-tmp.h:3801 src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:4561 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4651
 msgid "Orange"
 msgstr ""
 
-#: src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1087
 #, c-format
 msgid "Status: Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1074
+#: src/escputil/escputil.c:1090
 #, c-format
 msgid "Status: Self-Printing\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1077
+#: src/escputil/escputil.c:1093
 #, c-format
 msgid "Status: Busy\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1080
+#: src/escputil/escputil.c:1096
 #, fuzzy, c-format
 msgid "Status: Waiting\n"
 msgstr "彩度"
 
-#: src/escputil/escputil.c:1083
+#: src/escputil/escputil.c:1099
 #, c-format
 msgid "Status: Idle\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1086
+#: src/escputil/escputil.c:1102
 #, c-format
 msgid "Status: Paused\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1089
+#: src/escputil/escputil.c:1105
 #, c-format
 msgid "Status: Cleaning\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1092
+#: src/escputil/escputil.c:1108
 #, c-format
 msgid "Status: Factory shipment\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1095
+#: src/escputil/escputil.c:1111
 #, c-format
 msgid "Status: Shutting down\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1098
+#: src/escputil/escputil.c:1114
 #, c-format
 msgid "Status: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1109
+#: src/escputil/escputil.c:1125
 #, c-format
 msgid "Error: Fatal Error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1112
+#: src/escputil/escputil.c:1128
 #, c-format
 msgid "Error: Other interface is selected\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1115
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Error: Cover Open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1118
+#: src/escputil/escputil.c:1134
 #, c-format
 msgid "Error: Paper jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1121
+#: src/escputil/escputil.c:1137
 #, c-format
 msgid "Error: Ink out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1124
+#: src/escputil/escputil.c:1140
 #, c-format
 msgid "Error: Paper out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1127
+#: src/escputil/escputil.c:1143
 #, c-format
 msgid "Error: Miscellaneous paper error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1130
+#: src/escputil/escputil.c:1146
 #, c-format
 msgid "Error: Maintenance cartridge overflow\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1133
+#: src/escputil/escputil.c:1149
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1136
+#: src/escputil/escputil.c:1152
 #, c-format
 msgid "Error: Double feed error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1139
+#: src/escputil/escputil.c:1155
 #, c-format
 msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1142
+#: src/escputil/escputil.c:1158
 #, c-format
 msgid "Error: Unrecoverable cutter error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1145
+#: src/escputil/escputil.c:1161
 #, c-format
 msgid "Error: Recoverable cutter jam\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1148
+#: src/escputil/escputil.c:1164
 #, c-format
 msgid "Error: No maintenance cartridge present\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1151
+#: src/escputil/escputil.c:1167
 #, c-format
 msgid "Error: Rear cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:1170
 #, c-format
 msgid "Error: CD Tray Out\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1157
+#: src/escputil/escputil.c:1173
 #, c-format
 msgid "Error: Card loading error\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1160
+#: src/escputil/escputil.c:1176
 #, c-format
 msgid "Error: Tray cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:1179
 #, c-format
 msgid "Error: Maintenance cartridge cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1166
+#: src/escputil/escputil.c:1182
 #, c-format
 msgid "Error: Front cover open\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1169
+#: src/escputil/escputil.c:1185
 #, c-format
 msgid "Error: Maintenance request\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1172
+#: src/escputil/escputil.c:1188
 #, c-format
 msgid "Error: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1184
+#: src/escputil/escputil.c:1200
 #, c-format
 msgid "Warning: %s Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1187
+#: src/escputil/escputil.c:1203
 #, c-format
 msgid "Warning: Channel %d Ink Low\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1193
+#: src/escputil/escputil.c:1209
 #, c-format
 msgid "Warning: %s Cleaning Disabled\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1196
+#: src/escputil/escputil.c:1212
 #, c-format
 msgid "Warning: Channel %d Cleaning \n"
 msgstr ""
 
-#: src/escputil/escputil.c:1203
+#: src/escputil/escputil.c:1219
 #, c-format
 msgid "Warning: Maintenance cartridge near full\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1206
+#: src/escputil/escputil.c:1222
 #, c-format
 msgid "Warning: Maintenance request pending\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1209
+#: src/escputil/escputil.c:1225
 #, c-format
 msgid "Warning: Unknown (%d)\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1221
+#: src/escputil/escputil.c:1237
 #, c-format
 msgid "Printing nozzle self-test\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1285 src/escputil/escputil.c:1349
+#: src/escputil/escputil.c:1301 src/escputil/escputil.c:1370
 #, fuzzy, c-format
 msgid "Printer Name: %s\n"
 msgstr "�表機�稱："
 
-#: src/escputil/escputil.c:1323 src/escputil/escputil.c:1362
+#: src/escputil/escputil.c:1339 src/escputil/escputil.c:1383
 #, c-format
 msgid "Ink Levels:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
 msgid "Ink color"
 msgstr "墨水�色"
 
-#: src/escputil/escputil.c:1324 src/escputil/escputil.c:1363
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1340 src/escputil/escputil.c:1384
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:1418
+#: src/escputil/escputil.c:1439
 #, c-format
 msgid "Job Name: "
 msgstr ""
 
-#: src/escputil/escputil.c:1447
+#: src/escputil/escputil.c:1469
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:1450
+#: src/escputil/escputil.c:1472
 msgid "status"
 msgstr "狀態"
 
-#: src/escputil/escputil.c:1455
+#: src/escputil/escputil.c:1477
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1541
+#: src/escputil/escputil.c:1563
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Ink cartridge"
 msgstr ""
 
-#: src/escputil/escputil.c:1665 src/escputil/escputil.c:1692
-#: src/escputil/escputil.c:1714 src/escputil/escputil.c:1731
+#: src/escputil/escputil.c:1687 src/escputil/escputil.c:1714
+#: src/escputil/escputil.c:1736 src/escputil/escputil.c:1753
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1666 src/escputil/escputil.c:1693
-#: src/escputil/escputil.c:1715 src/escputil/escputil.c:1732
+#: src/escputil/escputil.c:1688 src/escputil/escputil.c:1715
+#: src/escputil/escputil.c:1737 src/escputil/escputil.c:1754
 msgid "Date"
 msgstr "日期"
 
-#: src/escputil/escputil.c:1761
+#: src/escputil/escputil.c:1783
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1779
+#: src/escputil/escputil.c:1801
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "無法識別�表機型號。\n"
 
-#: src/escputil/escputil.c:1801
+#: src/escputil/escputil.c:1823
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1818
+#: src/escputil/escputil.c:1840
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1822
+#: src/escputil/escputil.c:1844
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4793,7 +4819,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1857
+#: src/escputil/escputil.c:1879
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4829,17 +4855,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1901
+#: src/escputil/escputil.c:1923
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1915 src/escputil/escputil.c:2084
+#: src/escputil/escputil.c:1937 src/escputil/escputil.c:2106
 #, c-format
 msgid "Exiting\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1918
+#: src/escputil/escputil.c:1940
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4851,38 +4877,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1926 src/escputil/escputil.c:1935
-#: src/escputil/escputil.c:1950 src/escputil/escputil.c:1968
-#: src/escputil/escputil.c:2088
+#: src/escputil/escputil.c:1948 src/escputil/escputil.c:1957
+#: src/escputil/escputil.c:1972 src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2110
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1933
+#: src/escputil/escputil.c:1955
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1940
+#: src/escputil/escputil.c:1962
 #, 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:1947
+#: src/escputil/escputil.c:1969
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1955
+#: src/escputil/escputil.c:1977
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1961
+#: src/escputil/escputil.c:1983
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4892,44 +4918,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1973
+#: src/escputil/escputil.c:1995
 #, c-format
 msgid "About to save settings..."
 msgstr "準備儲存設定..."
 
-#: src/escputil/escputil.c:1979
+#: src/escputil/escputil.c:2001
 #, c-format
 msgid "failed!\n"
 msgstr "失敗�\n"
 
-#: src/escputil/escputil.c:1980
+#: src/escputil/escputil.c:2002
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1984
+#: src/escputil/escputil.c:2006
 #, c-format
 msgid "succeeded!\n"
 msgstr "�功�\n"
 
-#: src/escputil/escputil.c:1985
+#: src/escputil/escputil.c:2007
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1990
+#: src/escputil/escputil.c:2012
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1993
+#: src/escputil/escputil.c:2015
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1998
+#: src/escputil/escputil.c:2020
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an %s.\n"
@@ -4940,12 +4966,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2067 src/escputil/escputil.c:2098
-#: src/escputil/escputil.c:2141
+#: src/escputil/escputil.c:2089 src/escputil/escputil.c:2120
+#: src/escputil/escputil.c:2163
 msgid "Press enter to continue > "
 msgstr "請按 enter 繼續 > "
 
-#: src/escputil/escputil.c:2074
+#: src/escputil/escputil.c:2096
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4953,42 +4979,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2087
+#: src/escputil/escputil.c:2109
 #, c-format
 msgid "Pass #%d"
 msgstr "第 %d 次"
 
-#: src/escputil/escputil.c:2095 src/escputil/escputil.c:2140
+#: src/escputil/escputil.c:2117 src/escputil/escputil.c:2162
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "請放入白紙。\n"
 
-#: src/escputil/escputil.c:2114
+#: src/escputil/escputil.c:2136
 #, c-format
 msgid "Number out of range!\n"
 msgstr "數字超出範�以外�\n"
 
-#: src/escputil/escputil.c:2119
+#: src/escputil/escputil.c:2141
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2125
+#: src/escputil/escputil.c:2147
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2132
+#: src/escputil/escputil.c:2154
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:2135
+#: src/escputil/escputil.c:2157
 #, c-format
 msgid "succeeded.\n"
 msgstr "�功。\n"
 
-#: src/escputil/escputil.c:2136
+#: src/escputil/escputil.c:2158
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -4997,11 +5023,20 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:2182
+#: src/escputil/escputil.c:2204
 #, c-format
 msgid "Error in input\n"
 msgstr ""
 
+#: src/gimp2/print-gutenprint.c:47
+msgid "_Print with Gutenprint..."
+msgstr ""
+
+#: src/gimp2/print-gutenprint.c:49
+#, fuzzy
+msgid "<Image>/File/Print with Gutenprint..."
+msgstr "<Image>/檔案/列�..."
+
 #: src/gimp2/print-image-gimp.c:225
 msgid "Printing..."
 msgstr "列�中..."
@@ -5270,21 +5305,21 @@ msgstr "列�中..."
 #: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2573
 #: src/xml/xmli18n-tmp.h:2575 src/xml/xmli18n-tmp.h:2577
 #: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4168
-#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4236
-#: src/xml/xmli18n-tmp.h:4257 src/xml/xmli18n-tmp.h:4290
-#: src/xml/xmli18n-tmp.h:4323 src/xml/xmli18n-tmp.h:4356
-#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4638
-#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:4674
-#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4754
-#: src/xml/xmli18n-tmp.h:5256 src/xml/xmli18n-tmp.h:5277
-#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
-#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
-#: src/xml/xmli18n-tmp.h:5578 src/xml/xmli18n-tmp.h:5625
-#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5775
-#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6279
-#: src/xml/xmli18n-tmp.h:6312 src/xml/xmli18n-tmp.h:6483
-#: src/xml/xmli18n-tmp.h:6504 src/xml/xmli18n-tmp.h:6525
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:4271 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:4437 src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:4685 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:5270 src/xml/xmli18n-tmp.h:5291
+#: src/xml/xmli18n-tmp.h:5358 src/xml/xmli18n-tmp.h:5425
+#: src/xml/xmli18n-tmp.h:5492 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5592 src/xml/xmli18n-tmp.h:5639
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:6293
+#: src/xml/xmli18n-tmp.h:6326 src/xml/xmli18n-tmp.h:6497
+#: src/xml/xmli18n-tmp.h:6518 src/xml/xmli18n-tmp.h:6539
 msgid "EPSON Standard Inks"
 msgstr ""
 
@@ -5314,7 +5349,7 @@ msgstr "雪�銅版紙"
 #: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2305
 #: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2455
 #: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:6612
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Postcard"
 msgstr "明信片"
 
@@ -5617,29 +5652,29 @@ msgstr "精�光�相紙"
 #: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2431
 #: src/xml/xmli18n-tmp.h:2435 src/xml/xmli18n-tmp.h:2439
 #: src/xml/xmli18n-tmp.h:2443 src/xml/xmli18n-tmp.h:2447
-#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4279
-#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4311
-#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4318
-#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4345
-#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4403
-#: src/xml/xmli18n-tmp.h:4404 src/xml/xmli18n-tmp.h:4410
-#: src/xml/xmli18n-tmp.h:4659 src/xml/xmli18n-tmp.h:4660
-#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4695
-#: src/xml/xmli18n-tmp.h:4696 src/xml/xmli18n-tmp.h:4702
-#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5325
-#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5391
-#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5398
-#: src/xml/xmli18n-tmp.h:5458 src/xml/xmli18n-tmp.h:5459
-#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5525
-#: src/xml/xmli18n-tmp.h:5526 src/xml/xmli18n-tmp.h:5532
-#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5567
-#: src/xml/xmli18n-tmp.h:5573 src/xml/xmli18n-tmp.h:5755
-#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5762
-#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5823
-#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:6300
-#: src/xml/xmli18n-tmp.h:6301 src/xml/xmli18n-tmp.h:6307
-#: src/xml/xmli18n-tmp.h:6333 src/xml/xmli18n-tmp.h:6334
-#: src/xml/xmli18n-tmp.h:6340
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:4365 src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:4424
+#: src/xml/xmli18n-tmp.h:4673 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5339
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5405
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5473
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5581
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5769
+#: src/xml/xmli18n-tmp.h:5770 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5836 src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:5843 src/xml/xmli18n-tmp.h:6314
+#: src/xml/xmli18n-tmp.h:6315 src/xml/xmli18n-tmp.h:6321
+#: src/xml/xmli18n-tmp.h:6347 src/xml/xmli18n-tmp.h:6348
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Quadtone"
 msgstr ""
 
@@ -6000,8 +6035,8 @@ msgstr "水彩紙-亮白色"
 #: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2495
 #: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2501
 #: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4824
-#: src/xml/xmli18n-tmp.h:5889 src/xml/xmli18n-tmp.h:6345
+#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:5903 src/xml/xmli18n-tmp.h:6359
 msgid "UltraChrome Photo Black"
 msgstr ""
 
@@ -6076,8 +6111,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:2493 src/xml/xmli18n-tmp.h:2496
 #: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2502
 #: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2508
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4893
-#: src/xml/xmli18n-tmp.h:5958 src/xml/xmli18n-tmp.h:6414
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:4907
+#: src/xml/xmli18n-tmp.h:5972 src/xml/xmli18n-tmp.h:6428
 msgid "UltraChrome Matte Black"
 msgstr ""
 
@@ -6090,10 +6125,10 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1650
 #: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1660
 #: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1670
-#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4416
-#: src/xml/xmli18n-tmp.h:5337 src/xml/xmli18n-tmp.h:5404
-#: src/xml/xmli18n-tmp.h:5471 src/xml/xmli18n-tmp.h:5538
-#: src/xml/xmli18n-tmp.h:5768 src/xml/xmli18n-tmp.h:5835
+#: src/xml/xmli18n-tmp.h:1675 src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5552
+#: src/xml/xmli18n-tmp.h:5782 src/xml/xmli18n-tmp.h:5849
 msgid "Hextone"
 msgstr ""
 
@@ -6234,6 +6269,7 @@ msgstr "360 DPI 高�質"
 #: src/xml/xmli18n-tmp.h:4048 src/xml/xmli18n-tmp.h:4060
 #: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4084
 #: src/xml/xmli18n-tmp.h:4096 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4111 src/xml/xmli18n-tmp.h:4118
 msgid "360 DPI"
 msgstr "360 DPI"
 
@@ -6294,6 +6330,7 @@ msgstr "360 DPI"
 #: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4061
 #: src/xml/xmli18n-tmp.h:4073 src/xml/xmli18n-tmp.h:4085
 #: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:4112 src/xml/xmli18n-tmp.h:4119
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
@@ -6354,6 +6391,7 @@ msgstr "720 x 360 DPI"
 #: src/xml/xmli18n-tmp.h:4050 src/xml/xmli18n-tmp.h:4062
 #: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4086
 #: src/xml/xmli18n-tmp.h:4098 src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4120
 msgid "720 DPI"
 msgstr "720 DPI"
 
@@ -6479,7 +6517,8 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4043 src/xml/xmli18n-tmp.h:4051
 #: src/xml/xmli18n-tmp.h:4063 src/xml/xmli18n-tmp.h:4075
 #: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4099
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4105 src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:4121
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
@@ -6557,6 +6596,7 @@ msgstr "2880 x 720 DPI 最高�質"
 #: src/xml/xmli18n-tmp.h:4012 src/xml/xmli18n-tmp.h:4020
 #: src/xml/xmli18n-tmp.h:4036 src/xml/xmli18n-tmp.h:4044
 #: src/xml/xmli18n-tmp.h:4052 src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4122
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
@@ -6593,12 +6633,13 @@ msgstr "1440 x 1440 DPI"
 #: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4064
 #: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4088
 #: src/xml/xmli18n-tmp.h:4100 src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4123
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
 #: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4768
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:4836
 msgid "Dark Yellow"
 msgstr ""
 
@@ -6620,6 +6661,7 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4022
 #: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4046
 #: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4117 src/xml/xmli18n-tmp.h:4124
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
@@ -6703,8556 +6745,9189 @@ msgstr "洋紅色平衡"
 msgid "Vivid Magenta"
 msgstr "æ´‹ç´…"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4125
 msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Photo Tray"
 msgstr "相片"
 
-#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4117
-#: src/xml/xmli18n-tmp.h:4120 src/xml/xmli18n-tmp.h:4125
-#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4153
-#: src/xml/xmli18n-tmp.h:4157 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:4134 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4171 src/xml/xmli18n-tmp.h:4174
 msgid "Print to CD"
 msgstr "列�至光碟"
 
-#: src/xml/xmli18n-tmp.h:4114 src/xml/xmli18n-tmp.h:4155
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:4172
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115 src/xml/xmli18n-tmp.h:4156
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:4173
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4124
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:4133 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4150
 msgid "Manual Feed"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:4121 src/xml/xmli18n-tmp.h:4128
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:4135 src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:4151
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122 src/xml/xmli18n-tmp.h:4129
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:4154
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126 src/xml/xmli18n-tmp.h:4134
-#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4149
-#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:4140 src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4168 src/xml/xmli18n-tmp.h:4181
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4142
-#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4145 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4161 src/xml/xmli18n-tmp.h:4165
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:4132 src/xml/xmli18n-tmp.h:4143
-#: src/xml/xmli18n-tmp.h:4148 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4146 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4166
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4152
 msgid "Roll Feed (borderless with single cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4153
 msgid "Roll Feed (borderless with double cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4175
 #, fuzzy
 msgid "Photo Board"
 msgstr "相紙"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:4176
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:4177
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:4178
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4179
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191 src/xml/xmli18n-tmp.h:4225
-#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4267
-#: src/xml/xmli18n-tmp.h:4300 src/xml/xmli18n-tmp.h:4333
-#: src/xml/xmli18n-tmp.h:4379 src/xml/xmli18n-tmp.h:4455
-#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4560
-#: src/xml/xmli18n-tmp.h:4620 src/xml/xmli18n-tmp.h:4648
-#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4730
-#: src/xml/xmli18n-tmp.h:4792 src/xml/xmli18n-tmp.h:4858
-#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:5266
-#: src/xml/xmli18n-tmp.h:5300 src/xml/xmli18n-tmp.h:5367
-#: src/xml/xmli18n-tmp.h:5434 src/xml/xmli18n-tmp.h:5501
-#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5601
-#: src/xml/xmli18n-tmp.h:5648 src/xml/xmli18n-tmp.h:5731
-#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5865
-#: src/xml/xmli18n-tmp.h:5923 src/xml/xmli18n-tmp.h:5992
-#: src/xml/xmli18n-tmp.h:6289 src/xml/xmli18n-tmp.h:6322
-#: src/xml/xmli18n-tmp.h:6379 src/xml/xmli18n-tmp.h:6448
-#: src/xml/xmli18n-tmp.h:6493 src/xml/xmli18n-tmp.h:6514
-#: src/xml/xmli18n-tmp.h:6535
+#: src/xml/xmli18n-tmp.h:4205 src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:4393 src/xml/xmli18n-tmp.h:4469
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4634 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:4698 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4806 src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5448 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5662 src/xml/xmli18n-tmp.h:5745
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5879
+#: src/xml/xmli18n-tmp.h:5937 src/xml/xmli18n-tmp.h:6006
+#: src/xml/xmli18n-tmp.h:6303 src/xml/xmli18n-tmp.h:6336
+#: src/xml/xmli18n-tmp.h:6393 src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:6507 src/xml/xmli18n-tmp.h:6528
+#: src/xml/xmli18n-tmp.h:6549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4227
-#: src/xml/xmli18n-tmp.h:4248 src/xml/xmli18n-tmp.h:4269
-#: src/xml/xmli18n-tmp.h:4302 src/xml/xmli18n-tmp.h:4335
-#: src/xml/xmli18n-tmp.h:4381 src/xml/xmli18n-tmp.h:4460
-#: src/xml/xmli18n-tmp.h:4517 src/xml/xmli18n-tmp.h:4565
-#: src/xml/xmli18n-tmp.h:4622 src/xml/xmli18n-tmp.h:4650
-#: src/xml/xmli18n-tmp.h:4686 src/xml/xmli18n-tmp.h:4732
-#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4863
-#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:5268
-#: src/xml/xmli18n-tmp.h:5302 src/xml/xmli18n-tmp.h:5369
-#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5503
-#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5603
-#: src/xml/xmli18n-tmp.h:5650 src/xml/xmli18n-tmp.h:5733
-#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5867
-#: src/xml/xmli18n-tmp.h:5928 src/xml/xmli18n-tmp.h:5997
-#: src/xml/xmli18n-tmp.h:6291 src/xml/xmli18n-tmp.h:6324
-#: src/xml/xmli18n-tmp.h:6384 src/xml/xmli18n-tmp.h:6453
-#: src/xml/xmli18n-tmp.h:6495 src/xml/xmli18n-tmp.h:6516
-#: src/xml/xmli18n-tmp.h:6537
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4395 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4531 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:4946 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5383
+#: src/xml/xmli18n-tmp.h:5450 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5571 src/xml/xmli18n-tmp.h:5617
+#: src/xml/xmli18n-tmp.h:5664 src/xml/xmli18n-tmp.h:5747
+#: src/xml/xmli18n-tmp.h:5814 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5942 src/xml/xmli18n-tmp.h:6011
+#: src/xml/xmli18n-tmp.h:6305 src/xml/xmli18n-tmp.h:6338
+#: src/xml/xmli18n-tmp.h:6398 src/xml/xmli18n-tmp.h:6467
+#: src/xml/xmli18n-tmp.h:6509 src/xml/xmli18n-tmp.h:6530
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197 src/xml/xmli18n-tmp.h:4231
-#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4273
-#: src/xml/xmli18n-tmp.h:4306 src/xml/xmli18n-tmp.h:4339
-#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4521
-#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4654
-#: src/xml/xmli18n-tmp.h:4690 src/xml/xmli18n-tmp.h:4736
-#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4867
-#: src/xml/xmli18n-tmp.h:4936 src/xml/xmli18n-tmp.h:5272
-#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5373
-#: src/xml/xmli18n-tmp.h:5440 src/xml/xmli18n-tmp.h:5507
-#: src/xml/xmli18n-tmp.h:5561 src/xml/xmli18n-tmp.h:5607
-#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5678
-#: src/xml/xmli18n-tmp.h:5703 src/xml/xmli18n-tmp.h:5737
-#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5871
-#: src/xml/xmli18n-tmp.h:5932 src/xml/xmli18n-tmp.h:6001
-#: src/xml/xmli18n-tmp.h:6135 src/xml/xmli18n-tmp.h:6150
-#: src/xml/xmli18n-tmp.h:6263 src/xml/xmli18n-tmp.h:6274
-#: src/xml/xmli18n-tmp.h:6295 src/xml/xmli18n-tmp.h:6328
-#: src/xml/xmli18n-tmp.h:6388 src/xml/xmli18n-tmp.h:6457
-#: src/xml/xmli18n-tmp.h:6499 src/xml/xmli18n-tmp.h:6520
-#: src/xml/xmli18n-tmp.h:6541
+#: src/xml/xmli18n-tmp.h:4211 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4266 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4320 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4399 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4812 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:5286
+#: src/xml/xmli18n-tmp.h:5320 src/xml/xmli18n-tmp.h:5387
+#: src/xml/xmli18n-tmp.h:5454 src/xml/xmli18n-tmp.h:5521
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5692
+#: src/xml/xmli18n-tmp.h:5717 src/xml/xmli18n-tmp.h:5751
+#: src/xml/xmli18n-tmp.h:5818 src/xml/xmli18n-tmp.h:5885
+#: src/xml/xmli18n-tmp.h:5946 src/xml/xmli18n-tmp.h:6015
+#: src/xml/xmli18n-tmp.h:6149 src/xml/xmli18n-tmp.h:6164
+#: src/xml/xmli18n-tmp.h:6277 src/xml/xmli18n-tmp.h:6288
+#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:6402 src/xml/xmli18n-tmp.h:6471
+#: src/xml/xmli18n-tmp.h:6513 src/xml/xmli18n-tmp.h:6534
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202 src/xml/xmli18n-tmp.h:4390
-#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4803
-#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4941
-#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5378
-#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5512
-#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5659
-#: src/xml/xmli18n-tmp.h:5742 src/xml/xmli18n-tmp.h:5809
-#: src/xml/xmli18n-tmp.h:5876 src/xml/xmli18n-tmp.h:5937
-#: src/xml/xmli18n-tmp.h:6006 src/xml/xmli18n-tmp.h:6393
-#: src/xml/xmli18n-tmp.h:6462
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5325 src/xml/xmli18n-tmp.h:5392
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5626 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5756 src/xml/xmli18n-tmp.h:5823
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5951
+#: src/xml/xmli18n-tmp.h:6020 src/xml/xmli18n-tmp.h:6407
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208 src/xml/xmli18n-tmp.h:4396
-#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4631
-#: src/xml/xmli18n-tmp.h:4747 src/xml/xmli18n-tmp.h:4809
-#: src/xml/xmli18n-tmp.h:4878 src/xml/xmli18n-tmp.h:4947
-#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5384
-#: src/xml/xmli18n-tmp.h:5451 src/xml/xmli18n-tmp.h:5518
-#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5665
-#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5748
-#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5882
-#: src/xml/xmli18n-tmp.h:5943 src/xml/xmli18n-tmp.h:6012
-#: src/xml/xmli18n-tmp.h:6399 src/xml/xmli18n-tmp.h:6468
+#: src/xml/xmli18n-tmp.h:4222 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4761 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4892 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5331 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5465 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5632 src/xml/xmli18n-tmp.h:5679
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5762
+#: src/xml/xmli18n-tmp.h:5829 src/xml/xmli18n-tmp.h:5896
+#: src/xml/xmli18n-tmp.h:5957 src/xml/xmli18n-tmp.h:6026
+#: src/xml/xmli18n-tmp.h:6413 src/xml/xmli18n-tmp.h:6482
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
-#: src/xml/xmli18n-tmp.h:4314 src/xml/xmli18n-tmp.h:4320
-#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4353
-#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4412
-#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4662
-#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4698
-#: src/xml/xmli18n-tmp.h:4704 src/xml/xmli18n-tmp.h:5327
-#: src/xml/xmli18n-tmp.h:5333 src/xml/xmli18n-tmp.h:5341
-#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5400
-#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5461
-#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5475
-#: src/xml/xmli18n-tmp.h:5528 src/xml/xmli18n-tmp.h:5534
-#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5569
-#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5758
-#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5772
-#: src/xml/xmli18n-tmp.h:5825 src/xml/xmli18n-tmp.h:5831
-#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:6303
-#: src/xml/xmli18n-tmp.h:6309 src/xml/xmli18n-tmp.h:6336
-#: src/xml/xmli18n-tmp.h:6342
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4328 src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:4361 src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:4420 src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:4434 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:5341
+#: src/xml/xmli18n-tmp.h:5347 src/xml/xmli18n-tmp.h:5355
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5475
+#: src/xml/xmli18n-tmp.h:5481 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5542 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5556 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5839 src/xml/xmli18n-tmp.h:5845
+#: src/xml/xmli18n-tmp.h:5853 src/xml/xmli18n-tmp.h:6317
+#: src/xml/xmli18n-tmp.h:6323 src/xml/xmli18n-tmp.h:6350
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Gray 3"
 msgstr "�階"
 
-#: src/xml/xmli18n-tmp.h:4282 src/xml/xmli18n-tmp.h:4288
-#: src/xml/xmli18n-tmp.h:4315 src/xml/xmli18n-tmp.h:4321
-#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4354
-#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4413
-#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4663
-#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4699
-#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:5328
-#: src/xml/xmli18n-tmp.h:5334 src/xml/xmli18n-tmp.h:5342
-#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5401
-#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5462
-#: src/xml/xmli18n-tmp.h:5468 src/xml/xmli18n-tmp.h:5476
-#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5535
-#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5570
-#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5759
-#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5773
-#: src/xml/xmli18n-tmp.h:5826 src/xml/xmli18n-tmp.h:5832
-#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:6304
-#: src/xml/xmli18n-tmp.h:6310 src/xml/xmli18n-tmp.h:6337
-#: src/xml/xmli18n-tmp.h:6343
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4329 src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:4362 src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:4421 src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:4435 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4719 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5348 src/xml/xmli18n-tmp.h:5356
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5476
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5490
+#: src/xml/xmli18n-tmp.h:5543 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5557 src/xml/xmli18n-tmp.h:5584
+#: src/xml/xmli18n-tmp.h:5590 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5779 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5854 src/xml/xmli18n-tmp.h:6318
+#: src/xml/xmli18n-tmp.h:6324 src/xml/xmli18n-tmp.h:6351
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Gray 2"
 msgstr "�階"
 
-#: src/xml/xmli18n-tmp.h:4283 src/xml/xmli18n-tmp.h:4289
-#: src/xml/xmli18n-tmp.h:4316 src/xml/xmli18n-tmp.h:4322
-#: src/xml/xmli18n-tmp.h:4349 src/xml/xmli18n-tmp.h:4355
-#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4414
-#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4664
-#: src/xml/xmli18n-tmp.h:4670 src/xml/xmli18n-tmp.h:4700
-#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:5329
-#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5343
-#: src/xml/xmli18n-tmp.h:5396 src/xml/xmli18n-tmp.h:5402
-#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5463
-#: src/xml/xmli18n-tmp.h:5469 src/xml/xmli18n-tmp.h:5477
-#: src/xml/xmli18n-tmp.h:5530 src/xml/xmli18n-tmp.h:5536
-#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5571
-#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5760
-#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5774
-#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5833
-#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:6305
-#: src/xml/xmli18n-tmp.h:6311 src/xml/xmli18n-tmp.h:6338
-#: src/xml/xmli18n-tmp.h:6344
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4330 src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:4363 src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:4422 src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4720 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5349 src/xml/xmli18n-tmp.h:5357
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5477
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5544 src/xml/xmli18n-tmp.h:5550
+#: src/xml/xmli18n-tmp.h:5558 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5774
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5788
+#: src/xml/xmli18n-tmp.h:5841 src/xml/xmli18n-tmp.h:5847
+#: src/xml/xmli18n-tmp.h:5855 src/xml/xmli18n-tmp.h:6319
+#: src/xml/xmli18n-tmp.h:6325 src/xml/xmli18n-tmp.h:6352
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Gray 1"
 msgstr "�階"
 
-#: src/xml/xmli18n-tmp.h:4284 src/xml/xmli18n-tmp.h:4317
-#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4409
-#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4701
-#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5397
-#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5531
-#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5761
-#: src/xml/xmli18n-tmp.h:5828 src/xml/xmli18n-tmp.h:6306
-#: src/xml/xmli18n-tmp.h:6339
+#: src/xml/xmli18n-tmp.h:4298 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4364 src/xml/xmli18n-tmp.h:4423
+#: src/xml/xmli18n-tmp.h:4679 src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:5344 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5775
+#: src/xml/xmli18n-tmp.h:5842 src/xml/xmli18n-tmp.h:6320
+#: src/xml/xmli18n-tmp.h:6353
 msgid "MIS Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415 src/xml/xmli18n-tmp.h:5336
-#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5470
-#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5767
-#: src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:4429 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5417 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5781
+#: src/xml/xmli18n-tmp.h:5848
 msgid "MIS Six Tone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418 src/xml/xmli18n-tmp.h:5339
-#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5473
-#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5770
-#: src/xml/xmli18n-tmp.h:5837
+#: src/xml/xmli18n-tmp.h:4432 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5554 src/xml/xmli18n-tmp.h:5784
+#: src/xml/xmli18n-tmp.h:5851
 #, fuzzy
 msgid "Gray 5"
 msgstr "�階"
 
-#: src/xml/xmli18n-tmp.h:4419 src/xml/xmli18n-tmp.h:5340
-#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5474
-#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5771
-#: src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:4433 src/xml/xmli18n-tmp.h:5354
+#: src/xml/xmli18n-tmp.h:5421 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5785
+#: src/xml/xmli18n-tmp.h:5852
 #, fuzzy
 msgid "Gray 4"
 msgstr "�階"
 
-#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:4471 src/xml/xmli18n-tmp.h:4576
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464 src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4583
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4594
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4602
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4603
 #, fuzzy
 msgid "MatteBlack"
 msgstr "黑"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4686
 #, fuzzy
 msgid "Default Black"
 msgstr "�設"
 
-#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4825
-#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4972
-#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5070
-#: src/xml/xmli18n-tmp.h:5119 src/xml/xmli18n-tmp.h:5168
-#: src/xml/xmli18n-tmp.h:5217 src/xml/xmli18n-tmp.h:5890
-#: src/xml/xmli18n-tmp.h:5959 src/xml/xmli18n-tmp.h:6037
-#: src/xml/xmli18n-tmp.h:6086 src/xml/xmli18n-tmp.h:6165
-#: src/xml/xmli18n-tmp.h:6214 src/xml/xmli18n-tmp.h:6346
-#: src/xml/xmli18n-tmp.h:6415
+#: src/xml/xmli18n-tmp.h:4769 src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4986
+#: src/xml/xmli18n-tmp.h:5035 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:5231 src/xml/xmli18n-tmp.h:5904
+#: src/xml/xmli18n-tmp.h:5973 src/xml/xmli18n-tmp.h:6051
+#: src/xml/xmli18n-tmp.h:6100 src/xml/xmli18n-tmp.h:6179
+#: src/xml/xmli18n-tmp.h:6228 src/xml/xmli18n-tmp.h:6360
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:4777
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4885
-#: src/xml/xmli18n-tmp.h:4954 src/xml/xmli18n-tmp.h:5950
-#: src/xml/xmli18n-tmp.h:6019 src/xml/xmli18n-tmp.h:6406
-#: src/xml/xmli18n-tmp.h:6475
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:4968 src/xml/xmli18n-tmp.h:5964
+#: src/xml/xmli18n-tmp.h:6033 src/xml/xmli18n-tmp.h:6420
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4924
-#: src/xml/xmli18n-tmp.h:5920 src/xml/xmli18n-tmp.h:5989
-#: src/xml/xmli18n-tmp.h:6376 src/xml/xmli18n-tmp.h:6445
+#: src/xml/xmli18n-tmp.h:4869 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:5934 src/xml/xmli18n-tmp.h:6003
+#: src/xml/xmli18n-tmp.h:6390 src/xml/xmli18n-tmp.h:6459
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860 src/xml/xmli18n-tmp.h:4929
-#: src/xml/xmli18n-tmp.h:5925 src/xml/xmli18n-tmp.h:5994
-#: src/xml/xmli18n-tmp.h:6381 src/xml/xmli18n-tmp.h:6450
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4943
+#: src/xml/xmli18n-tmp.h:5939 src/xml/xmli18n-tmp.h:6008
+#: src/xml/xmli18n-tmp.h:6395 src/xml/xmli18n-tmp.h:6464
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:5012
-#: src/xml/xmli18n-tmp.h:5061 src/xml/xmli18n-tmp.h:5110
-#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5208
-#: src/xml/xmli18n-tmp.h:6028 src/xml/xmli18n-tmp.h:6077
-#: src/xml/xmli18n-tmp.h:6156 src/xml/xmli18n-tmp.h:6205
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:6042 src/xml/xmli18n-tmp.h:6091
+#: src/xml/xmli18n-tmp.h:6170 src/xml/xmli18n-tmp.h:6219
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002 src/xml/xmli18n-tmp.h:5051
-#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5149
-#: src/xml/xmli18n-tmp.h:5198 src/xml/xmli18n-tmp.h:5247
-#: src/xml/xmli18n-tmp.h:6067 src/xml/xmli18n-tmp.h:6116
-#: src/xml/xmli18n-tmp.h:6195 src/xml/xmli18n-tmp.h:6244
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5114 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:6081 src/xml/xmli18n-tmp.h:6130
+#: src/xml/xmli18n-tmp.h:6209 src/xml/xmli18n-tmp.h:6258
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5673 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5687 src/xml/xmli18n-tmp.h:5705
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6547 src/xml/xmli18n-tmp.h:6552
-#: src/xml/xmli18n-tmp.h:6558
+#: src/xml/xmli18n-tmp.h:6561 src/xml/xmli18n-tmp.h:6566
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Interleave"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6548 src/xml/xmli18n-tmp.h:6553
-#: src/xml/xmli18n-tmp.h:6559
+#: src/xml/xmli18n-tmp.h:6562 src/xml/xmli18n-tmp.h:6567
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6549 src/xml/xmli18n-tmp.h:6554
-#: src/xml/xmli18n-tmp.h:6560
+#: src/xml/xmli18n-tmp.h:6563 src/xml/xmli18n-tmp.h:6568
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6550 src/xml/xmli18n-tmp.h:6555
-#: src/xml/xmli18n-tmp.h:6561
+#: src/xml/xmli18n-tmp.h:6564 src/xml/xmli18n-tmp.h:6569
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6556 src/xml/xmli18n-tmp.h:6562
+#: src/xml/xmli18n-tmp.h:6570 src/xml/xmli18n-tmp.h:6576
 msgid "Interleave 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6563
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6565
+#: src/xml/xmli18n-tmp.h:6579
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6609
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:6610
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:6611
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:6616
+#: src/xml/xmli18n-tmp.h:6639
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:6617
+#: src/xml/xmli18n-tmp.h:6640
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6618
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "L"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6619
+#: src/xml/xmli18n-tmp.h:6642
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6620
+#: src/xml/xmli18n-tmp.h:6643
 msgid "KG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6621
+#: src/xml/xmli18n-tmp.h:6644
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
-#: src/xml/xmli18n-tmp.h:6622
+#: src/xml/xmli18n-tmp.h:6645
 #, fuzzy
 msgid "Epson L Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
-#: src/xml/xmli18n-tmp.h:6623
+#: src/xml/xmli18n-tmp.h:6646
 #, fuzzy
 msgid "4x8"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:6624
+#: src/xml/xmli18n-tmp.h:6647
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:6625
+#: src/xml/xmli18n-tmp.h:6648
 msgid "2L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6626
+#: src/xml/xmli18n-tmp.h:6649
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:6627
+#: src/xml/xmli18n-tmp.h:6650
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:6628
+#: src/xml/xmli18n-tmp.h:6651
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:6629
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Rokukire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6631
+#: src/xml/xmli18n-tmp.h:6654
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:6632
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:6633
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:6634
+#: src/xml/xmli18n-tmp.h:6657
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:6635
+#: src/xml/xmli18n-tmp.h:6658
 msgid "YonKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6636
+#: src/xml/xmli18n-tmp.h:6659
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:6637
+#: src/xml/xmli18n-tmp.h:6660
 msgid "HanKire"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6638
+#: src/xml/xmli18n-tmp.h:6661
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:6639
+#: src/xml/xmli18n-tmp.h:6662
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:6640
+#: src/xml/xmli18n-tmp.h:6663
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:6641
+#: src/xml/xmli18n-tmp.h:6664
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:6642
+#: src/xml/xmli18n-tmp.h:6665
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:6643
+#: src/xml/xmli18n-tmp.h:6666
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:6644
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:6645
+#: src/xml/xmli18n-tmp.h:6668
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:6646
+#: src/xml/xmli18n-tmp.h:6669
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:6647
+#: src/xml/xmli18n-tmp.h:6670
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:6648
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:6649
+#: src/xml/xmli18n-tmp.h:6672
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:6650
+#: src/xml/xmli18n-tmp.h:6673
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:6651
+#: src/xml/xmli18n-tmp.h:6674
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:6652
+#: src/xml/xmli18n-tmp.h:6675
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6654
+#: src/xml/xmli18n-tmp.h:6677
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6655
+#: src/xml/xmli18n-tmp.h:6678
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:6656
+#: src/xml/xmli18n-tmp.h:6679
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:6657
+#: src/xml/xmli18n-tmp.h:6680
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:6658
+#: src/xml/xmli18n-tmp.h:6681
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:6659
+#: src/xml/xmli18n-tmp.h:6682
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:6660
+#: src/xml/xmli18n-tmp.h:6683
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:6661
+#: src/xml/xmli18n-tmp.h:6684
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:6662
+#: src/xml/xmli18n-tmp.h:6685
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:6663
+#: src/xml/xmli18n-tmp.h:6686
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:6664
+#: src/xml/xmli18n-tmp.h:6687
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:6665
+#: src/xml/xmli18n-tmp.h:6688
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:6666
+#: src/xml/xmli18n-tmp.h:6689
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:6667
+#: src/xml/xmli18n-tmp.h:6690
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:6668
+#: src/xml/xmli18n-tmp.h:6691
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:6669
+#: src/xml/xmli18n-tmp.h:6692
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:6670
+#: src/xml/xmli18n-tmp.h:6693
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:6671
+#: src/xml/xmli18n-tmp.h:6694
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:6672
+#: src/xml/xmli18n-tmp.h:6695
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:6673
+#: src/xml/xmli18n-tmp.h:6696
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:6674
+#: src/xml/xmli18n-tmp.h:6697
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:6675
+#: src/xml/xmli18n-tmp.h:6698
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:6676
+#: src/xml/xmli18n-tmp.h:6699
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:6677
+#: src/xml/xmli18n-tmp.h:6700
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:6678
+#: src/xml/xmli18n-tmp.h:6701
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:6679
+#: src/xml/xmli18n-tmp.h:6702
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:6680
+#: src/xml/xmli18n-tmp.h:6703
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:6681
+#: src/xml/xmli18n-tmp.h:6704
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:6682
+#: src/xml/xmli18n-tmp.h:6705
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:6683
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6684
+#: src/xml/xmli18n-tmp.h:6707
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:6685
+#: src/xml/xmli18n-tmp.h:6708
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:6686
+#: src/xml/xmli18n-tmp.h:6709
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:6687
+#: src/xml/xmli18n-tmp.h:6710
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:6688
+#: src/xml/xmli18n-tmp.h:6711
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:6689
+#: src/xml/xmli18n-tmp.h:6712
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:6690
+#: src/xml/xmli18n-tmp.h:6713
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:6691
+#: src/xml/xmli18n-tmp.h:6714
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:6692
+#: src/xml/xmli18n-tmp.h:6715
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:6693
+#: src/xml/xmli18n-tmp.h:6716
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:6694
+#: src/xml/xmli18n-tmp.h:6717
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:6695
+#: src/xml/xmli18n-tmp.h:6718
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:6696
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "C0 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6697
+#: src/xml/xmli18n-tmp.h:6720
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:6698
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "C1 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6699
+#: src/xml/xmli18n-tmp.h:6722
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:6700
+#: src/xml/xmli18n-tmp.h:6723
 #, fuzzy
 msgid "C2 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6701
+#: src/xml/xmli18n-tmp.h:6724
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:6702
+#: src/xml/xmli18n-tmp.h:6725
 #, fuzzy
 msgid "C3 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6703
+#: src/xml/xmli18n-tmp.h:6726
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:6704
+#: src/xml/xmli18n-tmp.h:6727
 #, fuzzy
 msgid "C4 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6705
+#: src/xml/xmli18n-tmp.h:6728
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:6706
+#: src/xml/xmli18n-tmp.h:6729
 #, fuzzy
 msgid "C5 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6707
+#: src/xml/xmli18n-tmp.h:6730
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:6708
+#: src/xml/xmli18n-tmp.h:6731
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6709
+#: src/xml/xmli18n-tmp.h:6732
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:6710
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "C6 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6711
+#: src/xml/xmli18n-tmp.h:6734
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:6712
+#: src/xml/xmli18n-tmp.h:6735
 #, fuzzy
 msgid "DL landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6713
+#: src/xml/xmli18n-tmp.h:6736
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:6714
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6715
+#: src/xml/xmli18n-tmp.h:6738
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:6716
+#: src/xml/xmli18n-tmp.h:6739
 #, fuzzy
 msgid "C7 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6717
+#: src/xml/xmli18n-tmp.h:6740
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:6718
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "C8 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6719
+#: src/xml/xmli18n-tmp.h:6742
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:6720
+#: src/xml/xmli18n-tmp.h:6743
 #, fuzzy
 msgid "C9 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6721
+#: src/xml/xmli18n-tmp.h:6744
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:6722
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "C10 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6723
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "EA5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:6724
+#: src/xml/xmli18n-tmp.h:6747
 #, fuzzy
 msgid "EA5 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:6725
+#: src/xml/xmli18n-tmp.h:6748
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:6726
+#: src/xml/xmli18n-tmp.h:6749
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6727
+#: src/xml/xmli18n-tmp.h:6750
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:6728
+#: src/xml/xmli18n-tmp.h:6751
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6729
+#: src/xml/xmli18n-tmp.h:6752
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:6730
+#: src/xml/xmli18n-tmp.h:6753
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6731
+#: src/xml/xmli18n-tmp.h:6754
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:6732
+#: src/xml/xmli18n-tmp.h:6755
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6733
+#: src/xml/xmli18n-tmp.h:6756
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:6734
+#: src/xml/xmli18n-tmp.h:6757
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6735
+#: src/xml/xmli18n-tmp.h:6758
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6736
+#: src/xml/xmli18n-tmp.h:6759
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6737
+#: src/xml/xmli18n-tmp.h:6760
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6738
+#: src/xml/xmli18n-tmp.h:6761
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6739
+#: src/xml/xmli18n-tmp.h:6762
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:6740
+#: src/xml/xmli18n-tmp.h:6763
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6741
+#: src/xml/xmli18n-tmp.h:6764
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:6742
+#: src/xml/xmli18n-tmp.h:6765
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6743
+#: src/xml/xmli18n-tmp.h:6766
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:6744
+#: src/xml/xmli18n-tmp.h:6767
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6745
+#: src/xml/xmli18n-tmp.h:6768
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6746
+#: src/xml/xmli18n-tmp.h:6769
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6747
+#: src/xml/xmli18n-tmp.h:6770
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6748
+#: src/xml/xmli18n-tmp.h:6771
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6749
+#: src/xml/xmli18n-tmp.h:6772
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6750
+#: src/xml/xmli18n-tmp.h:6773
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6751
+#: src/xml/xmli18n-tmp.h:6774
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6752
+#: src/xml/xmli18n-tmp.h:6775
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6753
+#: src/xml/xmli18n-tmp.h:6776
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6754
+#: src/xml/xmli18n-tmp.h:6777
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6755
+#: src/xml/xmli18n-tmp.h:6778
+msgid "Japanese Western-style envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "Japanese Western-style envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "Japanese Western-style envelope #6"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "Japanese Western-style envelope #6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6782
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6756
+#: src/xml/xmli18n-tmp.h:6783
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6757
+#: src/xml/xmli18n-tmp.h:6784
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6758
+#: src/xml/xmli18n-tmp.h:6785
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6759
+#: src/xml/xmli18n-tmp.h:6786
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6760
+#: src/xml/xmli18n-tmp.h:6787
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6761
+#: src/xml/xmli18n-tmp.h:6788
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6762
+#: src/xml/xmli18n-tmp.h:6789
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:6763
+#: src/xml/xmli18n-tmp.h:6790
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:6764
+#: src/xml/xmli18n-tmp.h:6791
 msgid "Wide 101.6x180.6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6765
+#: src/xml/xmli18n-tmp.h:6792
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6766
+#: src/xml/xmli18n-tmp.h:6793 src/xml/xmli18n-tmp.h:6794
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6767
+#: src/xml/xmli18n-tmp.h:6795
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6768
+#: src/xml/xmli18n-tmp.h:6796
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6769
+#: src/xml/xmli18n-tmp.h:6797
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6770
+#: src/xml/xmli18n-tmp.h:6798
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6771
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "A3+"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:6773
+#: src/xml/xmli18n-tmp.h:6801
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6774
+#: src/xml/xmli18n-tmp.h:6802
 msgid "4 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6775
+#: src/xml/xmli18n-tmp.h:6803
 msgid "5 Inch Roll Paper"
 msgstr "5 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6776
+#: src/xml/xmli18n-tmp.h:6804
 msgid "210 mm Roll Paper"
 msgstr "210 毫米滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6777
+#: src/xml/xmli18n-tmp.h:6805
 msgid "13 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6778
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6779
+#: src/xml/xmli18n-tmp.h:6807
 msgid "22 Inch Roll Paper"
 msgstr "22 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6780
+#: src/xml/xmli18n-tmp.h:6808
 msgid "24 Inch Roll Paper"
 msgstr "24 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6781
+#: src/xml/xmli18n-tmp.h:6809
 msgid "36 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6782
+#: src/xml/xmli18n-tmp.h:6810
 msgid "44 Inch Roll Paper"
 msgstr "44 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6783
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6784
+#: src/xml/xmli18n-tmp.h:6812
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:6785
+#: src/xml/xmli18n-tmp.h:6813
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6786
+#: src/xml/xmli18n-tmp.h:6814
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6787
+#: src/xml/xmli18n-tmp.h:6815
 #, fuzzy
 msgid "Canon BJ-30"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6788
+#: src/xml/xmli18n-tmp.h:6816
 #, fuzzy
 msgid "Canon BJC-50"
 msgstr "Canon BJC 50"
 
-#: src/xml/xmli18n-tmp.h:6789
+#: src/xml/xmli18n-tmp.h:6817
 #, fuzzy
 msgid "Canon BJC-55"
 msgstr "Canon BJC 55"
 
-#: src/xml/xmli18n-tmp.h:6790
+#: src/xml/xmli18n-tmp.h:6818
 #, fuzzy
 msgid "Canon BJC-80"
 msgstr "Canon BJC 80"
 
-#: src/xml/xmli18n-tmp.h:6791
+#: src/xml/xmli18n-tmp.h:6819
 #, fuzzy
 msgid "Canon BJC-85"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:6792
+#: src/xml/xmli18n-tmp.h:6820
 #, fuzzy
 msgid "Canon BJC-210"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:6793
+#: src/xml/xmli18n-tmp.h:6821
 #, fuzzy
 msgid "Canon BJC-240"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:6794
+#: src/xml/xmli18n-tmp.h:6822
 #, fuzzy
 msgid "Canon BJC-250"
 msgstr "Canon BJC 250"
 
-#: src/xml/xmli18n-tmp.h:6795
+#: src/xml/xmli18n-tmp.h:6823
 #, fuzzy
 msgid "Canon BJC-1000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6796
+#: src/xml/xmli18n-tmp.h:6824
 #, fuzzy
 msgid "Canon BJC-2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:6797
+#: src/xml/xmli18n-tmp.h:6825
 #, fuzzy
 msgid "Canon BJC-2010"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:6798
+#: src/xml/xmli18n-tmp.h:6826
 #, fuzzy
 msgid "Canon BJC-2100"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:6799
+#: src/xml/xmli18n-tmp.h:6827
 #, fuzzy
 msgid "Canon BJC-2110"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:6800
+#: src/xml/xmli18n-tmp.h:6828
 #, fuzzy
 msgid "Canon BJC-3000"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6801
+#: src/xml/xmli18n-tmp.h:6829
 #, fuzzy
 msgid "Canon BJC-4000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6802
+#: src/xml/xmli18n-tmp.h:6830
 #, fuzzy
 msgid "Canon BJC-4300"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:6803
+#: src/xml/xmli18n-tmp.h:6831
 #, fuzzy
 msgid "Canon BJC-4400"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:6804
+#: src/xml/xmli18n-tmp.h:6832
+#, fuzzy
+msgid "Canon BJC-4550"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6833
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6805
+#: src/xml/xmli18n-tmp.h:6834
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6806
+#: src/xml/xmli18n-tmp.h:6835
 #, fuzzy
 msgid "Canon BJC-6000"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:6807
+#: src/xml/xmli18n-tmp.h:6836
 #, fuzzy
 msgid "Canon BJC-6100"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6808
+#: src/xml/xmli18n-tmp.h:6837
 #, fuzzy
 msgid "Canon BJC-6200"
 msgstr "Canon BJC 6200"
 
-#: src/xml/xmli18n-tmp.h:6809
+#: src/xml/xmli18n-tmp.h:6838
 #, fuzzy
 msgid "Canon BJC-6500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6810
+#: src/xml/xmli18n-tmp.h:6839
 #, fuzzy
 msgid "Canon BJC-7000"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6811
+#: src/xml/xmli18n-tmp.h:6840
 #, fuzzy
 msgid "Canon BJC-7100"
 msgstr "Canon BJC 7100"
 
-#: src/xml/xmli18n-tmp.h:6812
+#: src/xml/xmli18n-tmp.h:6841
 #, fuzzy
 msgid "Canon BJC-8200"
 msgstr "Canon BJC 8200"
 
-#: src/xml/xmli18n-tmp.h:6813
+#: src/xml/xmli18n-tmp.h:6842
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6814
+#: src/xml/xmli18n-tmp.h:6843
 #, fuzzy
 msgid "Canon S100"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6815
+#: src/xml/xmli18n-tmp.h:6844
 #, fuzzy
 msgid "Canon S200"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6816
+#: src/xml/xmli18n-tmp.h:6845
 #, fuzzy
 msgid "Canon S300"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6817
+#: src/xml/xmli18n-tmp.h:6846
+#, fuzzy
+msgid "Canon S330"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6847
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6818
+#: src/xml/xmli18n-tmp.h:6848
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6819
+#: src/xml/xmli18n-tmp.h:6849
 #, fuzzy
 msgid "Canon S500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6820
+#: src/xml/xmli18n-tmp.h:6850
+#, fuzzy
+msgid "Canon S520"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6851
+#, fuzzy
+msgid "Canon S530D"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6852
 #, fuzzy
 msgid "Canon S600"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6821
+#: src/xml/xmli18n-tmp.h:6853
 #, fuzzy
 msgid "Canon S630"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6822
+#: src/xml/xmli18n-tmp.h:6854
+#, fuzzy
+msgid "Canon S750"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6855
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6823
+#: src/xml/xmli18n-tmp.h:6856
+#, fuzzy
+msgid "Canon S820"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6857
+#, fuzzy
+msgid "Canon S830D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6858
+#, fuzzy
+msgid "Canon S900"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6859
+#, fuzzy
+msgid "Canon S9000"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6860
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6824
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
-msgid "Canon PIXMA iP1000"
-msgstr "Canon CP100"
+msgid "Canon SELPHY DS700"
+msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6825
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
-msgid "Canon PIXMA iP1200"
-msgstr "Canon CP100"
+msgid "Canon SELPHY DS810"
+msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6826
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
-msgid "Canon PIXMA iP1300"
-msgstr "Canon CP100"
+msgid "Canon PIXMA mini220"
+msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:6827
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
-msgid "Canon PIXMA iP1500"
+msgid "Canon PIXMA mini320"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6828
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
-msgid "Canon PIXMA iP1600"
+msgid "Canon PIXMA mini360"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6829
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
-msgid "Canon PIXMA iP1700"
+msgid "Canon PIXMA iP90"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6830
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
-msgid "Canon PIXMA iP1800"
+msgid "Canon PIXMA iP90v"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6831
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
-msgid "Canon PIXMA iP1900"
+msgid "Canon PIXMA iP100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6832
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:6833
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
-msgid "Canon PIXMA iP2200"
+msgid "Canon PIXMA iP2700"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:6834
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
-msgid "Canon PIXMA iP2500"
-msgstr "Canon BJC 2000"
+msgid "Canon PIXMA iP3000"
+msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6835
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
-msgid "Canon PIXMA iP2600"
-msgstr "Canon BJC 2000"
+msgid "Canon PIXMA iP3100"
+msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6836
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
-msgid "Canon PIXUS iP2700"
-msgstr "Canon CP100"
+msgid "Canon PIXMA iP3300"
+msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6837
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
-msgid "Canon PIXMA iP3000"
+msgid "Canon PIXMA iP3500"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6838
+#: src/xml/xmli18n-tmp.h:6875
 #, fuzzy
-msgid "Canon PIXMA iP3100"
-msgstr "Canon CP100"
+msgid "Canon PIXMA iP3600"
+msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6839
+#: src/xml/xmli18n-tmp.h:6876
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6840
+#: src/xml/xmli18n-tmp.h:6877
+#, fuzzy
+msgid "Canon PIXMA iP4000R"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6878
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6841
+#: src/xml/xmli18n-tmp.h:6879
+#, fuzzy
+msgid "Canon PIXMA iP4100R"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6880
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6842
+#: src/xml/xmli18n-tmp.h:6881
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:6843
+#: src/xml/xmli18n-tmp.h:6882
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:6844
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6845
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "Canon PIXMA iP4700"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6846
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "Canon PIXMA iP4800"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6847
+#: src/xml/xmli18n-tmp.h:6886
+#, fuzzy
+msgid "Canon PIXMA iP4900"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6887
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6848
+#: src/xml/xmli18n-tmp.h:6888
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:6849
+#: src/xml/xmli18n-tmp.h:6889
+#, fuzzy
+msgid "Canon PIXMA iP5200R"
+msgstr "Canon BJC 2000"
+
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:6850
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:6851
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "Canon PIXMA iP6100D"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:6852
+#: src/xml/xmli18n-tmp.h:6893
+#, fuzzy
+msgid "Canon PIXMA iP6210D"
+msgstr "Canon BJC 6000"
+
+#: src/xml/xmli18n-tmp.h:6894
+#, fuzzy
+msgid "Canon PIXMA iP6220D"
+msgstr "Canon BJC 2000"
+
+#: src/xml/xmli18n-tmp.h:6895
+#, fuzzy
+msgid "Canon PIXMA iP6310D"
+msgstr "Canon BJC 6000"
+
+#: src/xml/xmli18n-tmp.h:6896
+#, fuzzy
+msgid "Canon PIXMA iP6320D"
+msgstr "Canon BJC 6000"
+
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "Canon PIXMA iP6600D"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:6853
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:6854
+#: src/xml/xmli18n-tmp.h:6899
+#, fuzzy
+msgid "Canon PIXMA iP7100"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6900
+#, fuzzy
+msgid "Canon PIXMA iP7500"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6901
+#, fuzzy
+msgid "Canon PIXMA iP8100"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6902
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6855
+#: src/xml/xmli18n-tmp.h:6903
+#, fuzzy
+msgid "Canon PIXMA iP8600"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6904
+#, fuzzy
+msgid "Canon PIXMA iP9910"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "Canon PIXMA iX4000"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6856
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6857
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "Canon PIXMA iX6500"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:6858
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "Canon PIXMA iX7000"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6859
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "Canon PIXMA Pro9000"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6860
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "Canon PIXMA Pro9000mk2"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6861
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6862
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "Canon PIXMA Pro9500mk2"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6863
+#: src/xml/xmli18n-tmp.h:6913
+#, fuzzy
+msgid "Canon PIXMA MP140"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6864
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6865
+#: src/xml/xmli18n-tmp.h:6916
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6866
+#: src/xml/xmli18n-tmp.h:6917
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6867
+#: src/xml/xmli18n-tmp.h:6918
+#, fuzzy
+msgid "Canon PIXMA MP190"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6919
+#, fuzzy
+msgid "Canon PIXMA MP210"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6868
+#: src/xml/xmli18n-tmp.h:6921
+#, fuzzy
+msgid "Canon PIXMA MP240"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "Canon PIXMA MP250"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6869
+#: src/xml/xmli18n-tmp.h:6923
+#, fuzzy
+msgid "Canon PIXMA MP260"
+msgstr "Canon CP220"
+
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "Canon PIXMA MP270"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6870
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "Canon PIXMA MP280"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6871
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "Canon PIXMA MP360"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6872
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "Canon PIXMA MP370"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6873
+#: src/xml/xmli18n-tmp.h:6928
+#, fuzzy
+msgid "Canon PIXMA MP375R"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "Canon PIXMA MP390"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6874
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "Canon PIXMA MP450"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6875
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "Canon PIXMA MP460"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6876
+#: src/xml/xmli18n-tmp.h:6932
+#, fuzzy
+msgid "Canon PIXMA MP470"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "Canon PIXMA MP480"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6877
+#: src/xml/xmli18n-tmp.h:6934
+#, fuzzy
+msgid "Canon PIXMA MP490"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "Canon PIXMA MP493"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6878
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "Canon PIXMA MP495"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6879
+#: src/xml/xmli18n-tmp.h:6937
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6880
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "Canon PIXMA MP510"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6881
+#: src/xml/xmli18n-tmp.h:6939
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:6882
+#: src/xml/xmli18n-tmp.h:6940
+#, fuzzy
+msgid "Canon PIXMA MP530"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "Canon PIXMA MP540"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6883
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "Canon PIXMA MP550"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6884
+#: src/xml/xmli18n-tmp.h:6943
+#, fuzzy
+msgid "Canon PIXMA MP560"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6944
 #, fuzzy
 msgid "Canon PIXMA MP600"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6885
+#: src/xml/xmli18n-tmp.h:6945
+#, fuzzy
+msgid "Canon PIXMA MP600R"
+msgstr "Canon BJC 6100"
+
+#: src/xml/xmli18n-tmp.h:6946
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6886
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "Canon PIXMA MP620"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6887
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "Canon PIXMA MP630"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6888
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "Canon PIXMA MP640"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6889
+#: src/xml/xmli18n-tmp.h:6950
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6890
+#: src/xml/xmli18n-tmp.h:6951
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon BJC 7100"
 
-#: src/xml/xmli18n-tmp.h:6891
+#: src/xml/xmli18n-tmp.h:6952
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6892
+#: src/xml/xmli18n-tmp.h:6953
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:6893
+#: src/xml/xmli18n-tmp.h:6954
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon BJC 50"
 
-#: src/xml/xmli18n-tmp.h:6894
+#: src/xml/xmli18n-tmp.h:6955
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6895
+#: src/xml/xmli18n-tmp.h:6956
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6896
+#: src/xml/xmli18n-tmp.h:6957
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon BJC 80"
 
-#: src/xml/xmli18n-tmp.h:6897
+#: src/xml/xmli18n-tmp.h:6958
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:6898
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "Canon PIXMA MP800"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6899
+#: src/xml/xmli18n-tmp.h:6960
+#, fuzzy
+msgid "Canon PIXMA MP800R"
+msgstr "Canon BJC 30"
+
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "Canon PIXMA MP810"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6900
+#: src/xml/xmli18n-tmp.h:6962
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:6901
+#: src/xml/xmli18n-tmp.h:6963
+#, fuzzy
+msgid "Canon PIXMA MP900"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "Canon PIXMA MP950"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6902
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "Canon PIXMA MP960"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6903
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "Canon PIXMA MP970"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6904
+#: src/xml/xmli18n-tmp.h:6967
 #, fuzzy
 msgid "Canon PIXMA MP980"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6905
+#: src/xml/xmli18n-tmp.h:6968
 #, fuzzy
 msgid "Canon PIXMA MP990"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6906
+#: src/xml/xmli18n-tmp.h:6969
+#, fuzzy
+msgid "Canon PIXUS iP2700"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6970
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6907
+#: src/xml/xmli18n-tmp.h:6971
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:6908
+#: src/xml/xmli18n-tmp.h:6972
+#, fuzzy
+msgid "Canon PIXMA MG2100"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6973
+#, fuzzy
+msgid "Canon PIXMA MG3100"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6974
+#, fuzzy
+msgid "Canon PIXMA MG4100"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6975
 #, fuzzy
 msgid "Canon PIXMA MG5100"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6909
+#: src/xml/xmli18n-tmp.h:6976
 #, fuzzy
 msgid "Canon PIXMA MG5200"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:6910
+#: src/xml/xmli18n-tmp.h:6977
+#, fuzzy
+msgid "Canon PIXMA MG5300"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "Canon PIXMA MG6100"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:6911
+#: src/xml/xmli18n-tmp.h:6979
+#, fuzzy
+msgid "Canon PIXMA MG6200"
+msgstr "Canon BJC 6100"
+
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "Canon PIXMA MG8100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6912
+#: src/xml/xmli18n-tmp.h:6981
+#, fuzzy
+msgid "Canon PIXMA MG8200"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "Canon PIXMA MX300"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6913
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "Canon PIXMA MX310"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6914
+#: src/xml/xmli18n-tmp.h:6984
+#, fuzzy
+msgid "Canon PIXMA MX320"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6985
 #, fuzzy
 msgid "Canon PIXMA MX330"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6915
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "Canon PIXMA MX340"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6916
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "Canon PIXMA MX350"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6917
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "Canon PIXMA MX360"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6918
+#: src/xml/xmli18n-tmp.h:6989
+#, fuzzy
+msgid "Canon PIXMA MX370"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "Canon PIXMA MX410"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6919
+#: src/xml/xmli18n-tmp.h:6991
 #, fuzzy
 msgid "Canon PIXMA MX420"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6920
+#: src/xml/xmli18n-tmp.h:6992
+#, fuzzy
+msgid "Canon PIXMA MX430"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6993
+#, fuzzy
+msgid "Canon PIXMA MX510"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:6994
 #, fuzzy
 msgid "Canon PIXMA MX700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6921
+#: src/xml/xmli18n-tmp.h:6995
+#, fuzzy
+msgid "Canon PIXMA MX710"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Canon PIXMA MX850"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6922
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Canon PIXMA MX860"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6923
+#: src/xml/xmli18n-tmp.h:6998
 #, fuzzy
 msgid "Canon PIXMA MX870"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6924
+#: src/xml/xmli18n-tmp.h:6999
 #, fuzzy
 msgid "Canon PIXMA MX880"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:6925
+#: src/xml/xmli18n-tmp.h:7000
+#, fuzzy
+msgid "Canon PIXMA MX890"
+msgstr "Canon CP100"
+
+#: src/xml/xmli18n-tmp.h:7001
 #, fuzzy
 msgid "Canon PIXMA MX7600"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6926
+#: src/xml/xmli18n-tmp.h:7002
+#, fuzzy
+msgid "Canon PIXMA E500"
+msgstr "Canon BJC 6500"
+
+#: src/xml/xmli18n-tmp.h:7003
+#, fuzzy
+msgid "Canon PIXMA E600"
+msgstr "Canon BJC 6100"
+
+#: src/xml/xmli18n-tmp.h:7004
+#, fuzzy
+msgid "Canon 50i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7005
+#, fuzzy
+msgid "Canon 80i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7006
+#, fuzzy
+msgid "Canon 450i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7007
+#, fuzzy
+msgid "Canon 455i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7008
+#, fuzzy
+msgid "Canon 470PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7009
+#, fuzzy
+msgid "Canon 475PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7010
+#, fuzzy
+msgid "Canon 550i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7011
+#, fuzzy
+msgid "Canon 560i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7012
+#, fuzzy
+msgid "Canon 850i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7013
+#, fuzzy
+msgid "Canon 860i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7014
+#, fuzzy
+msgid "Canon 865R"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7015
+#, fuzzy
+msgid "Canon 900PD"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7016
+#, fuzzy
+msgid "Canon 950i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7017
+#, fuzzy
+msgid "Canon 960i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7018
+#, fuzzy
+msgid "Canon 990i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7019
+#, fuzzy
+msgid "Canon 6100i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7020
+#, fuzzy
+msgid "Canon 6500i"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7021
+#, fuzzy
+msgid "Canon 9100i"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:7022
+#, fuzzy
+msgid "Canon 9900i"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7023
+#, fuzzy
+msgid "Canon i70"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6927
+#: src/xml/xmli18n-tmp.h:7025
+#, fuzzy
+msgid "Canon i450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7026
+#, fuzzy
+msgid "Canon i450X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7027
+#, fuzzy
+msgid "Canon i455"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7028
+#, fuzzy
+msgid "Canon i455X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7029
+#, fuzzy
+msgid "Canon i470D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7030
+#, fuzzy
+msgid "Canon i475D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7031
+#, fuzzy
+msgid "Canon i550"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7032
+#, fuzzy
+msgid "Canon i550X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6928
+#: src/xml/xmli18n-tmp.h:7034
+#, fuzzy
+msgid "Canon i560X"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7035
+#, fuzzy
+msgid "Canon i850old"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:6929
+#: src/xml/xmli18n-tmp.h:7037
+#, fuzzy
+msgid "Canon i860old"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:6930
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
-msgid "Canon i865"
+msgid "Canon i865old"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:6931
+#: src/xml/xmli18n-tmp.h:7040
+#, fuzzy
+msgid "Canon i865"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7041
+#, fuzzy
+msgid "Canon i900D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7042
+#, fuzzy
+msgid "Canon i905D"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7043
+#, fuzzy
+msgid "Canon i950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7044
+#, fuzzy
+msgid "Canon i960"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7045
+#, fuzzy
+msgid "Canon i965"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7046
+#, fuzzy
+msgid "Canon i990"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7047
+#, fuzzy
+msgid "Canon i6100"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7048
+#, fuzzy
+msgid "Canon i6500"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7049
+#, fuzzy
+msgid "Canon i9100"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:7050
+#, fuzzy
+msgid "Canon i9900"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:7051
+#, fuzzy
+msgid "Canon i9950"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:7052
 #, fuzzy
 msgid "Epson Artisan 50"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6932
+#: src/xml/xmli18n-tmp.h:7053
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6933
+#: src/xml/xmli18n-tmp.h:7054
 #, fuzzy
 msgid "Epson Artisan 710"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:6934
+#: src/xml/xmli18n-tmp.h:7055
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6935
+#: src/xml/xmli18n-tmp.h:7056
 #, fuzzy
 msgid "Epson Artisan 810"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6936
+#: src/xml/xmli18n-tmp.h:7057
+#, fuzzy
+msgid "Epson Artisan 835"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:7058
 #, fuzzy
 msgid "Epson B-300"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:6937
+#: src/xml/xmli18n-tmp.h:7059
 #, fuzzy
 msgid "Epson B-308"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:6938
+#: src/xml/xmli18n-tmp.h:7060
 #, fuzzy
 msgid "Epson B-310"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:6939
+#: src/xml/xmli18n-tmp.h:7061
 #, fuzzy
 msgid "Epson B-310N"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:6940
+#: src/xml/xmli18n-tmp.h:7062
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:6941
+#: src/xml/xmli18n-tmp.h:7063
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:6942
+#: src/xml/xmli18n-tmp.h:7064
 #, fuzzy
 msgid "Epson B-510DN"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:6943
+#: src/xml/xmli18n-tmp.h:7065
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6944
+#: src/xml/xmli18n-tmp.h:7066
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6945
+#: src/xml/xmli18n-tmp.h:7067
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:6946
+#: src/xml/xmli18n-tmp.h:7068
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6947
+#: src/xml/xmli18n-tmp.h:7069
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:6948
+#: src/xml/xmli18n-tmp.h:7070
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:6949
+#: src/xml/xmli18n-tmp.h:7071
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "EPSON Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6950
+#: src/xml/xmli18n-tmp.h:7072
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:6951
+#: src/xml/xmli18n-tmp.h:7073
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:6952
+#: src/xml/xmli18n-tmp.h:7074
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "EPSON Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6953
+#: src/xml/xmli18n-tmp.h:7075
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:6954
+#: src/xml/xmli18n-tmp.h:7076
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:6955
+#: src/xml/xmli18n-tmp.h:7077
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6956
+#: src/xml/xmli18n-tmp.h:7078
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:6957
+#: src/xml/xmli18n-tmp.h:7079
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:6958
+#: src/xml/xmli18n-tmp.h:7080
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6959
+#: src/xml/xmli18n-tmp.h:7081
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:6960
+#: src/xml/xmli18n-tmp.h:7082
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:6961
+#: src/xml/xmli18n-tmp.h:7083
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6962
+#: src/xml/xmli18n-tmp.h:7084
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6963
+#: src/xml/xmli18n-tmp.h:7085
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:6964
+#: src/xml/xmli18n-tmp.h:7086
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6965
+#: src/xml/xmli18n-tmp.h:7087
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:6966
+#: src/xml/xmli18n-tmp.h:7088
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:6967
+#: src/xml/xmli18n-tmp.h:7089
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:6968
+#: src/xml/xmli18n-tmp.h:7090
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:6969
+#: src/xml/xmli18n-tmp.h:7091
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:6970
+#: src/xml/xmli18n-tmp.h:7092
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:6971
+#: src/xml/xmli18n-tmp.h:7093
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:6972
+#: src/xml/xmli18n-tmp.h:7094
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:6973
+#: src/xml/xmli18n-tmp.h:7095
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6974
+#: src/xml/xmli18n-tmp.h:7096
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6975
+#: src/xml/xmli18n-tmp.h:7097
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6976
+#: src/xml/xmli18n-tmp.h:7098
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:6977
+#: src/xml/xmli18n-tmp.h:7099
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:6978
+#: src/xml/xmli18n-tmp.h:7100
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:6979
+#: src/xml/xmli18n-tmp.h:7101
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:6980
+#: src/xml/xmli18n-tmp.h:7102
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:6981
+#: src/xml/xmli18n-tmp.h:7103
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:6982
+#: src/xml/xmli18n-tmp.h:7104
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:6983
+#: src/xml/xmli18n-tmp.h:7105
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:6984
+#: src/xml/xmli18n-tmp.h:7106
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:6985
+#: src/xml/xmli18n-tmp.h:7107
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6986
+#: src/xml/xmli18n-tmp.h:7108
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6987
+#: src/xml/xmli18n-tmp.h:7109
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6988
+#: src/xml/xmli18n-tmp.h:7110
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:6989
+#: src/xml/xmli18n-tmp.h:7111
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:6990
+#: src/xml/xmli18n-tmp.h:7112
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:6991
+#: src/xml/xmli18n-tmp.h:7113
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:6992
+#: src/xml/xmli18n-tmp.h:7114
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:6993
+#: src/xml/xmli18n-tmp.h:7115
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:6994
+#: src/xml/xmli18n-tmp.h:7116
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:6995
+#: src/xml/xmli18n-tmp.h:7117
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:6996
+#: src/xml/xmli18n-tmp.h:7118
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:6997
+#: src/xml/xmli18n-tmp.h:7119
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:6998
+#: src/xml/xmli18n-tmp.h:7120
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:6999
+#: src/xml/xmli18n-tmp.h:7121
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:7000
+#: src/xml/xmli18n-tmp.h:7122
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:7001
+#: src/xml/xmli18n-tmp.h:7123
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:7002
+#: src/xml/xmli18n-tmp.h:7124
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:7003
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:7004
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:7005
+#: src/xml/xmli18n-tmp.h:7127
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:7006
+#: src/xml/xmli18n-tmp.h:7128
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:7007
+#: src/xml/xmli18n-tmp.h:7129
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:7008
+#: src/xml/xmli18n-tmp.h:7130
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:7009
+#: src/xml/xmli18n-tmp.h:7131
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "EPSON Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:7010
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:7011
+#: src/xml/xmli18n-tmp.h:7133
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:7012
+#: src/xml/xmli18n-tmp.h:7134
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:7013
+#: src/xml/xmli18n-tmp.h:7135
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:7014
+#: src/xml/xmli18n-tmp.h:7136
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:7015
+#: src/xml/xmli18n-tmp.h:7137
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:7016
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7017
+#: src/xml/xmli18n-tmp.h:7139
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:7018
+#: src/xml/xmli18n-tmp.h:7140
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:7019
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
 msgid "Epson Stylus Office B1100"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7020
+#: src/xml/xmli18n-tmp.h:7142
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7021
+#: src/xml/xmli18n-tmp.h:7143
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:7022
+#: src/xml/xmli18n-tmp.h:7144
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:7023
+#: src/xml/xmli18n-tmp.h:7145
 #, fuzzy
 msgid "Epson Stylus Office T1100"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7024
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
 msgid "Epson Stylus Office T1110"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7025
+#: src/xml/xmli18n-tmp.h:7147
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7026
+#: src/xml/xmli18n-tmp.h:7148
+#, fuzzy
+msgid "Epson Stylus Office BX535WD"
+msgstr "EPSON Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:7149
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7027
+#: src/xml/xmli18n-tmp.h:7150
+#, fuzzy
+msgid "Epson Stylus Office BX630FW"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7151
+#, fuzzy
+msgid "Epson Stylus Office BX635FWD"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7028
+#: src/xml/xmli18n-tmp.h:7153
 #, fuzzy
 msgid "Epson Stylus Office TX300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7029
+#: src/xml/xmli18n-tmp.h:7154
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7030
+#: src/xml/xmli18n-tmp.h:7155
+#, fuzzy
+msgid "Epson Stylus Office TX620FWD"
+msgstr "EPSON Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:7156
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:7031
+#: src/xml/xmli18n-tmp.h:7157
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:7032
+#: src/xml/xmli18n-tmp.h:7158
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:7033
+#: src/xml/xmli18n-tmp.h:7159
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:7034
+#: src/xml/xmli18n-tmp.h:7160
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:7035
+#: src/xml/xmli18n-tmp.h:7161
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7036
+#: src/xml/xmli18n-tmp.h:7162
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:7037
+#: src/xml/xmli18n-tmp.h:7163
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:7038
+#: src/xml/xmli18n-tmp.h:7164
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:7039
+#: src/xml/xmli18n-tmp.h:7165
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7040
+#: src/xml/xmli18n-tmp.h:7166
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:7041
+#: src/xml/xmli18n-tmp.h:7167
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:7042
+#: src/xml/xmli18n-tmp.h:7168
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7043
+#: src/xml/xmli18n-tmp.h:7169
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:7044
+#: src/xml/xmli18n-tmp.h:7170
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:7045
+#: src/xml/xmli18n-tmp.h:7171
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:7046
+#: src/xml/xmli18n-tmp.h:7172
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:7047
+#: src/xml/xmli18n-tmp.h:7173
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:7048
+#: src/xml/xmli18n-tmp.h:7174
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:7049
+#: src/xml/xmli18n-tmp.h:7175
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:7050
+#: src/xml/xmli18n-tmp.h:7176
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:7051
+#: src/xml/xmli18n-tmp.h:7177
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:7052
+#: src/xml/xmli18n-tmp.h:7178
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:7053
+#: src/xml/xmli18n-tmp.h:7179
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:7054
+#: src/xml/xmli18n-tmp.h:7180
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7055
+#: src/xml/xmli18n-tmp.h:7181
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7056
+#: src/xml/xmli18n-tmp.h:7182
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7057
+#: src/xml/xmli18n-tmp.h:7183
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7058
+#: src/xml/xmli18n-tmp.h:7184
 #, fuzzy
 msgid "Epson Stylus Photo 1290s"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7059
+#: src/xml/xmli18n-tmp.h:7185
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:7060
+#: src/xml/xmli18n-tmp.h:7186
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:7061
+#: src/xml/xmli18n-tmp.h:7187
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:7062
+#: src/xml/xmli18n-tmp.h:7188
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:7063
+#: src/xml/xmli18n-tmp.h:7189
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7064
+#: src/xml/xmli18n-tmp.h:7190
 #, fuzzy
 msgid "Epson Stylus Photo P50"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7065
+#: src/xml/xmli18n-tmp.h:7191
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7066
+#: src/xml/xmli18n-tmp.h:7192
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:7067
+#: src/xml/xmli18n-tmp.h:7193
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:7068
+#: src/xml/xmli18n-tmp.h:7194
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7069
+#: src/xml/xmli18n-tmp.h:7195
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7070
+#: src/xml/xmli18n-tmp.h:7196
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7071
+#: src/xml/xmli18n-tmp.h:7197
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7072
+#: src/xml/xmli18n-tmp.h:7198
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7073
+#: src/xml/xmli18n-tmp.h:7199
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:7074
+#: src/xml/xmli18n-tmp.h:7200
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7075
+#: src/xml/xmli18n-tmp.h:7201
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7076
+#: src/xml/xmli18n-tmp.h:7202
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:7077
+#: src/xml/xmli18n-tmp.h:7203
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7078
+#: src/xml/xmli18n-tmp.h:7204
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:7079
+#: src/xml/xmli18n-tmp.h:7205
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7080
+#: src/xml/xmli18n-tmp.h:7206
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7081
+#: src/xml/xmli18n-tmp.h:7207
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7082
+#: src/xml/xmli18n-tmp.h:7208
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7083
+#: src/xml/xmli18n-tmp.h:7209
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7084
+#: src/xml/xmli18n-tmp.h:7210
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7085
+#: src/xml/xmli18n-tmp.h:7211
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7086
+#: src/xml/xmli18n-tmp.h:7212
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7087
+#: src/xml/xmli18n-tmp.h:7213
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:7088
+#: src/xml/xmli18n-tmp.h:7214
+#, fuzzy
+msgid "Epson Stylus Photo R2000"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:7215
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:7089
+#: src/xml/xmli18n-tmp.h:7216
 #, fuzzy
 msgid "Epson Stylus Photo R2880"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:7090
+#: src/xml/xmli18n-tmp.h:7217
 #, fuzzy
 msgid "Epson Stylus Photo R3000"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:7091
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7092
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:7093
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7094
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:7095
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7096
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7097
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7098
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7099
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7100
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7101
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7102
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7103
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:7104
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:7105
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:7106
+#: src/xml/xmli18n-tmp.h:7233
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7107
+#: src/xml/xmli18n-tmp.h:7234
+#, fuzzy
+msgid "Epson Stylus Photo RX650"
+msgstr "EPSON Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:7235
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:7108
+#: src/xml/xmli18n-tmp.h:7236
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:7109
+#: src/xml/xmli18n-tmp.h:7237
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7110
+#: src/xml/xmli18n-tmp.h:7238
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7111
+#: src/xml/xmli18n-tmp.h:7239
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7112
+#: src/xml/xmli18n-tmp.h:7240
 #, fuzzy
 msgid "Epson Stylus Photo TX710W"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7113
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Epson Stylus Photo TX800FW"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7114
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Epson Stylus Photo TX810FW"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7115
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Epson Stylus Pro 3800"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7116
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Epson Stylus Pro 3880"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7117
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Epson Stylus Pro 3885"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7118
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Epson Stylus Pro 4000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7119
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Epson Stylus Pro 4800/4880 Back Compatible"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7120
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Epson Stylus Pro 4800"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7121
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Epson Stylus Pro 4880"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7122
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:7123
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:7124
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7125
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:7126
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:7127
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Epson Stylus Pro 7700"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7128
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7129
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7130
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Epson Stylus Pro 7890"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7131
+#: src/xml/xmli18n-tmp.h:7259
+#, fuzzy
+msgid "Epson Stylus Pro 7900"
+msgstr "EPSON Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7132
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:7133
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:7134
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Epson Stylus Pro 9700"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7135
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7136
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7137
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Epson Stylus Pro 9890"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:7138
+#: src/xml/xmli18n-tmp.h:7267
+#, fuzzy
+msgid "Epson Stylus Pro 9900"
+msgstr "EPSON Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7139
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Epson Stylus Pro 11800/11880 Back Compatible"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7140
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Epson Stylus Pro 11800"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7141
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:7142
+#: src/xml/xmli18n-tmp.h:7272
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:7143
+#: src/xml/xmli18n-tmp.h:7273
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:7144
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7145
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7146
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7147
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7148
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7149
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7150
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7151
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7152
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7153
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7154
+#: src/xml/xmli18n-tmp.h:7284
+#, fuzzy
+msgid "Epson Stylus CX3900"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7155
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7156
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7157
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7158
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7159
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7160
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7161
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7162
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7163
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7164
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:7165
+#: src/xml/xmli18n-tmp.h:7296
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:7166
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:7167
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:7168
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7169
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7170
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7171
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7172
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:7173
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:7174
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:7175
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:7176
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:7177
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7178
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7179
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:7180
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "EPSON Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7181
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:7182
+#: src/xml/xmli18n-tmp.h:7313
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7183
+#: src/xml/xmli18n-tmp.h:7314
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7184
+#: src/xml/xmli18n-tmp.h:7315
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7185
+#: src/xml/xmli18n-tmp.h:7316
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7186
+#: src/xml/xmli18n-tmp.h:7317
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:7187
+#: src/xml/xmli18n-tmp.h:7318
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:7188
+#: src/xml/xmli18n-tmp.h:7319
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:7189
+#: src/xml/xmli18n-tmp.h:7320
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "EPSON Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:7190
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7191
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7192
+#: src/xml/xmli18n-tmp.h:7323
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7193
+#: src/xml/xmli18n-tmp.h:7324
 #, fuzzy
 msgid "Epson Stylus DX4000"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7194
+#: src/xml/xmli18n-tmp.h:7325
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7195
+#: src/xml/xmli18n-tmp.h:7326
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7196
+#: src/xml/xmli18n-tmp.h:7327
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7197
+#: src/xml/xmli18n-tmp.h:7328
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7198
+#: src/xml/xmli18n-tmp.h:7329
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7199
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7200
+#: src/xml/xmli18n-tmp.h:7331
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:7201
+#: src/xml/xmli18n-tmp.h:7332
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:7202
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7203
+#: src/xml/xmli18n-tmp.h:7334
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7204
+#: src/xml/xmli18n-tmp.h:7335
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7205
+#: src/xml/xmli18n-tmp.h:7336
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:7206
+#: src/xml/xmli18n-tmp.h:7337
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7207
+#: src/xml/xmli18n-tmp.h:7338
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7208
+#: src/xml/xmli18n-tmp.h:7339
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7209
+#: src/xml/xmli18n-tmp.h:7340
 #, fuzzy
 msgid "Epson Stylus NX115"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7210
+#: src/xml/xmli18n-tmp.h:7341
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7211
+#: src/xml/xmli18n-tmp.h:7342
 #, fuzzy
 msgid "Epson Stylus NX215"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7212
+#: src/xml/xmli18n-tmp.h:7343
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7213
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7214
+#: src/xml/xmli18n-tmp.h:7345
 #, fuzzy
 msgid "Epson Stylus NX415"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7215
+#: src/xml/xmli18n-tmp.h:7346
+#, fuzzy
+msgid "Epson Stylus NX420"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7347
 #, fuzzy
 msgid "Epson Stylus NX515"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7216
+#: src/xml/xmli18n-tmp.h:7348
+#, fuzzy
+msgid "Epson Stylus NX530"
+msgstr "EPSON Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:7349
+#, fuzzy
+msgid "Epson Stylus NX635"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7350
 #, fuzzy
 msgid "Epson Stylus Photo PX650"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:7217
+#: src/xml/xmli18n-tmp.h:7351
 #, fuzzy
 msgid "Epson Stylus Photo PX700W"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7218
+#: src/xml/xmli18n-tmp.h:7352
 #, fuzzy
 msgid "Epson Stylus Photo PX710W"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:7219
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Epson Stylus Photo PX800FW"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7220
+#: src/xml/xmli18n-tmp.h:7354
 #, fuzzy
 msgid "Epson Stylus Photo PX810FW"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:7221
+#: src/xml/xmli18n-tmp.h:7355
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7222
+#: src/xml/xmli18n-tmp.h:7356
 #, fuzzy
 msgid "Epson Stylus S21"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7223
+#: src/xml/xmli18n-tmp.h:7357
 #, fuzzy
 msgid "Epson Stylus S50"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7224
+#: src/xml/xmli18n-tmp.h:7358
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7225
+#: src/xml/xmli18n-tmp.h:7359
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7226
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Epson Stylus SX110"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7227
+#: src/xml/xmli18n-tmp.h:7361
 #, fuzzy
 msgid "Epson Stylus SX115"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7228
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7229
+#: src/xml/xmli18n-tmp.h:7363
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7230
+#: src/xml/xmli18n-tmp.h:7364
 #, fuzzy
 msgid "Epson Stylus SX210"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7231
+#: src/xml/xmli18n-tmp.h:7365
 #, fuzzy
 msgid "Epson Stylus SX215"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7232
+#: src/xml/xmli18n-tmp.h:7366
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7233
+#: src/xml/xmli18n-tmp.h:7367
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:7234
+#: src/xml/xmli18n-tmp.h:7368
 #, fuzzy
 msgid "Epson Stylus SX410"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7235
+#: src/xml/xmli18n-tmp.h:7369
 #, fuzzy
 msgid "Epson Stylus SX415"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7236
+#: src/xml/xmli18n-tmp.h:7370
+#, fuzzy
+msgid "Epson Stylus SX420"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7371
 #, fuzzy
 msgid "Epson Stylus SX510W"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7237
+#: src/xml/xmli18n-tmp.h:7372
 #, fuzzy
 msgid "Epson Stylus SX515"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7238
+#: src/xml/xmli18n-tmp.h:7373
+#, fuzzy
+msgid "Epson Stylus SX525"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7374
+#, fuzzy
+msgid "Epson Stylus SX535FW"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7375
 #, fuzzy
 msgid "Epson Stylus SX600FW"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7239
+#: src/xml/xmli18n-tmp.h:7376
 #, fuzzy
 msgid "Epson Stylus SX610FW"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7240
+#: src/xml/xmli18n-tmp.h:7377
 #, fuzzy
 msgid "Epson Stylus SX615"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7241
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Epson Stylus SX650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7242
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Epson Stylus T13"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7243
+#: src/xml/xmli18n-tmp.h:7380
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7244
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Epson Stylus T21"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7245
+#: src/xml/xmli18n-tmp.h:7382
 #, fuzzy
 msgid "Epson Stylus T22"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7246
+#: src/xml/xmli18n-tmp.h:7383
 #, fuzzy
 msgid "Epson Stylus T22E"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7247
+#: src/xml/xmli18n-tmp.h:7384
 #, fuzzy
 msgid "Epson Stylus T26"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7248
+#: src/xml/xmli18n-tmp.h:7385
 #, fuzzy
 msgid "Epson Stylus T30"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:7249
+#: src/xml/xmli18n-tmp.h:7386
 #, fuzzy
 msgid "Epson Stylus T40W"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7250
+#: src/xml/xmli18n-tmp.h:7387
 #, fuzzy
 msgid "Epson Stylus T50"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7251
+#: src/xml/xmli18n-tmp.h:7388
 #, fuzzy
 msgid "Epson Stylus T59"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:7252
+#: src/xml/xmli18n-tmp.h:7389
 #, fuzzy
 msgid "Epson Stylus T60"
 msgstr "EPSON Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7253
+#: src/xml/xmli18n-tmp.h:7390
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7254
+#: src/xml/xmli18n-tmp.h:7391
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7255
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7256
+#: src/xml/xmli18n-tmp.h:7393
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7257
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7258
+#: src/xml/xmli18n-tmp.h:7395
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7259
+#: src/xml/xmli18n-tmp.h:7396
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7260
+#: src/xml/xmli18n-tmp.h:7397
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7261
+#: src/xml/xmli18n-tmp.h:7398
 #, fuzzy
 msgid "Epson Stylus TX110"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7262
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:7263
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Epson Stylus TX210"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7264
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Epson Stylus TX300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:7265
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7266
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Epson Stylus TX410"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7267
+#: src/xml/xmli18n-tmp.h:7404
+#, fuzzy
+msgid "Epson Stylus TX420"
+msgstr "EPSON Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Epson Stylus TX510FN"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7268
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Epson Stylus TX550W"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7269
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Epson Stylus TX610FW"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7270
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Epson Stylus TX615"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7271
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Epson Stylus TX650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:7272
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Epson Stylus TX659"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:7273
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7274
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7275
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7276
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7277
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7278
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7279
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7280
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7281
+#: src/xml/xmli18n-tmp.h:7419
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7282
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7283
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7284
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7285
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7286
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7287
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7288
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7289
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7290
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7291
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7292
+#: src/xml/xmli18n-tmp.h:7430
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "EPSON Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7293
+#: src/xml/xmli18n-tmp.h:7431
 #, fuzzy
 msgid "Epson WorkForce 310"
 msgstr "EPSON Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:7294
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Epson WorkForce 315"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7295
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7296
+#: src/xml/xmli18n-tmp.h:7434
+#, fuzzy
+msgid "Epson WorkForce 545"
+msgstr "EPSON Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7297
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Epson WorkForce 610"
 msgstr "EPSON Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:7298
+#: src/xml/xmli18n-tmp.h:7437
 #, fuzzy
 msgid "Epson WorkForce 615"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7299
+#: src/xml/xmli18n-tmp.h:7438
+#, fuzzy
+msgid "Epson WorkForce 630"
+msgstr "EPSON Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:7439
+#, fuzzy
+msgid "Epson WorkForce 635"
+msgstr "EPSON Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7440
+#, fuzzy
+msgid "Epson WorkForce 645"
+msgstr "EPSON Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:7441
 #, fuzzy
 msgid "Epson WorkForce 1100"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:7300
+#: src/xml/xmli18n-tmp.h:7442
 #, fuzzy
 msgid "Epson CL 700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7301
+#: src/xml/xmli18n-tmp.h:7443
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7302
+#: src/xml/xmli18n-tmp.h:7444
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7303
+#: src/xml/xmli18n-tmp.h:7445
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7304
+#: src/xml/xmli18n-tmp.h:7446
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7305
+#: src/xml/xmli18n-tmp.h:7447
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7306
+#: src/xml/xmli18n-tmp.h:7448
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7307
+#: src/xml/xmli18n-tmp.h:7449
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7308
+#: src/xml/xmli18n-tmp.h:7450
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7309
+#: src/xml/xmli18n-tmp.h:7451
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7310
+#: src/xml/xmli18n-tmp.h:7452
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7311
+#: src/xml/xmli18n-tmp.h:7453
 #, fuzzy
 msgid "Epson EM 900C"
 msgstr "EPSON EM-900C"
 
-#: src/xml/xmli18n-tmp.h:7312
+#: src/xml/xmli18n-tmp.h:7454
 #, fuzzy
 msgid "Epson EM 930C"
 msgstr "EPSON EM-930C"
 
-#: src/xml/xmli18n-tmp.h:7313
+#: src/xml/xmli18n-tmp.h:7455
 #, fuzzy
 msgid "Epson EP 302"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:7314
+#: src/xml/xmli18n-tmp.h:7456
 #, fuzzy
 msgid "Epson EP 702A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7315
+#: src/xml/xmli18n-tmp.h:7457
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7316
+#: src/xml/xmli18n-tmp.h:7458
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7317
+#: src/xml/xmli18n-tmp.h:7459
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:7318
+#: src/xml/xmli18n-tmp.h:7460
 #, fuzzy
 msgid "Epson MC 2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:7319
+#: src/xml/xmli18n-tmp.h:7461
 #, fuzzy
 msgid "Epson MC 5000"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7320
+#: src/xml/xmli18n-tmp.h:7462
 #, fuzzy
 msgid "Epson MC 7000"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7321
+#: src/xml/xmli18n-tmp.h:7463
 #, fuzzy
 msgid "Epson MC 9000"
 msgstr "EPSON MC-9000"
 
-#: src/xml/xmli18n-tmp.h:7322
+#: src/xml/xmli18n-tmp.h:7464
 #, fuzzy
 msgid "Epson MC 10000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:7323
+#: src/xml/xmli18n-tmp.h:7465
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:7324
+#: src/xml/xmli18n-tmp.h:7466
 #, fuzzy
 msgid "Epson ME 320"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:7325
+#: src/xml/xmli18n-tmp.h:7467
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7326
+#: src/xml/xmli18n-tmp.h:7468
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "EPSON PM-780C"
 
-#: src/xml/xmli18n-tmp.h:7327
+#: src/xml/xmli18n-tmp.h:7469
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7328
+#: src/xml/xmli18n-tmp.h:7470
 #, fuzzy
 msgid "Epson ME Office 600F"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7329
+#: src/xml/xmli18n-tmp.h:7471
 #, fuzzy
 msgid "Epson ME Office 620F"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7330
+#: src/xml/xmli18n-tmp.h:7472
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7331
+#: src/xml/xmli18n-tmp.h:7473
+#, fuzzy
+msgid "Epson ME Office 940FW"
+msgstr "Canon BJC 7000"
+
+#: src/xml/xmli18n-tmp.h:7474
 #, fuzzy
 msgid "Epson ME Office 1100"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:7332
+#: src/xml/xmli18n-tmp.h:7475
 #, fuzzy
 msgid "Epson MJ 930C"
 msgstr "EPSON MJ-930C"
 
-#: src/xml/xmli18n-tmp.h:7333
+#: src/xml/xmli18n-tmp.h:7476
 #, fuzzy
 msgid "Epson MJ 5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/xml/xmli18n-tmp.h:7334
+#: src/xml/xmli18n-tmp.h:7477
 #, fuzzy
 msgid "Epson MJ 6000C"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:7335
+#: src/xml/xmli18n-tmp.h:7478
 #, fuzzy
 msgid "Epson MJ 8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/xml/xmli18n-tmp.h:7336
+#: src/xml/xmli18n-tmp.h:7479
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7337
+#: src/xml/xmli18n-tmp.h:7480
 #, fuzzy
 msgid "Epson PM 700C"
 msgstr "EPSON PM-700C"
 
-#: src/xml/xmli18n-tmp.h:7338
+#: src/xml/xmli18n-tmp.h:7481
 #, fuzzy
 msgid "Epson PM 730C"
 msgstr "EPSON PM-730C"
 
-#: src/xml/xmli18n-tmp.h:7339
+#: src/xml/xmli18n-tmp.h:7482
 #, fuzzy
 msgid "Epson PM 740C"
 msgstr "EPSON PM-740C"
 
-#: src/xml/xmli18n-tmp.h:7340
+#: src/xml/xmli18n-tmp.h:7483
 #, fuzzy
 msgid "Epson PM 750C"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:7341
+#: src/xml/xmli18n-tmp.h:7484
 #, fuzzy
 msgid "Epson PM 760C"
 msgstr "EPSON PM-760C"
 
-#: src/xml/xmli18n-tmp.h:7342
+#: src/xml/xmli18n-tmp.h:7485
 #, fuzzy
 msgid "Epson PM 770C"
 msgstr "EPSON PM-770C"
 
-#: src/xml/xmli18n-tmp.h:7343
+#: src/xml/xmli18n-tmp.h:7486
 #, fuzzy
 msgid "Epson PM 780C"
 msgstr "EPSON PM-780C"
 
-#: src/xml/xmli18n-tmp.h:7344
+#: src/xml/xmli18n-tmp.h:7487
 #, fuzzy
 msgid "Epson PM 790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/xml/xmli18n-tmp.h:7345
+#: src/xml/xmli18n-tmp.h:7488
 #, fuzzy
 msgid "Epson PM 800C"
 msgstr "EPSON PM-800C"
 
-#: src/xml/xmli18n-tmp.h:7346
+#: src/xml/xmli18n-tmp.h:7489
 #, fuzzy
 msgid "Epson PM 850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7347
+#: src/xml/xmli18n-tmp.h:7490
 #, fuzzy
 msgid "Epson PM 870C"
 msgstr "EPSON PM-870C"
 
-#: src/xml/xmli18n-tmp.h:7348
+#: src/xml/xmli18n-tmp.h:7491
 #, fuzzy
 msgid "Epson PM 880C"
 msgstr "EPSON PM-880C"
 
-#: src/xml/xmli18n-tmp.h:7349
+#: src/xml/xmli18n-tmp.h:7492
 #, fuzzy
 msgid "Epson PM 930C"
 msgstr "EPSON PM-930C"
 
-#: src/xml/xmli18n-tmp.h:7350
+#: src/xml/xmli18n-tmp.h:7493
 #, fuzzy
 msgid "Epson PM 940C"
 msgstr "EPSON PM-940C"
 
-#: src/xml/xmli18n-tmp.h:7351
+#: src/xml/xmli18n-tmp.h:7494
 #, fuzzy
 msgid "Epson PM 950C"
 msgstr "EPSON PM-950C"
 
-#: src/xml/xmli18n-tmp.h:7352
+#: src/xml/xmli18n-tmp.h:7495
 #, fuzzy
 msgid "Epson PM 970C"
 msgstr "EPSON PM-970C"
 
-#: src/xml/xmli18n-tmp.h:7353
+#: src/xml/xmli18n-tmp.h:7496
 #, fuzzy
 msgid "Epson PM 980C"
 msgstr "EPSON PM-980C"
 
-#: src/xml/xmli18n-tmp.h:7354
+#: src/xml/xmli18n-tmp.h:7497
 #, fuzzy
 msgid "Epson PM 2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:7355
+#: src/xml/xmli18n-tmp.h:7498
 #, fuzzy
 msgid "Epson PM 2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/xml/xmli18n-tmp.h:7356
+#: src/xml/xmli18n-tmp.h:7499
 #, fuzzy
 msgid "Epson PM 3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:7357
+#: src/xml/xmli18n-tmp.h:7500
 #, fuzzy
 msgid "Epson PM 3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/xml/xmli18n-tmp.h:7358
+#: src/xml/xmli18n-tmp.h:7501
 #, fuzzy
 msgid "Epson PM 3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/xml/xmli18n-tmp.h:7359
+#: src/xml/xmli18n-tmp.h:7502
 #, fuzzy
 msgid "Epson PM 3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/xml/xmli18n-tmp.h:7360
+#: src/xml/xmli18n-tmp.h:7503
 #, fuzzy
 msgid "Epson PM 4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/xml/xmli18n-tmp.h:7361
+#: src/xml/xmli18n-tmp.h:7504
 #, fuzzy
 msgid "Epson PM 5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/xml/xmli18n-tmp.h:7362
+#: src/xml/xmli18n-tmp.h:7505
 #, fuzzy
 msgid "Epson PM 7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/xml/xmli18n-tmp.h:7363
+#: src/xml/xmli18n-tmp.h:7506
 #, fuzzy
 msgid "Epson PM 9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/xml/xmli18n-tmp.h:7364
+#: src/xml/xmli18n-tmp.h:7507
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "EPSON PM-10000"
 
-#: src/xml/xmli18n-tmp.h:7365
+#: src/xml/xmli18n-tmp.h:7508
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7366
+#: src/xml/xmli18n-tmp.h:7509
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7367
+#: src/xml/xmli18n-tmp.h:7510
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7368
+#: src/xml/xmli18n-tmp.h:7511
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7369
+#: src/xml/xmli18n-tmp.h:7512
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7370
+#: src/xml/xmli18n-tmp.h:7513
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "EPSON PM-940C"
 
-#: src/xml/xmli18n-tmp.h:7371
+#: src/xml/xmli18n-tmp.h:7514
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7372
+#: src/xml/xmli18n-tmp.h:7515
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7373
+#: src/xml/xmli18n-tmp.h:7516
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "EPSON PM-D750"
 
-#: src/xml/xmli18n-tmp.h:7374
+#: src/xml/xmli18n-tmp.h:7517
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "EPSON PM-D770"
 
-#: src/xml/xmli18n-tmp.h:7375
+#: src/xml/xmli18n-tmp.h:7518
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7376
+#: src/xml/xmli18n-tmp.h:7519
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7377
+#: src/xml/xmli18n-tmp.h:7520
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/xml/xmli18n-tmp.h:7378
+#: src/xml/xmli18n-tmp.h:7521
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "EPSON PM-G700"
 
-#: src/xml/xmli18n-tmp.h:7379
+#: src/xml/xmli18n-tmp.h:7522
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "EPSON PM-G720"
 
-#: src/xml/xmli18n-tmp.h:7380
+#: src/xml/xmli18n-tmp.h:7523
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7381
+#: src/xml/xmli18n-tmp.h:7524
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "EPSON PM-G800"
 
-#: src/xml/xmli18n-tmp.h:7382
+#: src/xml/xmli18n-tmp.h:7525
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "EPSON PM-G820"
 
-#: src/xml/xmli18n-tmp.h:7383
+#: src/xml/xmli18n-tmp.h:7526
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7384
+#: src/xml/xmli18n-tmp.h:7527
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "EPSON PM-760C"
 
-#: src/xml/xmli18n-tmp.h:7385
+#: src/xml/xmli18n-tmp.h:7528
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7386
+#: src/xml/xmli18n-tmp.h:7529
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7387
+#: src/xml/xmli18n-tmp.h:7530
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7388
+#: src/xml/xmli18n-tmp.h:7531
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7389
+#: src/xml/xmli18n-tmp.h:7532
+#, fuzzy
+msgid "Epson PX 7V"
+msgstr "EPSON PX-7000"
+
+#: src/xml/xmli18n-tmp.h:7533
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7390
+#: src/xml/xmli18n-tmp.h:7534
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "EPSON PX-G920"
 
-#: src/xml/xmli18n-tmp.h:7391
+#: src/xml/xmli18n-tmp.h:7535
+#, fuzzy
+msgid "Epson PX 204"
+msgstr "EPSON PX-G920"
+
+#: src/xml/xmli18n-tmp.h:7536
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7392
+#: src/xml/xmli18n-tmp.h:7537
+#, fuzzy
+msgid "Epson PX 504A"
+msgstr "EPSON PX-G900"
+
+#: src/xml/xmli18n-tmp.h:7538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:7393
+#: src/xml/xmli18n-tmp.h:7539
 #, fuzzy
 msgid "Epson PX 1001"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7394
+#: src/xml/xmli18n-tmp.h:7540
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:7395
+#: src/xml/xmli18n-tmp.h:7541
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "EPSON PX-G920"
 
-#: src/xml/xmli18n-tmp.h:7396
+#: src/xml/xmli18n-tmp.h:7542
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/xml/xmli18n-tmp.h:7397
+#: src/xml/xmli18n-tmp.h:7543
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "EPSON PX-G5000"
 
-#: src/xml/xmli18n-tmp.h:7398
+#: src/xml/xmli18n-tmp.h:7544
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7399
+#: src/xml/xmli18n-tmp.h:7545
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:7400
+#: src/xml/xmli18n-tmp.h:7546
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7401
+#: src/xml/xmli18n-tmp.h:7547
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7402
+#: src/xml/xmli18n-tmp.h:7548
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7403
+#: src/xml/xmli18n-tmp.h:7549
 #, fuzzy
 msgid "Epson PX G5600"
 msgstr "EPSON PX-G5000"
 
-#: src/xml/xmli18n-tmp.h:7404
+#: src/xml/xmli18n-tmp.h:7550
 #, fuzzy
 msgid "Epson PX 7000"
 msgstr "EPSON PX-7000"
 
-#: src/xml/xmli18n-tmp.h:7405
+#: src/xml/xmli18n-tmp.h:7551
 #, fuzzy
 msgid "Epson PX 9000"
 msgstr "EPSON PX-9000"
 
-#: src/xml/xmli18n-tmp.h:7406
+#: src/xml/xmli18n-tmp.h:7552
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7407
+#: src/xml/xmli18n-tmp.h:7553
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7408
+#: src/xml/xmli18n-tmp.h:7554
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7409
+#: src/xml/xmli18n-tmp.h:7555
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7410
+#: src/xml/xmli18n-tmp.h:7556
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7411
+#: src/xml/xmli18n-tmp.h:7557
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7412
+#: src/xml/xmli18n-tmp.h:7558
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7413
+#: src/xml/xmli18n-tmp.h:7559
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7414
+#: src/xml/xmli18n-tmp.h:7560
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:7415
+#: src/xml/xmli18n-tmp.h:7561
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:7416
+#: src/xml/xmli18n-tmp.h:7562
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:7417
+#: src/xml/xmli18n-tmp.h:7563
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7418
+#: src/xml/xmli18n-tmp.h:7564
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7419
+#: src/xml/xmli18n-tmp.h:7565
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7420
+#: src/xml/xmli18n-tmp.h:7566
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7421
+#: src/xml/xmli18n-tmp.h:7567
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7422
+#: src/xml/xmli18n-tmp.h:7568
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7423
+#: src/xml/xmli18n-tmp.h:7569
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7424
+#: src/xml/xmli18n-tmp.h:7570
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7425
+#: src/xml/xmli18n-tmp.h:7571
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7426
+#: src/xml/xmli18n-tmp.h:7572
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7427
+#: src/xml/xmli18n-tmp.h:7573
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7428
+#: src/xml/xmli18n-tmp.h:7574
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7429
+#: src/xml/xmli18n-tmp.h:7575
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7430
+#: src/xml/xmli18n-tmp.h:7576
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7431
+#: src/xml/xmli18n-tmp.h:7577
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7432
+#: src/xml/xmli18n-tmp.h:7578
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7433
+#: src/xml/xmli18n-tmp.h:7579
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7434
+#: src/xml/xmli18n-tmp.h:7580
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7435
+#: src/xml/xmli18n-tmp.h:7581
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7436
+#: src/xml/xmli18n-tmp.h:7582
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7437
+#: src/xml/xmli18n-tmp.h:7583
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7438
+#: src/xml/xmli18n-tmp.h:7584
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7439
+#: src/xml/xmli18n-tmp.h:7585
 msgid "Brother HL-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7440
+#: src/xml/xmli18n-tmp.h:7586
 msgid "Brother HL-2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7441
+#: src/xml/xmli18n-tmp.h:7587
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7442
+#: src/xml/xmli18n-tmp.h:7588
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7443
+#: src/xml/xmli18n-tmp.h:7589
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7444
+#: src/xml/xmli18n-tmp.h:7590
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7445
+#: src/xml/xmli18n-tmp.h:7591
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7446
+#: src/xml/xmli18n-tmp.h:7592
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7447
+#: src/xml/xmli18n-tmp.h:7593
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7448
+#: src/xml/xmli18n-tmp.h:7594
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7449
+#: src/xml/xmli18n-tmp.h:7595
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7450
+#: src/xml/xmli18n-tmp.h:7596
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7451
+#: src/xml/xmli18n-tmp.h:7597
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7452
+#: src/xml/xmli18n-tmp.h:7598
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7453
+#: src/xml/xmli18n-tmp.h:7599
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7454
+#: src/xml/xmli18n-tmp.h:7600
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7455
+#: src/xml/xmli18n-tmp.h:7601
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7456
+#: src/xml/xmli18n-tmp.h:7602
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7457
+#: src/xml/xmli18n-tmp.h:7603
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7458
+#: src/xml/xmli18n-tmp.h:7604
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7459
+#: src/xml/xmli18n-tmp.h:7605
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7460
+#: src/xml/xmli18n-tmp.h:7606
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7461
+#: src/xml/xmli18n-tmp.h:7607
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7462
+#: src/xml/xmli18n-tmp.h:7608
 #, fuzzy
 msgid "Canon GP 335"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:7463
+#: src/xml/xmli18n-tmp.h:7609
 #, fuzzy
 msgid "Canon LBP-4sx"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:7464
+#: src/xml/xmli18n-tmp.h:7610
 #, fuzzy
 msgid "Canon LBP-430"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:7465
+#: src/xml/xmli18n-tmp.h:7611
 #, fuzzy
 msgid "Canon LBP-1000"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:7466
+#: src/xml/xmli18n-tmp.h:7612
 #, fuzzy
 msgid "Canon LBP-1260"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:7467
+#: src/xml/xmli18n-tmp.h:7613
 #, fuzzy
 msgid "Canon LBP-1760"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:7468
+#: src/xml/xmli18n-tmp.h:7614
 #, fuzzy
 msgid "Canon LBP-3360"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:7469
+#: src/xml/xmli18n-tmp.h:7615
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7470
+#: src/xml/xmli18n-tmp.h:7616
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7471
+#: src/xml/xmli18n-tmp.h:7617
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7472
+#: src/xml/xmli18n-tmp.h:7618
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7473
+#: src/xml/xmli18n-tmp.h:7619
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7474
+#: src/xml/xmli18n-tmp.h:7620
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7475
+#: src/xml/xmli18n-tmp.h:7621
 #, fuzzy
 msgid "Epson AL-C2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:7476
+#: src/xml/xmli18n-tmp.h:7622
 #, fuzzy
 msgid "Epson AL-C2000 PS3"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7477
+#: src/xml/xmli18n-tmp.h:7623
 #, fuzzy
 msgid "Epson AL-C8500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7478
+#: src/xml/xmli18n-tmp.h:7624
 #, fuzzy
 msgid "Epson AL-C8500PS"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7479
+#: src/xml/xmli18n-tmp.h:7625
 #, fuzzy
 msgid "Epson AL-C8600"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:7480
+#: src/xml/xmli18n-tmp.h:7626
 #, fuzzy
 msgid "Epson AL-C8600 PS3"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7481
+#: src/xml/xmli18n-tmp.h:7627
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7482
+#: src/xml/xmli18n-tmp.h:7628
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7483
+#: src/xml/xmli18n-tmp.h:7629
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7484
+#: src/xml/xmli18n-tmp.h:7630
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7485
+#: src/xml/xmli18n-tmp.h:7631
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7486
+#: src/xml/xmli18n-tmp.h:7632
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7487
+#: src/xml/xmli18n-tmp.h:7633
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7488
+#: src/xml/xmli18n-tmp.h:7634
 #, fuzzy
 msgid "Epson EPL-5900 PS3"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7489
+#: src/xml/xmli18n-tmp.h:7635
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7490
+#: src/xml/xmli18n-tmp.h:7636
 #, fuzzy
 msgid "Epson EPL-6100 PS3"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7491
+#: src/xml/xmli18n-tmp.h:7637
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7492
+#: src/xml/xmli18n-tmp.h:7638
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:7493
+#: src/xml/xmli18n-tmp.h:7639
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:7494
+#: src/xml/xmli18n-tmp.h:7640
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7495
+#: src/xml/xmli18n-tmp.h:7641
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:7496
+#: src/xml/xmli18n-tmp.h:7642
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "EPSON PM-2200C"
 
-#: src/xml/xmli18n-tmp.h:7497
+#: src/xml/xmli18n-tmp.h:7643
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7498
+#: src/xml/xmli18n-tmp.h:7644
 #, fuzzy
 msgid "Epson EPL-N2500 PS3"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:7499
+#: src/xml/xmli18n-tmp.h:7645
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:7500
+#: src/xml/xmli18n-tmp.h:7646
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:7501
+#: src/xml/xmli18n-tmp.h:7647
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7502
+#: src/xml/xmli18n-tmp.h:7648
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7503
+#: src/xml/xmli18n-tmp.h:7649
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7504
+#: src/xml/xmli18n-tmp.h:7650
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7505
+#: src/xml/xmli18n-tmp.h:7651
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7506
+#: src/xml/xmli18n-tmp.h:7652
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7507
+#: src/xml/xmli18n-tmp.h:7653
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7508
+#: src/xml/xmli18n-tmp.h:7654
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7509
+#: src/xml/xmli18n-tmp.h:7655
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7510
+#: src/xml/xmli18n-tmp.h:7656
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7511
+#: src/xml/xmli18n-tmp.h:7657
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7512
+#: src/xml/xmli18n-tmp.h:7658
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7513
+#: src/xml/xmli18n-tmp.h:7659
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7514
+#: src/xml/xmli18n-tmp.h:7660
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:7515
+#: src/xml/xmli18n-tmp.h:7661
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7516
+#: src/xml/xmli18n-tmp.h:7662
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7517
+#: src/xml/xmli18n-tmp.h:7663
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7518
+#: src/xml/xmli18n-tmp.h:7664
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7519
+#: src/xml/xmli18n-tmp.h:7665
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7520
+#: src/xml/xmli18n-tmp.h:7666
 msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7521
+#: src/xml/xmli18n-tmp.h:7667
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7522
+#: src/xml/xmli18n-tmp.h:7668
 msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7523
+#: src/xml/xmli18n-tmp.h:7669
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7524
+#: src/xml/xmli18n-tmp.h:7670
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7525
+#: src/xml/xmli18n-tmp.h:7671
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7526
+#: src/xml/xmli18n-tmp.h:7672
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7527
+#: src/xml/xmli18n-tmp.h:7673
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7528
+#: src/xml/xmli18n-tmp.h:7674
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7529
+#: src/xml/xmli18n-tmp.h:7675
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7530
+#: src/xml/xmli18n-tmp.h:7676
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7531
+#: src/xml/xmli18n-tmp.h:7677
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7532
+#: src/xml/xmli18n-tmp.h:7678
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7533
+#: src/xml/xmli18n-tmp.h:7679
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7534
+#: src/xml/xmli18n-tmp.h:7680
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7535
+#: src/xml/xmli18n-tmp.h:7681
 msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7536
+#: src/xml/xmli18n-tmp.h:7682
 msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7537
+#: src/xml/xmli18n-tmp.h:7683
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7538
+#: src/xml/xmli18n-tmp.h:7684
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7539
+#: src/xml/xmli18n-tmp.h:7685
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7540
+#: src/xml/xmli18n-tmp.h:7686
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7541
+#: src/xml/xmli18n-tmp.h:7687
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7542
+#: src/xml/xmli18n-tmp.h:7688
 msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7543
+#: src/xml/xmli18n-tmp.h:7689
 msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7544
+#: src/xml/xmli18n-tmp.h:7690
 #, fuzzy
 msgid "Gestetner MP1100/DSm7110"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7545
+#: src/xml/xmli18n-tmp.h:7691
 #, fuzzy
 msgid "Gestetner MP1350/DSm7135"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7546
+#: src/xml/xmli18n-tmp.h:7692
 #, fuzzy
 msgid "Gestetner MP1600/DSm716"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7547
+#: src/xml/xmli18n-tmp.h:7693
 #, fuzzy
 msgid "Gestetner MP2000/DSm721d"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7548
+#: src/xml/xmli18n-tmp.h:7694
 #, fuzzy
 msgid "Gestetner MP2500/DSm625"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7549
+#: src/xml/xmli18n-tmp.h:7695
 #, fuzzy
 msgid "Gestetner MP3500/DSm735e"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7550
+#: src/xml/xmli18n-tmp.h:7696
 #, fuzzy
 msgid "Gestetner MP4500/DSm745e"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7551
+#: src/xml/xmli18n-tmp.h:7697
 #, fuzzy
 msgid "Gestetner MP5500/DSm755"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7552
+#: src/xml/xmli18n-tmp.h:7698
 #, fuzzy
 msgid "Gestetner MP6500/DSm765"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7553
+#: src/xml/xmli18n-tmp.h:7699
 #, fuzzy
 msgid "Gestetner MP7500/DSm775"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7554
+#: src/xml/xmli18n-tmp.h:7700
 #, fuzzy
 msgid "Gestetner MP9000/DSm790"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7555
+#: src/xml/xmli18n-tmp.h:7701
 #, fuzzy
 msgid "Gestetner MP 161/DSm416"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7556
+#: src/xml/xmli18n-tmp.h:7702
 #, fuzzy
 msgid "Gestetner MP 2510/DSm725e"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7557
+#: src/xml/xmli18n-tmp.h:7703
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7558
+#: src/xml/xmli18n-tmp.h:7704
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7559
+#: src/xml/xmli18n-tmp.h:7705
 #, fuzzy
 msgid "Gestetner MP 3010/DSm730e"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7560
+#: src/xml/xmli18n-tmp.h:7706
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7561
+#: src/xml/xmli18n-tmp.h:7707
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7562
+#: src/xml/xmli18n-tmp.h:7708
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7563
+#: src/xml/xmli18n-tmp.h:7709
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7564
+#: src/xml/xmli18n-tmp.h:7710
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:7565
+#: src/xml/xmli18n-tmp.h:7711
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7566
+#: src/xml/xmli18n-tmp.h:7712
 #, fuzzy
 msgid "HP Business Inkjet 2200"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7567
+#: src/xml/xmli18n-tmp.h:7713
 #, fuzzy
 msgid "HP Business Inkjet 2230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7568
+#: src/xml/xmli18n-tmp.h:7714
 #, fuzzy
 msgid "HP Business Inkjet 2250"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7569
+#: src/xml/xmli18n-tmp.h:7715
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7570
+#: src/xml/xmli18n-tmp.h:7716
 #, fuzzy
 msgid "HP Business Inkjet 2280"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7571
+#: src/xml/xmli18n-tmp.h:7717
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7572
+#: src/xml/xmli18n-tmp.h:7718
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7573
+#: src/xml/xmli18n-tmp.h:7719
 #, fuzzy
 msgid "HP Color LaserJet 2500"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7574
+#: src/xml/xmli18n-tmp.h:7720
 #, fuzzy
 msgid "HP Color LaserJet 4500"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7575
+#: src/xml/xmli18n-tmp.h:7721
 #, fuzzy
 msgid "HP Color LaserJet 4550"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7576
+#: src/xml/xmli18n-tmp.h:7722
 #, fuzzy
 msgid "HP Color LaserJet 4600"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7577
+#: src/xml/xmli18n-tmp.h:7723
 #, fuzzy
 msgid "HP Color LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7578
+#: src/xml/xmli18n-tmp.h:7724
 #, fuzzy
 msgid "HP Color LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7579
+#: src/xml/xmli18n-tmp.h:7725
 #, fuzzy
 msgid "HP Color LaserJet 5500"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7580
+#: src/xml/xmli18n-tmp.h:7726
 #, fuzzy
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7581
+#: src/xml/xmli18n-tmp.h:7727
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7582
+#: src/xml/xmli18n-tmp.h:7728
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7583
+#: src/xml/xmli18n-tmp.h:7729
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:7584
+#: src/xml/xmli18n-tmp.h:7730
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:7585
+#: src/xml/xmli18n-tmp.h:7731
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7586
+#: src/xml/xmli18n-tmp.h:7732
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:7587
+#: src/xml/xmli18n-tmp.h:7733
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7588
+#: src/xml/xmli18n-tmp.h:7734
 #, fuzzy
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7589
+#: src/xml/xmli18n-tmp.h:7735
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:7590
+#: src/xml/xmli18n-tmp.h:7736
 #, fuzzy
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500C"
 
-#: src/xml/xmli18n-tmp.h:7591
+#: src/xml/xmli18n-tmp.h:7737
 #, fuzzy
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500C"
 
-#: src/xml/xmli18n-tmp.h:7592
+#: src/xml/xmli18n-tmp.h:7738
 #, fuzzy
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:7593
+#: src/xml/xmli18n-tmp.h:7739
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:7594
+#: src/xml/xmli18n-tmp.h:7740
 #, fuzzy
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7595
+#: src/xml/xmli18n-tmp.h:7741
 #, fuzzy
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7596
+#: src/xml/xmli18n-tmp.h:7742
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7597
+#: src/xml/xmli18n-tmp.h:7743
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7598
+#: src/xml/xmli18n-tmp.h:7744
 #, fuzzy
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7599
+#: src/xml/xmli18n-tmp.h:7745
 #, fuzzy
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7600
+#: src/xml/xmli18n-tmp.h:7746
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7601
+#: src/xml/xmli18n-tmp.h:7747
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7602
+#: src/xml/xmli18n-tmp.h:7748
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7603
+#: src/xml/xmli18n-tmp.h:7749
 #, fuzzy
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7604
+#: src/xml/xmli18n-tmp.h:7750
 #, fuzzy
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7605
+#: src/xml/xmli18n-tmp.h:7751
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7606
+#: src/xml/xmli18n-tmp.h:7752
 #, fuzzy
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7607
+#: src/xml/xmli18n-tmp.h:7753
 #, fuzzy
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7608
+#: src/xml/xmli18n-tmp.h:7754
 #, fuzzy
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7609
+#: src/xml/xmli18n-tmp.h:7755
 #, fuzzy
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7610
+#: src/xml/xmli18n-tmp.h:7756
 #, fuzzy
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7611
+#: src/xml/xmli18n-tmp.h:7757
 #, fuzzy
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7612
+#: src/xml/xmli18n-tmp.h:7758
 #, fuzzy
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7613
+#: src/xml/xmli18n-tmp.h:7759
 #, fuzzy
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7614
+#: src/xml/xmli18n-tmp.h:7760
 #, fuzzy
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7615
+#: src/xml/xmli18n-tmp.h:7761
 #, fuzzy
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7616
+#: src/xml/xmli18n-tmp.h:7762
 #, fuzzy
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7617
+#: src/xml/xmli18n-tmp.h:7763
 #, fuzzy
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7618
+#: src/xml/xmli18n-tmp.h:7764
 #, fuzzy
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7619
+#: src/xml/xmli18n-tmp.h:7765
 #, fuzzy
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7620
+#: src/xml/xmli18n-tmp.h:7766
 #, fuzzy
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7621
+#: src/xml/xmli18n-tmp.h:7767
 #, fuzzy
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7622
+#: src/xml/xmli18n-tmp.h:7768
 #, fuzzy
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7623
+#: src/xml/xmli18n-tmp.h:7769
 #, fuzzy
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7624
+#: src/xml/xmli18n-tmp.h:7770
 #, fuzzy
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7625
+#: src/xml/xmli18n-tmp.h:7771
 #, fuzzy
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7626
+#: src/xml/xmli18n-tmp.h:7772
 #, fuzzy
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7627
+#: src/xml/xmli18n-tmp.h:7773
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7628
+#: src/xml/xmli18n-tmp.h:7774
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7629
+#: src/xml/xmli18n-tmp.h:7775
 #, fuzzy
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7630
+#: src/xml/xmli18n-tmp.h:7776
 #, fuzzy
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7631
+#: src/xml/xmli18n-tmp.h:7777
 #, fuzzy
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7632
+#: src/xml/xmli18n-tmp.h:7778
 #, fuzzy
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7633
+#: src/xml/xmli18n-tmp.h:7779
 #, fuzzy
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7634
+#: src/xml/xmli18n-tmp.h:7780
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7635
+#: src/xml/xmli18n-tmp.h:7781
 #, fuzzy
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7636
+#: src/xml/xmli18n-tmp.h:7782
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:7637
+#: src/xml/xmli18n-tmp.h:7783
 #, fuzzy
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:7638
+#: src/xml/xmli18n-tmp.h:7784
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7639
+#: src/xml/xmli18n-tmp.h:7785
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:7640
+#: src/xml/xmli18n-tmp.h:7786
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:7641
+#: src/xml/xmli18n-tmp.h:7787
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7642
+#: src/xml/xmli18n-tmp.h:7788
 #, fuzzy
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7643
+#: src/xml/xmli18n-tmp.h:7789
 #, fuzzy
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7644
+#: src/xml/xmli18n-tmp.h:7790
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7645
+#: src/xml/xmli18n-tmp.h:7791
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7646
+#: src/xml/xmli18n-tmp.h:7792
 #, fuzzy
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7647
+#: src/xml/xmli18n-tmp.h:7793
 #, fuzzy
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7648
+#: src/xml/xmli18n-tmp.h:7794
 #, fuzzy
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7649
+#: src/xml/xmli18n-tmp.h:7795
 #, fuzzy
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7650
+#: src/xml/xmli18n-tmp.h:7796
 #, fuzzy
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7651
+#: src/xml/xmli18n-tmp.h:7797
 #, fuzzy
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7652
+#: src/xml/xmli18n-tmp.h:7798
 #, fuzzy
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7653
+#: src/xml/xmli18n-tmp.h:7799
 #, fuzzy
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7654
+#: src/xml/xmli18n-tmp.h:7800
 #, fuzzy
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7655
+#: src/xml/xmli18n-tmp.h:7801
 #, fuzzy
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:7656
+#: src/xml/xmli18n-tmp.h:7802
 #, fuzzy
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7657
+#: src/xml/xmli18n-tmp.h:7803
 #, fuzzy
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7658
+#: src/xml/xmli18n-tmp.h:7804
 #, fuzzy
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7659
+#: src/xml/xmli18n-tmp.h:7805
 #, fuzzy
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7660
+#: src/xml/xmli18n-tmp.h:7806
 #, fuzzy
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7661
+#: src/xml/xmli18n-tmp.h:7807
 #, fuzzy
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7662
+#: src/xml/xmli18n-tmp.h:7808
 #, fuzzy
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:7663
+#: src/xml/xmli18n-tmp.h:7809
 #, fuzzy
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7664
+#: src/xml/xmli18n-tmp.h:7810
 #, fuzzy
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7665
+#: src/xml/xmli18n-tmp.h:7811
 #, fuzzy
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:7666
+#: src/xml/xmli18n-tmp.h:7812
 #, fuzzy
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7667
+#: src/xml/xmli18n-tmp.h:7813
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7668
+#: src/xml/xmli18n-tmp.h:7814
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7669
+#: src/xml/xmli18n-tmp.h:7815
 #, fuzzy
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:7670
+#: src/xml/xmli18n-tmp.h:7816
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7671
+#: src/xml/xmli18n-tmp.h:7817
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:7672
+#: src/xml/xmli18n-tmp.h:7818
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7673
+#: src/xml/xmli18n-tmp.h:7819
 #, fuzzy
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7674
+#: src/xml/xmli18n-tmp.h:7820
 #, fuzzy
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:7675
+#: src/xml/xmli18n-tmp.h:7821
 #, fuzzy
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7676
+#: src/xml/xmli18n-tmp.h:7822
 #, fuzzy
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:7677
+#: src/xml/xmli18n-tmp.h:7823
 #, fuzzy
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7678
+#: src/xml/xmli18n-tmp.h:7824
 #, fuzzy
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7679
+#: src/xml/xmli18n-tmp.h:7825
 #, fuzzy
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7680
+#: src/xml/xmli18n-tmp.h:7826
 #, fuzzy
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7681
+#: src/xml/xmli18n-tmp.h:7827
 #, fuzzy
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7682
+#: src/xml/xmli18n-tmp.h:7828
 #, fuzzy
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7683
+#: src/xml/xmli18n-tmp.h:7829
 #, fuzzy
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7684
+#: src/xml/xmli18n-tmp.h:7830
 #, fuzzy
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/xml/xmli18n-tmp.h:7685
+#: src/xml/xmli18n-tmp.h:7831
 #, fuzzy
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7686
+#: src/xml/xmli18n-tmp.h:7832
 #, fuzzy
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7687
+#: src/xml/xmli18n-tmp.h:7833
 #, fuzzy
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7688
+#: src/xml/xmli18n-tmp.h:7834
 #, fuzzy
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7689
+#: src/xml/xmli18n-tmp.h:7835
 #, fuzzy
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7690
+#: src/xml/xmli18n-tmp.h:7836
 #, fuzzy
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7691
+#: src/xml/xmli18n-tmp.h:7837
 #, fuzzy
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7692
+#: src/xml/xmli18n-tmp.h:7838
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7693
+#: src/xml/xmli18n-tmp.h:7839
 #, fuzzy
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7694
+#: src/xml/xmli18n-tmp.h:7840
 #, fuzzy
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7695
+#: src/xml/xmli18n-tmp.h:7841
 #, fuzzy
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7696
+#: src/xml/xmli18n-tmp.h:7842
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:7697
+#: src/xml/xmli18n-tmp.h:7843
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:7698
+#: src/xml/xmli18n-tmp.h:7844
 #, fuzzy
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7699
+#: src/xml/xmli18n-tmp.h:7845
 #, fuzzy
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7700
+#: src/xml/xmli18n-tmp.h:7846
 #, fuzzy
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7701
+#: src/xml/xmli18n-tmp.h:7847
 #, fuzzy
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7702
+#: src/xml/xmli18n-tmp.h:7848
 #, fuzzy
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7703
+#: src/xml/xmli18n-tmp.h:7849
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7704
+#: src/xml/xmli18n-tmp.h:7850
 #, fuzzy
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7705
+#: src/xml/xmli18n-tmp.h:7851
 #, fuzzy
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7706
+#: src/xml/xmli18n-tmp.h:7852
 #, fuzzy
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7707
+#: src/xml/xmli18n-tmp.h:7853
 #, fuzzy
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7708
+#: src/xml/xmli18n-tmp.h:7854
 #, fuzzy
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7709
+#: src/xml/xmli18n-tmp.h:7855
 #, fuzzy
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7710
+#: src/xml/xmli18n-tmp.h:7856
 #, fuzzy
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7711
+#: src/xml/xmli18n-tmp.h:7857
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7712
+#: src/xml/xmli18n-tmp.h:7858
 #, fuzzy
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7713
+#: src/xml/xmli18n-tmp.h:7859
 #, fuzzy
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7714
+#: src/xml/xmli18n-tmp.h:7860
 #, fuzzy
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7715
+#: src/xml/xmli18n-tmp.h:7861
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7716
+#: src/xml/xmli18n-tmp.h:7862
 #, fuzzy
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7717
+#: src/xml/xmli18n-tmp.h:7863
 #, fuzzy
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7718
+#: src/xml/xmli18n-tmp.h:7864
 #, fuzzy
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7719
+#: src/xml/xmli18n-tmp.h:7865
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7720
+#: src/xml/xmli18n-tmp.h:7866
 #, fuzzy
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7721
+#: src/xml/xmli18n-tmp.h:7867
 #, fuzzy
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7722
+#: src/xml/xmli18n-tmp.h:7868
 #, fuzzy
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7723
+#: src/xml/xmli18n-tmp.h:7869
 #, fuzzy
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7724
+#: src/xml/xmli18n-tmp.h:7870
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7725
+#: src/xml/xmli18n-tmp.h:7871
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7726
+#: src/xml/xmli18n-tmp.h:7872
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7727
+#: src/xml/xmli18n-tmp.h:7873
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7728
+#: src/xml/xmli18n-tmp.h:7874
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7729
+#: src/xml/xmli18n-tmp.h:7875
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7730
+#: src/xml/xmli18n-tmp.h:7876
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7731
+#: src/xml/xmli18n-tmp.h:7877
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7732
+#: src/xml/xmli18n-tmp.h:7878
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7733
+#: src/xml/xmli18n-tmp.h:7879
 #, fuzzy
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7734
+#: src/xml/xmli18n-tmp.h:7880
 #, fuzzy
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7735
+#: src/xml/xmli18n-tmp.h:7881
 #, fuzzy
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7736
+#: src/xml/xmli18n-tmp.h:7882
 #, fuzzy
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7737
+#: src/xml/xmli18n-tmp.h:7883
 #, fuzzy
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7738
+#: src/xml/xmli18n-tmp.h:7884
 #, fuzzy
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7739
+#: src/xml/xmli18n-tmp.h:7885
 #, fuzzy
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7740
+#: src/xml/xmli18n-tmp.h:7886
 #, fuzzy
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7741
+#: src/xml/xmli18n-tmp.h:7887
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7742
+#: src/xml/xmli18n-tmp.h:7888
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7743
+#: src/xml/xmli18n-tmp.h:7889
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7744
+#: src/xml/xmli18n-tmp.h:7890
 #, fuzzy
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7745
+#: src/xml/xmli18n-tmp.h:7891
 #, fuzzy
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7746
+#: src/xml/xmli18n-tmp.h:7892
 #, fuzzy
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7747
+#: src/xml/xmli18n-tmp.h:7893
 #, fuzzy
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7748
+#: src/xml/xmli18n-tmp.h:7894
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7749
+#: src/xml/xmli18n-tmp.h:7895
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7750
+#: src/xml/xmli18n-tmp.h:7896
 #, fuzzy
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7751
+#: src/xml/xmli18n-tmp.h:7897
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7752
+#: src/xml/xmli18n-tmp.h:7898
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7753
+#: src/xml/xmli18n-tmp.h:7899
 #, fuzzy
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7754
+#: src/xml/xmli18n-tmp.h:7900
 #, fuzzy
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7755
+#: src/xml/xmli18n-tmp.h:7901
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7756
+#: src/xml/xmli18n-tmp.h:7902
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7757
+#: src/xml/xmli18n-tmp.h:7903
 #, fuzzy
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7758
+#: src/xml/xmli18n-tmp.h:7904
 #, fuzzy
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7759
+#: src/xml/xmli18n-tmp.h:7905
 #, fuzzy
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7760
+#: src/xml/xmli18n-tmp.h:7906
 #, fuzzy
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7761
+#: src/xml/xmli18n-tmp.h:7907
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7762
+#: src/xml/xmli18n-tmp.h:7908
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7763
+#: src/xml/xmli18n-tmp.h:7909
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7764
+#: src/xml/xmli18n-tmp.h:7910
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7765
+#: src/xml/xmli18n-tmp.h:7911
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7766
+#: src/xml/xmli18n-tmp.h:7912
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7767
+#: src/xml/xmli18n-tmp.h:7913
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7768
+#: src/xml/xmli18n-tmp.h:7914
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7769
+#: src/xml/xmli18n-tmp.h:7915
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7770
+#: src/xml/xmli18n-tmp.h:7916
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7771
+#: src/xml/xmli18n-tmp.h:7917
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:7772
+#: src/xml/xmli18n-tmp.h:7918
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7773
+#: src/xml/xmli18n-tmp.h:7919
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7774
+#: src/xml/xmli18n-tmp.h:7920
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7775
+#: src/xml/xmli18n-tmp.h:7921
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7776
+#: src/xml/xmli18n-tmp.h:7922
 #, fuzzy
 msgid "HP OfficeJet 300"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7777
+#: src/xml/xmli18n-tmp.h:7923
 #, fuzzy
 msgid "HP OfficeJet 330"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7778
+#: src/xml/xmli18n-tmp.h:7924
 #, fuzzy
 msgid "HP OfficeJet 350"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7779
+#: src/xml/xmli18n-tmp.h:7925
 #, fuzzy
 msgid "HP OfficeJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7780
+#: src/xml/xmli18n-tmp.h:7926
 #, fuzzy
 msgid "HP OfficeJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7781
+#: src/xml/xmli18n-tmp.h:7927
 #, fuzzy
 msgid "HP OfficeJet 570"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7782
+#: src/xml/xmli18n-tmp.h:7928
 #, fuzzy
 msgid "HP OfficeJet 580"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7783
+#: src/xml/xmli18n-tmp.h:7929
 #, fuzzy
 msgid "HP OfficeJet 590"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7784
+#: src/xml/xmli18n-tmp.h:7930
 #, fuzzy
 msgid "HP OfficeJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:7785
+#: src/xml/xmli18n-tmp.h:7931
 #, fuzzy
 msgid "HP OfficeJet 610"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7786
+#: src/xml/xmli18n-tmp.h:7932
 #, fuzzy
 msgid "HP OfficeJet 625"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7787
+#: src/xml/xmli18n-tmp.h:7933
 #, fuzzy
 msgid "HP OfficeJet 630"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7788
+#: src/xml/xmli18n-tmp.h:7934
 #, fuzzy
 msgid "HP OfficeJet 635"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7789
+#: src/xml/xmli18n-tmp.h:7935
 #, fuzzy
 msgid "HP OfficeJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:7790
+#: src/xml/xmli18n-tmp.h:7936
 #, fuzzy
 msgid "HP OfficeJet 710"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7791
+#: src/xml/xmli18n-tmp.h:7937
 #, fuzzy
 msgid "HP OfficeJet 720"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:7792
+#: src/xml/xmli18n-tmp.h:7938
 #, fuzzy
 msgid "HP OfficeJet 725"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:7793
+#: src/xml/xmli18n-tmp.h:7939
 #, fuzzy
 msgid "HP OfficeJet 5105"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7794
+#: src/xml/xmli18n-tmp.h:7940
 #, fuzzy
 msgid "HP OfficeJet 5110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7795
+#: src/xml/xmli18n-tmp.h:7941
 #, fuzzy
 msgid "HP OfficeJet 5110xi"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7796
+#: src/xml/xmli18n-tmp.h:7942
 #, fuzzy
 msgid "HP OfficeJet 6105"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7797
+#: src/xml/xmli18n-tmp.h:7943
 #, fuzzy
 msgid "HP OfficeJet 6110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7798
+#: src/xml/xmli18n-tmp.h:7944
 #, fuzzy
 msgid "HP OfficeJet 7110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7799
+#: src/xml/xmli18n-tmp.h:7945
 #, fuzzy
 msgid "HP OfficeJet 7130"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7800
+#: src/xml/xmli18n-tmp.h:7946
 #, fuzzy
 msgid "HP OfficeJet 7140"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7801
+#: src/xml/xmli18n-tmp.h:7947
 #, fuzzy
 msgid "HP OfficeJet D125"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:7802
+#: src/xml/xmli18n-tmp.h:7948
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7803
+#: src/xml/xmli18n-tmp.h:7949
 #, fuzzy
 msgid "HP OfficeJet D145"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7804
+#: src/xml/xmli18n-tmp.h:7950
 #, fuzzy
 msgid "HP OfficeJet D155"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7805
+#: src/xml/xmli18n-tmp.h:7951
 #, fuzzy
 msgid "HP OfficeJet G55"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:7806
+#: src/xml/xmli18n-tmp.h:7952
 #, fuzzy
 msgid "HP OfficeJet G85"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7807
+#: src/xml/xmli18n-tmp.h:7953
 #, fuzzy
 msgid "HP OfficeJet G95"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:7808
+#: src/xml/xmli18n-tmp.h:7954
 #, fuzzy
 msgid "HP OfficeJet K60"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7809
+#: src/xml/xmli18n-tmp.h:7955
 #, fuzzy
 msgid "HP OfficeJet K60xi"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7810
+#: src/xml/xmli18n-tmp.h:7956
 #, fuzzy
 msgid "HP OfficeJet K80"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7811
+#: src/xml/xmli18n-tmp.h:7957
 #, fuzzy
 msgid "HP OfficeJet K80xi"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7812
+#: src/xml/xmli18n-tmp.h:7958
 #, fuzzy
 msgid "HP OfficeJet LX"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:7813
+#: src/xml/xmli18n-tmp.h:7959
 #, fuzzy
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7814
+#: src/xml/xmli18n-tmp.h:7960
 #, fuzzy
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:7815
+#: src/xml/xmli18n-tmp.h:7961
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7816
+#: src/xml/xmli18n-tmp.h:7962
 #, fuzzy
 msgid "HP OfficeJet R40"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7817
+#: src/xml/xmli18n-tmp.h:7963
 #, fuzzy
 msgid "HP OfficeJet R45"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7818
+#: src/xml/xmli18n-tmp.h:7964
 #, fuzzy
 msgid "HP OfficeJet R60"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:7819
+#: src/xml/xmli18n-tmp.h:7965
 #, fuzzy
 msgid "HP OfficeJet R65"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7820
+#: src/xml/xmli18n-tmp.h:7966
 #, fuzzy
 msgid "HP OfficeJet R80"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:7821
+#: src/xml/xmli18n-tmp.h:7967
 #, fuzzy
 msgid "HP OfficeJet T45"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:7822
+#: src/xml/xmli18n-tmp.h:7968
 #, fuzzy
 msgid "HP OfficeJet T65"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:7823
+#: src/xml/xmli18n-tmp.h:7969
 #, fuzzy
 msgid "HP OfficeJet V40"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7824
+#: src/xml/xmli18n-tmp.h:7970
 #, fuzzy
 msgid "HP OfficeJet V40xi"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:7825
+#: src/xml/xmli18n-tmp.h:7971
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7826
+#: src/xml/xmli18n-tmp.h:7972
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7827
+#: src/xml/xmli18n-tmp.h:7973
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7828
+#: src/xml/xmli18n-tmp.h:7974
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7829
+#: src/xml/xmli18n-tmp.h:7975
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7830
+#: src/xml/xmli18n-tmp.h:7976
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7831
+#: src/xml/xmli18n-tmp.h:7977
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7832
+#: src/xml/xmli18n-tmp.h:7978
 #, fuzzy
 msgid "HP PSC 2110"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7833
+#: src/xml/xmli18n-tmp.h:7979
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7834
+#: src/xml/xmli18n-tmp.h:7980
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7835
+#: src/xml/xmli18n-tmp.h:7981
 #, fuzzy
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7836
+#: src/xml/xmli18n-tmp.h:7982
 #, fuzzy
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7837
+#: src/xml/xmli18n-tmp.h:7983
 #, fuzzy
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7838
+#: src/xml/xmli18n-tmp.h:7984
 #, fuzzy
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7839
+#: src/xml/xmli18n-tmp.h:7985
 #, fuzzy
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7840
+#: src/xml/xmli18n-tmp.h:7986
 #, fuzzy
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7841
+#: src/xml/xmli18n-tmp.h:7987
 #, fuzzy
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7842
+#: src/xml/xmli18n-tmp.h:7988
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:7843
+#: src/xml/xmli18n-tmp.h:7989
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7844
+#: src/xml/xmli18n-tmp.h:7990
 #, fuzzy
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7845
+#: src/xml/xmli18n-tmp.h:7991
 #, fuzzy
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7846
+#: src/xml/xmli18n-tmp.h:7992
 #, fuzzy
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7847
+#: src/xml/xmli18n-tmp.h:7993
 #, fuzzy
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:7848
+#: src/xml/xmli18n-tmp.h:7994
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:7849
+#: src/xml/xmli18n-tmp.h:7995
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7850
+#: src/xml/xmli18n-tmp.h:7996
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7851
+#: src/xml/xmli18n-tmp.h:7997
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7852
+#: src/xml/xmli18n-tmp.h:7998
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7853
+#: src/xml/xmli18n-tmp.h:7999
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7854
+#: src/xml/xmli18n-tmp.h:8000
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7855
+#: src/xml/xmli18n-tmp.h:8001
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7856
+#: src/xml/xmli18n-tmp.h:8002
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7857
+#: src/xml/xmli18n-tmp.h:8003
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7858
+#: src/xml/xmli18n-tmp.h:8004
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7859
+#: src/xml/xmli18n-tmp.h:8005
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7860
+#: src/xml/xmli18n-tmp.h:8006
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7861
+#: src/xml/xmli18n-tmp.h:8007
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7862
+#: src/xml/xmli18n-tmp.h:8008
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7863
+#: src/xml/xmli18n-tmp.h:8009
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7864
+#: src/xml/xmli18n-tmp.h:8010
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7865
+#: src/xml/xmli18n-tmp.h:8011
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7866
+#: src/xml/xmli18n-tmp.h:8012
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7867
+#: src/xml/xmli18n-tmp.h:8013
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7868
+#: src/xml/xmli18n-tmp.h:8014
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7869
+#: src/xml/xmli18n-tmp.h:8015
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7870
+#: src/xml/xmli18n-tmp.h:8016
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7871
+#: src/xml/xmli18n-tmp.h:8017
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7872
+#: src/xml/xmli18n-tmp.h:8018
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7873
+#: src/xml/xmli18n-tmp.h:8019
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7874
+#: src/xml/xmli18n-tmp.h:8020
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7875
+#: src/xml/xmli18n-tmp.h:8021
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7876
+#: src/xml/xmli18n-tmp.h:8022
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7877
+#: src/xml/xmli18n-tmp.h:8023
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7878
+#: src/xml/xmli18n-tmp.h:8024
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7879
+#: src/xml/xmli18n-tmp.h:8025
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7880
+#: src/xml/xmli18n-tmp.h:8026
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7881
+#: src/xml/xmli18n-tmp.h:8027
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7882
+#: src/xml/xmli18n-tmp.h:8028
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7883
+#: src/xml/xmli18n-tmp.h:8029
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7884
+#: src/xml/xmli18n-tmp.h:8030
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7885
+#: src/xml/xmli18n-tmp.h:8031
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7886
+#: src/xml/xmli18n-tmp.h:8032
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7887
+#: src/xml/xmli18n-tmp.h:8033
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7888
+#: src/xml/xmli18n-tmp.h:8034
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7889
+#: src/xml/xmli18n-tmp.h:8035
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7890
+#: src/xml/xmli18n-tmp.h:8036
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7891
+#: src/xml/xmli18n-tmp.h:8037
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7892
+#: src/xml/xmli18n-tmp.h:8038
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7893
+#: src/xml/xmli18n-tmp.h:8039
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7894
+#: src/xml/xmli18n-tmp.h:8040
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7895
+#: src/xml/xmli18n-tmp.h:8041
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7896
+#: src/xml/xmli18n-tmp.h:8042
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7897
+#: src/xml/xmli18n-tmp.h:8043
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7898
+#: src/xml/xmli18n-tmp.h:8044
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7899
+#: src/xml/xmli18n-tmp.h:8045
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7900
+#: src/xml/xmli18n-tmp.h:8046
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7901
+#: src/xml/xmli18n-tmp.h:8047
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7902
+#: src/xml/xmli18n-tmp.h:8048
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7903
+#: src/xml/xmli18n-tmp.h:8049
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7904
+#: src/xml/xmli18n-tmp.h:8050
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7905
+#: src/xml/xmli18n-tmp.h:8051
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7906
+#: src/xml/xmli18n-tmp.h:8052
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7907
+#: src/xml/xmli18n-tmp.h:8053
 msgid "Kyocera CS-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7908
+#: src/xml/xmli18n-tmp.h:8054
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7909
+#: src/xml/xmli18n-tmp.h:8055
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7910
+#: src/xml/xmli18n-tmp.h:8056
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7911
+#: src/xml/xmli18n-tmp.h:8057
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7912
+#: src/xml/xmli18n-tmp.h:8058
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7913
+#: src/xml/xmli18n-tmp.h:8059
 msgid "Kyocera FS-920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7914
+#: src/xml/xmli18n-tmp.h:8060
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7915
+#: src/xml/xmli18n-tmp.h:8061
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7916
+#: src/xml/xmli18n-tmp.h:8062
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7917
+#: src/xml/xmli18n-tmp.h:8063
 msgid "Kyocera FS-1018MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7918
+#: src/xml/xmli18n-tmp.h:8064
 msgid "Kyocera FS-1020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7919
+#: src/xml/xmli18n-tmp.h:8065
 msgid "Kyocera FS-1030D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7920
+#: src/xml/xmli18n-tmp.h:8066
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7921
+#: src/xml/xmli18n-tmp.h:8067
 msgid "Kyocera FS-1118MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7922
+#: src/xml/xmli18n-tmp.h:8068
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7923
+#: src/xml/xmli18n-tmp.h:8069
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7924
+#: src/xml/xmli18n-tmp.h:8070
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7925
+#: src/xml/xmli18n-tmp.h:8071
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7926
+#: src/xml/xmli18n-tmp.h:8072
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7927
+#: src/xml/xmli18n-tmp.h:8073
 msgid "Kyocera FS-1714M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7928
+#: src/xml/xmli18n-tmp.h:8074
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7929
+#: src/xml/xmli18n-tmp.h:8075
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7930
+#: src/xml/xmli18n-tmp.h:8076
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7931
+#: src/xml/xmli18n-tmp.h:8077
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7932
+#: src/xml/xmli18n-tmp.h:8078
 msgid "Kyocera FS-1920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7933
+#: src/xml/xmli18n-tmp.h:8079
 msgid "Kyocera FS-2000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7934
+#: src/xml/xmli18n-tmp.h:8080
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7935
+#: src/xml/xmli18n-tmp.h:8081
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7936
+#: src/xml/xmli18n-tmp.h:8082
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7937
+#: src/xml/xmli18n-tmp.h:8083
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7938
+#: src/xml/xmli18n-tmp.h:8084
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7939
+#: src/xml/xmli18n-tmp.h:8085
 msgid "Kyocera FS-3718M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7940
+#: src/xml/xmli18n-tmp.h:8086
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7941
+#: src/xml/xmli18n-tmp.h:8087
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7942
+#: src/xml/xmli18n-tmp.h:8088
 msgid "Kyocera FS-3820N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7943
+#: src/xml/xmli18n-tmp.h:8089
 msgid "Kyocera FS-3830N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7944
+#: src/xml/xmli18n-tmp.h:8090
 msgid "Kyocera FS-3900DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7945
+#: src/xml/xmli18n-tmp.h:8091
 msgid "Kyocera FS-4000DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7946
+#: src/xml/xmli18n-tmp.h:8092
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7947
+#: src/xml/xmli18n-tmp.h:8093
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7948
+#: src/xml/xmli18n-tmp.h:8094
 msgid "Kyocera FS-6020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7949
+#: src/xml/xmli18n-tmp.h:8095
 msgid "Kyocera FS-6026"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7950
+#: src/xml/xmli18n-tmp.h:8096
 msgid "Kyocera FS-6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7951
+#: src/xml/xmli18n-tmp.h:8097
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7952
+#: src/xml/xmli18n-tmp.h:8098
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7953
+#: src/xml/xmli18n-tmp.h:8099
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7954
+#: src/xml/xmli18n-tmp.h:8100
 msgid "Kyocera FS-6750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7955
+#: src/xml/xmli18n-tmp.h:8101
 msgid "Kyocera FS-6900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7956
+#: src/xml/xmli18n-tmp.h:8102
 msgid "Kyocera FS-6950DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7957
+#: src/xml/xmli18n-tmp.h:8103
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7958
+#: src/xml/xmli18n-tmp.h:8104
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7959
+#: src/xml/xmli18n-tmp.h:8105
 msgid "Kyocera FS-7028M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7960
+#: src/xml/xmli18n-tmp.h:8106
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7961
+#: src/xml/xmli18n-tmp.h:8107
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7962
+#: src/xml/xmli18n-tmp.h:8108
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7963
+#: src/xml/xmli18n-tmp.h:8109
 msgid "Kyocera FS-9130DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7964
+#: src/xml/xmli18n-tmp.h:8110
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7965
+#: src/xml/xmli18n-tmp.h:8111
 msgid "Kyocera FS-9530DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7966
+#: src/xml/xmli18n-tmp.h:8112
 msgid "Kyocera KM-1510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7967
+#: src/xml/xmli18n-tmp.h:8113
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7968
+#: src/xml/xmli18n-tmp.h:8114
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7969
+#: src/xml/xmli18n-tmp.h:8115
 msgid "Kyocera KM-1815"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7970
+#: src/xml/xmli18n-tmp.h:8116
 msgid "Kyocera KM-1820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7971
+#: src/xml/xmli18n-tmp.h:8117
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7972
+#: src/xml/xmli18n-tmp.h:8118
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7973
+#: src/xml/xmli18n-tmp.h:8119
 msgid "Kyocera KM-3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7974
+#: src/xml/xmli18n-tmp.h:8120
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7975
+#: src/xml/xmli18n-tmp.h:8121
 msgid "Kyocera KM-4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7976
+#: src/xml/xmli18n-tmp.h:8122
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7977
+#: src/xml/xmli18n-tmp.h:8123
 msgid "Kyocera KM-4230/5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7978
+#: src/xml/xmli18n-tmp.h:8124
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7979
+#: src/xml/xmli18n-tmp.h:8125
 msgid "Kyocera KM-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7980
+#: src/xml/xmli18n-tmp.h:8126
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7981
+#: src/xml/xmli18n-tmp.h:8127
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7982
+#: src/xml/xmli18n-tmp.h:8128
 msgid "Kyocera KM-6030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7983
+#: src/xml/xmli18n-tmp.h:8129
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7984
+#: src/xml/xmli18n-tmp.h:8130
 msgid "Kyocera KM-8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7985
+#: src/xml/xmli18n-tmp.h:8131
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7986
+#: src/xml/xmli18n-tmp.h:8132
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7987
+#: src/xml/xmli18n-tmp.h:8133
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7988
+#: src/xml/xmli18n-tmp.h:8134
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7989
+#: src/xml/xmli18n-tmp.h:8135
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7990
+#: src/xml/xmli18n-tmp.h:8136
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7991
+#: src/xml/xmli18n-tmp.h:8137
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7992
+#: src/xml/xmli18n-tmp.h:8138
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7993
+#: src/xml/xmli18n-tmp.h:8139
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7994
+#: src/xml/xmli18n-tmp.h:8140
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7995
+#: src/xml/xmli18n-tmp.h:8141
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7996
+#: src/xml/xmli18n-tmp.h:8142
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7997
+#: src/xml/xmli18n-tmp.h:8143
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7998
+#: src/xml/xmli18n-tmp.h:8144
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:7999
+#: src/xml/xmli18n-tmp.h:8145
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8000
+#: src/xml/xmli18n-tmp.h:8146
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8001
+#: src/xml/xmli18n-tmp.h:8147
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8002
+#: src/xml/xmli18n-tmp.h:8148
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8003
+#: src/xml/xmli18n-tmp.h:8149
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8004
+#: src/xml/xmli18n-tmp.h:8150
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8005
+#: src/xml/xmli18n-tmp.h:8151
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8006
+#: src/xml/xmli18n-tmp.h:8152
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8007
+#: src/xml/xmli18n-tmp.h:8153
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8008
+#: src/xml/xmli18n-tmp.h:8154
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8009
+#: src/xml/xmli18n-tmp.h:8155
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8010
+#: src/xml/xmli18n-tmp.h:8156
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8011
+#: src/xml/xmli18n-tmp.h:8157
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8012
+#: src/xml/xmli18n-tmp.h:8158
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8013
+#: src/xml/xmli18n-tmp.h:8159
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8014
+#: src/xml/xmli18n-tmp.h:8160
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8015
+#: src/xml/xmli18n-tmp.h:8161
 #, fuzzy
 msgid "Lanier MP2500/LD125"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8016
+#: src/xml/xmli18n-tmp.h:8162
 #, fuzzy
 msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8017
+#: src/xml/xmli18n-tmp.h:8163
 #, fuzzy
 msgid "Lanier MP 1350/LD1135"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8018
+#: src/xml/xmli18n-tmp.h:8164
 #, fuzzy
 msgid "Lanier MP 1600/LD316"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8019
+#: src/xml/xmli18n-tmp.h:8165
 #, fuzzy
 msgid "Lanier MP 161/LD016"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8020
+#: src/xml/xmli18n-tmp.h:8166
 #, fuzzy
 msgid "Lanier MP 2000/LD320d"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8021
+#: src/xml/xmli18n-tmp.h:8167
 #, fuzzy
 msgid "Lanier MP 2510/LD325"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8022
+#: src/xml/xmli18n-tmp.h:8168
 #, fuzzy
 msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8023
+#: src/xml/xmli18n-tmp.h:8169
 #, fuzzy
 msgid "Lanier MP 2550/LD425"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8024
+#: src/xml/xmli18n-tmp.h:8170
 #, fuzzy
 msgid "Lanier MP 3010/LD330"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8025
+#: src/xml/xmli18n-tmp.h:8171
 #, fuzzy
 msgid "Lanier MP 3350B/LD433B"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8026
+#: src/xml/xmli18n-tmp.h:8172
 #, fuzzy
 msgid "Lanier MP 3350/LD433"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8027
+#: src/xml/xmli18n-tmp.h:8173
 #, fuzzy
 msgid "Lanier MP 3500/LD335"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:8028
+#: src/xml/xmli18n-tmp.h:8174
 #, fuzzy
 msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8029
+#: src/xml/xmli18n-tmp.h:8175
 #, fuzzy
 msgid "Lanier MP 4000/LD040"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8030
+#: src/xml/xmli18n-tmp.h:8176
 #, fuzzy
 msgid "Lanier MP 4500/LD345"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8031
+#: src/xml/xmli18n-tmp.h:8177
 #, fuzzy
 msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8032
+#: src/xml/xmli18n-tmp.h:8178
 #, fuzzy
 msgid "Lanier MP 5000/LD050"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8033
+#: src/xml/xmli18n-tmp.h:8179
 #, fuzzy
 msgid "Lanier MP 5500/LD255"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8034
+#: src/xml/xmli18n-tmp.h:8180
 #, fuzzy
 msgid "Lanier MP 6500/LD265"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8035
+#: src/xml/xmli18n-tmp.h:8181
 #, fuzzy
 msgid "Lanier MP 7500/LD275"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:8036
+#: src/xml/xmli18n-tmp.h:8182
 #, fuzzy
 msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:8037
+#: src/xml/xmli18n-tmp.h:8183
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:8038
+#: src/xml/xmli18n-tmp.h:8184
 #, fuzzy
 msgid "Lexmark Optra E"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8039
+#: src/xml/xmli18n-tmp.h:8185
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8040
+#: src/xml/xmli18n-tmp.h:8186
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8041
+#: src/xml/xmli18n-tmp.h:8187
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8042
+#: src/xml/xmli18n-tmp.h:8188
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8043
+#: src/xml/xmli18n-tmp.h:8189
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8044
+#: src/xml/xmli18n-tmp.h:8190
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8045
+#: src/xml/xmli18n-tmp.h:8191
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8046
+#: src/xml/xmli18n-tmp.h:8192
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8047
+#: src/xml/xmli18n-tmp.h:8193
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8048
+#: src/xml/xmli18n-tmp.h:8194
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8049
+#: src/xml/xmli18n-tmp.h:8195
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8050
+#: src/xml/xmli18n-tmp.h:8196
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8051
+#: src/xml/xmli18n-tmp.h:8197
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8052
+#: src/xml/xmli18n-tmp.h:8198
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8053
+#: src/xml/xmli18n-tmp.h:8199
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8054
+#: src/xml/xmli18n-tmp.h:8200
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8055
+#: src/xml/xmli18n-tmp.h:8201
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8056
+#: src/xml/xmli18n-tmp.h:8202
 msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8057
+#: src/xml/xmli18n-tmp.h:8203
 msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8058
+#: src/xml/xmli18n-tmp.h:8204
 msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8059
+#: src/xml/xmli18n-tmp.h:8205
 msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8060
+#: src/xml/xmli18n-tmp.h:8206
 msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8061
+#: src/xml/xmli18n-tmp.h:8207
 msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8062
+#: src/xml/xmli18n-tmp.h:8208
 msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8063
+#: src/xml/xmli18n-tmp.h:8209
 msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8064
+#: src/xml/xmli18n-tmp.h:8210
 msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8065
+#: src/xml/xmli18n-tmp.h:8211
 msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8066
+#: src/xml/xmli18n-tmp.h:8212
 msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8067
+#: src/xml/xmli18n-tmp.h:8213
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8068
+#: src/xml/xmli18n-tmp.h:8214
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8069
+#: src/xml/xmli18n-tmp.h:8215
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8070
+#: src/xml/xmli18n-tmp.h:8216
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8071
+#: src/xml/xmli18n-tmp.h:8217
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8072
+#: src/xml/xmli18n-tmp.h:8218
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8073
+#: src/xml/xmli18n-tmp.h:8219
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8074
+#: src/xml/xmli18n-tmp.h:8220
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8075
+#: src/xml/xmli18n-tmp.h:8221
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8076
+#: src/xml/xmli18n-tmp.h:8222
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8077
+#: src/xml/xmli18n-tmp.h:8223
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8078
+#: src/xml/xmli18n-tmp.h:8224
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8079
+#: src/xml/xmli18n-tmp.h:8225
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8080
+#: src/xml/xmli18n-tmp.h:8226
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8081
+#: src/xml/xmli18n-tmp.h:8227
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8082
+#: src/xml/xmli18n-tmp.h:8228
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8083
+#: src/xml/xmli18n-tmp.h:8229
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8084
+#: src/xml/xmli18n-tmp.h:8230
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8085
+#: src/xml/xmli18n-tmp.h:8231
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8086
+#: src/xml/xmli18n-tmp.h:8232
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8087
+#: src/xml/xmli18n-tmp.h:8233
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8088
+#: src/xml/xmli18n-tmp.h:8234
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8089
+#: src/xml/xmli18n-tmp.h:8235
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8090
+#: src/xml/xmli18n-tmp.h:8236
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8091
+#: src/xml/xmli18n-tmp.h:8237
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8092
+#: src/xml/xmli18n-tmp.h:8238
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8093
+#: src/xml/xmli18n-tmp.h:8239
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8094
+#: src/xml/xmli18n-tmp.h:8240
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8095
+#: src/xml/xmli18n-tmp.h:8241
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8096
+#: src/xml/xmli18n-tmp.h:8242
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8097
+#: src/xml/xmli18n-tmp.h:8243
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8098
+#: src/xml/xmli18n-tmp.h:8244
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8099
+#: src/xml/xmli18n-tmp.h:8245
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8100
+#: src/xml/xmli18n-tmp.h:8246
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8101
+#: src/xml/xmli18n-tmp.h:8247
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8102
+#: src/xml/xmli18n-tmp.h:8248
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8103
+#: src/xml/xmli18n-tmp.h:8249
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8104
+#: src/xml/xmli18n-tmp.h:8250
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8105
+#: src/xml/xmli18n-tmp.h:8251
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8106
+#: src/xml/xmli18n-tmp.h:8252
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8107
+#: src/xml/xmli18n-tmp.h:8253
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8108
+#: src/xml/xmli18n-tmp.h:8254
 msgid "Oki B4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8109
+#: src/xml/xmli18n-tmp.h:8255
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8110
+#: src/xml/xmli18n-tmp.h:8256
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8111
+#: src/xml/xmli18n-tmp.h:8257
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8112
+#: src/xml/xmli18n-tmp.h:8258
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8113
+#: src/xml/xmli18n-tmp.h:8259
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8114
+#: src/xml/xmli18n-tmp.h:8260
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8115
+#: src/xml/xmli18n-tmp.h:8261
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8116
+#: src/xml/xmli18n-tmp.h:8262
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8117
+#: src/xml/xmli18n-tmp.h:8263
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8118
+#: src/xml/xmli18n-tmp.h:8264
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8119
+#: src/xml/xmli18n-tmp.h:8265
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8120
+#: src/xml/xmli18n-tmp.h:8266
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8121
+#: src/xml/xmli18n-tmp.h:8267
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8122
+#: src/xml/xmli18n-tmp.h:8268
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8123
+#: src/xml/xmli18n-tmp.h:8269
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:8124
+#: src/xml/xmli18n-tmp.h:8270
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8125
+#: src/xml/xmli18n-tmp.h:8271
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8126
+#: src/xml/xmli18n-tmp.h:8272
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8127
+#: src/xml/xmli18n-tmp.h:8273
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8128
+#: src/xml/xmli18n-tmp.h:8274
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8129
+#: src/xml/xmli18n-tmp.h:8275
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8130
+#: src/xml/xmli18n-tmp.h:8276
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8131
+#: src/xml/xmli18n-tmp.h:8277
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8132
+#: src/xml/xmli18n-tmp.h:8278
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8133
+#: src/xml/xmli18n-tmp.h:8279
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8134
+#: src/xml/xmli18n-tmp.h:8280
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8135
+#: src/xml/xmli18n-tmp.h:8281
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8136
+#: src/xml/xmli18n-tmp.h:8282
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8137
+#: src/xml/xmli18n-tmp.h:8283
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8138
+#: src/xml/xmli18n-tmp.h:8284
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8139
+#: src/xml/xmli18n-tmp.h:8285
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8140
+#: src/xml/xmli18n-tmp.h:8286
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8141
+#: src/xml/xmli18n-tmp.h:8287
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8142
+#: src/xml/xmli18n-tmp.h:8288
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8143
+#: src/xml/xmli18n-tmp.h:8289
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8144
+#: src/xml/xmli18n-tmp.h:8290
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8145
+#: src/xml/xmli18n-tmp.h:8291
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8146
+#: src/xml/xmli18n-tmp.h:8292
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8147
+#: src/xml/xmli18n-tmp.h:8293
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8148
+#: src/xml/xmli18n-tmp.h:8294
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8149
+#: src/xml/xmli18n-tmp.h:8295
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8150
+#: src/xml/xmli18n-tmp.h:8296
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8151
+#: src/xml/xmli18n-tmp.h:8297
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8152
+#: src/xml/xmli18n-tmp.h:8298
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8153
+#: src/xml/xmli18n-tmp.h:8299
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8154
+#: src/xml/xmli18n-tmp.h:8300
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8155
+#: src/xml/xmli18n-tmp.h:8301
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8156
+#: src/xml/xmli18n-tmp.h:8302
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8157
+#: src/xml/xmli18n-tmp.h:8303
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8158
+#: src/xml/xmli18n-tmp.h:8304
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8159
+#: src/xml/xmli18n-tmp.h:8305
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8160
+#: src/xml/xmli18n-tmp.h:8306
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8161
+#: src/xml/xmli18n-tmp.h:8307
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8162
+#: src/xml/xmli18n-tmp.h:8308
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8163
+#: src/xml/xmli18n-tmp.h:8309
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8164
+#: src/xml/xmli18n-tmp.h:8310
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8165
+#: src/xml/xmli18n-tmp.h:8311
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8166
+#: src/xml/xmli18n-tmp.h:8312
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8167
+#: src/xml/xmli18n-tmp.h:8313
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8168
+#: src/xml/xmli18n-tmp.h:8314
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8169
+#: src/xml/xmli18n-tmp.h:8315
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8170
+#: src/xml/xmli18n-tmp.h:8316
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8171
+#: src/xml/xmli18n-tmp.h:8317
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8172
+#: src/xml/xmli18n-tmp.h:8318
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8173
+#: src/xml/xmli18n-tmp.h:8319
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8174
+#: src/xml/xmli18n-tmp.h:8320
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8175
+#: src/xml/xmli18n-tmp.h:8321
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8176
+#: src/xml/xmli18n-tmp.h:8322
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8177
+#: src/xml/xmli18n-tmp.h:8323
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8178
+#: src/xml/xmli18n-tmp.h:8324
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8179
+#: src/xml/xmli18n-tmp.h:8325
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8180
+#: src/xml/xmli18n-tmp.h:8326
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8181
+#: src/xml/xmli18n-tmp.h:8327
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8182
+#: src/xml/xmli18n-tmp.h:8328
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8183
+#: src/xml/xmli18n-tmp.h:8329
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8184
+#: src/xml/xmli18n-tmp.h:8330
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8185
+#: src/xml/xmli18n-tmp.h:8331
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8186
+#: src/xml/xmli18n-tmp.h:8332
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8187
+#: src/xml/xmli18n-tmp.h:8333
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8188
+#: src/xml/xmli18n-tmp.h:8334
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8189
+#: src/xml/xmli18n-tmp.h:8335
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8190
+#: src/xml/xmli18n-tmp.h:8336
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8191
+#: src/xml/xmli18n-tmp.h:8337
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8192
+#: src/xml/xmli18n-tmp.h:8338
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8193
+#: src/xml/xmli18n-tmp.h:8339
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8194
+#: src/xml/xmli18n-tmp.h:8340
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8195
+#: src/xml/xmli18n-tmp.h:8341
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8196
+#: src/xml/xmli18n-tmp.h:8342
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8197
+#: src/xml/xmli18n-tmp.h:8343
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8198
+#: src/xml/xmli18n-tmp.h:8344
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8199
+#: src/xml/xmli18n-tmp.h:8345
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8200
+#: src/xml/xmli18n-tmp.h:8346
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8201
+#: src/xml/xmli18n-tmp.h:8347
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8202
+#: src/xml/xmli18n-tmp.h:8348
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8203
+#: src/xml/xmli18n-tmp.h:8349
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8204
+#: src/xml/xmli18n-tmp.h:8350
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8205
+#: src/xml/xmli18n-tmp.h:8351
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8206
+#: src/xml/xmli18n-tmp.h:8352
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8207
+#: src/xml/xmli18n-tmp.h:8353
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8208
+#: src/xml/xmli18n-tmp.h:8354
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8209
+#: src/xml/xmli18n-tmp.h:8355
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8210
+#: src/xml/xmli18n-tmp.h:8356
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8211
+#: src/xml/xmli18n-tmp.h:8357
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8212
+#: src/xml/xmli18n-tmp.h:8358
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8213
+#: src/xml/xmli18n-tmp.h:8359
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8214
+#: src/xml/xmli18n-tmp.h:8360
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8215
+#: src/xml/xmli18n-tmp.h:8361
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8216
+#: src/xml/xmli18n-tmp.h:8362
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8217
+#: src/xml/xmli18n-tmp.h:8363
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8218
+#: src/xml/xmli18n-tmp.h:8364
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8219
+#: src/xml/xmli18n-tmp.h:8365
 #, fuzzy
 msgid "Savin 2535/2235"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8220
+#: src/xml/xmli18n-tmp.h:8366
 #, fuzzy
 msgid "Savin 2545/2245"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8221
+#: src/xml/xmli18n-tmp.h:8367
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8222
+#: src/xml/xmli18n-tmp.h:8368
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8223
+#: src/xml/xmli18n-tmp.h:8369
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8224
+#: src/xml/xmli18n-tmp.h:8370
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8225
+#: src/xml/xmli18n-tmp.h:8371
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8226
+#: src/xml/xmli18n-tmp.h:8372
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8227
+#: src/xml/xmli18n-tmp.h:8373
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8228
+#: src/xml/xmli18n-tmp.h:8374
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8229
+#: src/xml/xmli18n-tmp.h:8375
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8230
+#: src/xml/xmli18n-tmp.h:8376
 #, fuzzy
 msgid "Savin 4035/4135g"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8231
+#: src/xml/xmli18n-tmp.h:8377
 msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8232
+#: src/xml/xmli18n-tmp.h:8378
 #, fuzzy
 msgid "Savin 4045/4145g"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8233
+#: src/xml/xmli18n-tmp.h:8379
 msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8234
+#: src/xml/xmli18n-tmp.h:8380
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8235
+#: src/xml/xmli18n-tmp.h:8381
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8236
+#: src/xml/xmli18n-tmp.h:8382
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8237
+#: src/xml/xmli18n-tmp.h:8383
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8238
+#: src/xml/xmli18n-tmp.h:8384
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8239
+#: src/xml/xmli18n-tmp.h:8385
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8240
+#: src/xml/xmli18n-tmp.h:8386
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8241
+#: src/xml/xmli18n-tmp.h:8387
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8242
+#: src/xml/xmli18n-tmp.h:8388
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8243
+#: src/xml/xmli18n-tmp.h:8389
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8244
+#: src/xml/xmli18n-tmp.h:8390
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8245
+#: src/xml/xmli18n-tmp.h:8391
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8246
+#: src/xml/xmli18n-tmp.h:8392
 #, fuzzy
 msgid "Savin 8035/8035g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8247
+#: src/xml/xmli18n-tmp.h:8393
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8248
+#: src/xml/xmli18n-tmp.h:8394
 #, fuzzy
 msgid "Savin 8045/8045g"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8249
+#: src/xml/xmli18n-tmp.h:8395
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8250
+#: src/xml/xmli18n-tmp.h:8396
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8251
+#: src/xml/xmli18n-tmp.h:8397
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:8252
+#: src/xml/xmli18n-tmp.h:8398
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8253
+#: src/xml/xmli18n-tmp.h:8399
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:8254
+#: src/xml/xmli18n-tmp.h:8400
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8255
+#: src/xml/xmli18n-tmp.h:8401
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8256
+#: src/xml/xmli18n-tmp.h:8402
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8257
+#: src/xml/xmli18n-tmp.h:8403
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8258
+#: src/xml/xmli18n-tmp.h:8404
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8259
+#: src/xml/xmli18n-tmp.h:8405
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8260
+#: src/xml/xmli18n-tmp.h:8406
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8261
+#: src/xml/xmli18n-tmp.h:8407
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8262
+#: src/xml/xmli18n-tmp.h:8408
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8263
+#: src/xml/xmli18n-tmp.h:8409
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8264
+#: src/xml/xmli18n-tmp.h:8410
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8265
+#: src/xml/xmli18n-tmp.h:8411
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8266
+#: src/xml/xmli18n-tmp.h:8412
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8267
+#: src/xml/xmli18n-tmp.h:8413
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8268
+#: src/xml/xmli18n-tmp.h:8414
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8269
+#: src/xml/xmli18n-tmp.h:8415
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8270
+#: src/xml/xmli18n-tmp.h:8416
 #, fuzzy
 msgid "Sony IJP-V100"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8271
+#: src/xml/xmli18n-tmp.h:8417
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8272
+#: src/xml/xmli18n-tmp.h:8418
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "設定�表機"
 
-#: src/xml/xmli18n-tmp.h:8273
+#: src/xml/xmli18n-tmp.h:8419
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8274
+#: src/xml/xmli18n-tmp.h:8420
 msgid "Tektronix Phaser 750DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8275
+#: src/xml/xmli18n-tmp.h:8421
 msgid "Tektronix Phaser 750DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8276
+#: src/xml/xmli18n-tmp.h:8422
 msgid "Tektronix Phaser 750N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8277
+#: src/xml/xmli18n-tmp.h:8423
 msgid "Tektronix Phaser 750P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8278
+#: src/xml/xmli18n-tmp.h:8424
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8279
+#: src/xml/xmli18n-tmp.h:8425
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8280
+#: src/xml/xmli18n-tmp.h:8426
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8281
+#: src/xml/xmli18n-tmp.h:8427
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8282
+#: src/xml/xmli18n-tmp.h:8428
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8283
+#: src/xml/xmli18n-tmp.h:8429
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8284
+#: src/xml/xmli18n-tmp.h:8430
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8285
+#: src/xml/xmli18n-tmp.h:8431
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8286
+#: src/xml/xmli18n-tmp.h:8432
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8287
+#: src/xml/xmli18n-tmp.h:8433
 msgid "Xerox Phaser 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8288
+#: src/xml/xmli18n-tmp.h:8434
 msgid "Xerox Phaser 4400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8289
+#: src/xml/xmli18n-tmp.h:8435
 msgid "Xerox Phaser 4400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8290
+#: src/xml/xmli18n-tmp.h:8436
 msgid "Xerox Phaser 4400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8291
+#: src/xml/xmli18n-tmp.h:8437
 msgid "Xerox Phaser 4400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8292
+#: src/xml/xmli18n-tmp.h:8438
 msgid "Xerox Phaser 4500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8293
+#: src/xml/xmli18n-tmp.h:8439
 msgid "Xerox Phaser 4500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8294
+#: src/xml/xmli18n-tmp.h:8440
 msgid "Xerox Phaser 4500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8295
+#: src/xml/xmli18n-tmp.h:8441
 msgid "Xerox Phaser 4500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8296
+#: src/xml/xmli18n-tmp.h:8442
 msgid "Xerox Phaser 4510B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8297
+#: src/xml/xmli18n-tmp.h:8443
 msgid "Xerox Phaser 4510DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8298
+#: src/xml/xmli18n-tmp.h:8444
 msgid "Xerox Phaser 4510DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8299
+#: src/xml/xmli18n-tmp.h:8445
 msgid "Xerox Phaser 4510N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8300
+#: src/xml/xmli18n-tmp.h:8446
 msgid "Xerox Phaser 5500B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8301
+#: src/xml/xmli18n-tmp.h:8447
 msgid "Xerox Phaser 5500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8302
+#: src/xml/xmli18n-tmp.h:8448
 msgid "Xerox Phaser 5500DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8303
+#: src/xml/xmli18n-tmp.h:8449
 msgid "Xerox Phaser 5500DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8304
+#: src/xml/xmli18n-tmp.h:8450
 msgid "Xerox Phaser 5500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8305
+#: src/xml/xmli18n-tmp.h:8451
 msgid "Xerox Phaser 6130N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8306
+#: src/xml/xmli18n-tmp.h:8452
 msgid "Xerox Phaser 6180DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8307
+#: src/xml/xmli18n-tmp.h:8453
 msgid "Xerox Phaser 6180MFP-D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8308
+#: src/xml/xmli18n-tmp.h:8454
 msgid "Xerox Phaser 6200B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8309
+#: src/xml/xmli18n-tmp.h:8455
 msgid "Xerox Phaser 6200DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8310
+#: src/xml/xmli18n-tmp.h:8456
 msgid "Xerox Phaser 6200DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8311
+#: src/xml/xmli18n-tmp.h:8457
 msgid "Xerox Phaser 6200N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8312
+#: src/xml/xmli18n-tmp.h:8458
 msgid "Xerox Phaser 6250B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8313
+#: src/xml/xmli18n-tmp.h:8459
 msgid "Xerox Phaser 6250DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8314
+#: src/xml/xmli18n-tmp.h:8460
 msgid "Xerox Phaser 6250DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8315
+#: src/xml/xmli18n-tmp.h:8461
 msgid "Xerox Phaser 6250DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8316
+#: src/xml/xmli18n-tmp.h:8462
 msgid "Xerox Phaser 6250N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8317
+#: src/xml/xmli18n-tmp.h:8463
 msgid "Xerox Phaser 6300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8318
+#: src/xml/xmli18n-tmp.h:8464
 msgid "Xerox Phaser 6300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8319
+#: src/xml/xmli18n-tmp.h:8465
 msgid "Xerox Phaser 6350DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8320
+#: src/xml/xmli18n-tmp.h:8466
 msgid "Xerox Phaser 6350DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8321
+#: src/xml/xmli18n-tmp.h:8467
 msgid "Xerox Phaser 6350DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8322
+#: src/xml/xmli18n-tmp.h:8468
 msgid "Xerox Phaser 6360DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8323
+#: src/xml/xmli18n-tmp.h:8469
 msgid "Xerox Phaser 6360DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8324
+#: src/xml/xmli18n-tmp.h:8470
 msgid "Xerox Phaser 7300B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8325
+#: src/xml/xmli18n-tmp.h:8471
 msgid "Xerox Phaser 7300DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8326
+#: src/xml/xmli18n-tmp.h:8472
 msgid "Xerox Phaser 7300DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8327
+#: src/xml/xmli18n-tmp.h:8473
 msgid "Xerox Phaser 7300DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8328
+#: src/xml/xmli18n-tmp.h:8474
 msgid "Xerox Phaser 7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8329
+#: src/xml/xmli18n-tmp.h:8475
 msgid "Xerox Phaser 7400DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8330
+#: src/xml/xmli18n-tmp.h:8476
 msgid "Xerox Phaser 7400DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8331
+#: src/xml/xmli18n-tmp.h:8477
 msgid "Xerox Phaser 7400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8332
+#: src/xml/xmli18n-tmp.h:8478
 msgid "Xerox Phaser 7400DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8333
+#: src/xml/xmli18n-tmp.h:8479
 msgid "Xerox Phaser 7400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8334
+#: src/xml/xmli18n-tmp.h:8480
 msgid "Xerox Phaser 7700DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8335
+#: src/xml/xmli18n-tmp.h:8481
 msgid "Xerox Phaser 7700DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8336
+#: src/xml/xmli18n-tmp.h:8482
 msgid "Xerox Phaser 7700GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8337
+#: src/xml/xmli18n-tmp.h:8483
 msgid "Xerox Phaser 7750B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8338
+#: src/xml/xmli18n-tmp.h:8484
 msgid "Xerox Phaser 7750DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8339
+#: src/xml/xmli18n-tmp.h:8485
 msgid "Xerox Phaser 7750DXF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8340
+#: src/xml/xmli18n-tmp.h:8486
 msgid "Xerox Phaser 7750GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8341
+#: src/xml/xmli18n-tmp.h:8487
 msgid "Xerox Phaser 7760DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8342
+#: src/xml/xmli18n-tmp.h:8488
 msgid "Xerox Phaser 7760DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8343
+#: src/xml/xmli18n-tmp.h:8489
 msgid "Xerox Phaser 7760GX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8344
+#: src/xml/xmli18n-tmp.h:8490
 msgid "Xerox Phaser 8400B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8345
+#: src/xml/xmli18n-tmp.h:8491
 msgid "Xerox Phaser 8400BD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8346
+#: src/xml/xmli18n-tmp.h:8492
 msgid "Xerox Phaser 8400DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8347
+#: src/xml/xmli18n-tmp.h:8493
 msgid "Xerox Phaser 8400DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8348
+#: src/xml/xmli18n-tmp.h:8494
 msgid "Xerox Phaser 8400N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8349
+#: src/xml/xmli18n-tmp.h:8495
 msgid "Xerox Phaser 8500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8350
+#: src/xml/xmli18n-tmp.h:8496
 msgid "Xerox Phaser 8500N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8351
+#: src/xml/xmli18n-tmp.h:8497
 msgid "Xerox Phaser 8550DP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8352
+#: src/xml/xmli18n-tmp.h:8498
 msgid "Xerox Phaser 8550DT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8353
+#: src/xml/xmli18n-tmp.h:8499
 msgid "Xerox Phaser 8550DX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8354
+#: src/xml/xmli18n-tmp.h:8500
 msgid "Xerox Phaser 8560DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8355
+#: src/xml/xmli18n-tmp.h:8501
 msgid "Xerox WorkCentre 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8356
+#: src/xml/xmli18n-tmp.h:8502
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8357
+#: src/xml/xmli18n-tmp.h:8503
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8358
+#: src/xml/xmli18n-tmp.h:8504
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8359
+#: src/xml/xmli18n-tmp.h:8505
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:8360
+#: src/xml/xmli18n-tmp.h:8506
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:8361
+#: src/xml/xmli18n-tmp.h:8507
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:8362
+#: src/xml/xmli18n-tmp.h:8508
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:8363
+#: src/xml/xmli18n-tmp.h:8509
 #, fuzzy
 msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:8364
+#: src/xml/xmli18n-tmp.h:8510
 #, fuzzy
 msgid "Olympus P-11"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:8365
+#: src/xml/xmli18n-tmp.h:8511
 #, fuzzy
 msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/xml/xmli18n-tmp.h:8366
+#: src/xml/xmli18n-tmp.h:8512
 #, fuzzy
 msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:8367
+#: src/xml/xmli18n-tmp.h:8513
 #, fuzzy
 msgid "Olympus P-300E"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:8368
+#: src/xml/xmli18n-tmp.h:8514
 #, fuzzy
 msgid "Olympus P-300U"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:8369
+#: src/xml/xmli18n-tmp.h:8515
 #, fuzzy
 msgid "Olympus P-330E"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:8370
+#: src/xml/xmli18n-tmp.h:8516
 #, fuzzy
 msgid "Olympus P-330NE"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:8371
+#: src/xml/xmli18n-tmp.h:8517
 #, fuzzy
 msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/xml/xmli18n-tmp.h:8372
+#: src/xml/xmli18n-tmp.h:8518
 #, fuzzy
 msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/xml/xmli18n-tmp.h:8373
+#: src/xml/xmli18n-tmp.h:8519
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:8374
+#: src/xml/xmli18n-tmp.h:8520
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8375
+#: src/xml/xmli18n-tmp.h:8521
 #, fuzzy
 msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8376
+#: src/xml/xmli18n-tmp.h:8522
 #, fuzzy
 msgid "Canon CP-200"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8377
+#: src/xml/xmli18n-tmp.h:8523
 #, fuzzy
 msgid "Canon CP-220"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:8378
+#: src/xml/xmli18n-tmp.h:8524
 #, fuzzy
 msgid "Canon CP-300"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8379
+#: src/xml/xmli18n-tmp.h:8525
 #, fuzzy
 msgid "Canon CP-330"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8380
+#: src/xml/xmli18n-tmp.h:8526
 #, fuzzy
-msgid "Canon SELPHY-CP-400"
+msgid "Canon SELPHY-CP400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8381
+#: src/xml/xmli18n-tmp.h:8527
 #, fuzzy
-msgid "Canon SELPHY-CP-500"
+msgid "Canon SELPHY-CP500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:8382
+#: src/xml/xmli18n-tmp.h:8528
 #, fuzzy
-msgid "Canon SELPHY-CP-510"
+msgid "Canon SELPHY-CP510"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8383
+#: src/xml/xmli18n-tmp.h:8529
 #, fuzzy
-msgid "Canon SELPHY-CP-520"
+msgid "Canon SELPHY-CP520"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:8384
+#: src/xml/xmli18n-tmp.h:8530
 #, fuzzy
-msgid "Canon SELPHY-CP-530"
+msgid "Canon SELPHY-CP530"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:8385
+#: src/xml/xmli18n-tmp.h:8531
 #, fuzzy
-msgid "Canon SELPHY-CP-600"
+msgid "Canon SELPHY-CP710"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8386
+#: src/xml/xmli18n-tmp.h:8532
 #, fuzzy
-msgid "Canon SELPHY-CP-710"
+msgid "Canon SELPHY-CP730"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8387
-#, fuzzy
-msgid "Canon SELPHY-CP-720"
-msgstr "Canon CP220"
-
-#: src/xml/xmli18n-tmp.h:8388
-#, fuzzy
-msgid "Canon SELPHY-CP-730"
-msgstr "Canon CP100"
-
-#: src/xml/xmli18n-tmp.h:8389
+#: src/xml/xmli18n-tmp.h:8533
 #, fuzzy
-msgid "Canon SELPHY-CP-740"
+msgid "Canon SELPHY-CP740"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:8390
+#: src/xml/xmli18n-tmp.h:8534
 #, fuzzy
-msgid "Canon SELPHY-CP-750"
+msgid "Canon SELPHY-CP750"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:8391
+#: src/xml/xmli18n-tmp.h:8535
 #, fuzzy
-msgid "Canon SELPHY-CP-800"
-msgstr "Canon S400"
-
-#: src/xml/xmli18n-tmp.h:8392
-msgid "Canon SELPHY ES1"
-msgstr ""
+msgid "Canon SELPHY-CP760"
+msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8393
-msgid "Canon SELPHY ES2"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:8536
+#, fuzzy
+msgid "Canon SELPHY-CP770"
+msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8394
+#: src/xml/xmli18n-tmp.h:8537
 #, fuzzy
-msgid "Canon SELPHY ES20"
-msgstr "Canon CP220"
+msgid "Canon SELPHY-CP790"
+msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:8395
+#: src/xml/xmli18n-tmp.h:8538
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8396
+#: src/xml/xmli18n-tmp.h:8539
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8397
+#: src/xml/xmli18n-tmp.h:8540
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8398
+#: src/xml/xmli18n-tmp.h:8541
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8399
+#: src/xml/xmli18n-tmp.h:8542
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:8400
+#: src/xml/xmli18n-tmp.h:8543
 #, fuzzy
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/xml/xmli18n-tmp.h:8401
+#: src/xml/xmli18n-tmp.h:8544
 #, fuzzy
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/xml/xmli18n-tmp.h:8402
+#: src/xml/xmli18n-tmp.h:8545
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/xml/xmli18n-tmp.h:8403
+#: src/xml/xmli18n-tmp.h:8546
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8404
+#: src/xml/xmli18n-tmp.h:8547
 msgid "Kodak EasyShare-G600-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8405
+#: src/xml/xmli18n-tmp.h:8548
 msgid "Kodak PD-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8406
+#: src/xml/xmli18n-tmp.h:8549
 msgid "Kodak PD-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8407
+#: src/xml/xmli18n-tmp.h:8550
 msgid "Kodak Photo-Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8408
+#: src/xml/xmli18n-tmp.h:8551
 msgid "Kodak Photo-Printer-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8409
+#: src/xml/xmli18n-tmp.h:8552
 msgid "Kodak Printer-Dock-Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8410
+#: src/xml/xmli18n-tmp.h:8553
 msgid "Kodak Printer-Dock-Plus-S3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8411
+#: src/xml/xmli18n-tmp.h:8554
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8412
+#: src/xml/xmli18n-tmp.h:8555
 msgid "Dai Nippon Printing DS40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8413
+#: src/xml/xmli18n-tmp.h:8556
 msgid "Dai Nippon Printing DS80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8414
+#: src/xml/xmli18n-tmp.h:8557
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:8415
+#: src/xml/xmli18n-tmp.h:8558
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Canon i865   "
+#~ msgstr "Canon BJC 85"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-600"
+#~ msgstr "Canon CP100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1600"
+#~ msgstr "Canon CP100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1700"
+#~ msgstr "Canon CP100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1800"
+#~ msgstr "Canon CP100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP1900"
+#~ msgstr "Canon CP100"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2500"
+#~ msgstr "Canon BJC 2000"
+
+#, fuzzy
+#~ msgid "Canon PIXMA iP2600"
+#~ msgstr "Canon BJC 2000"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-720"
+#~ msgstr "Canon CP220"
+
+#, fuzzy
+#~ msgid "Canon SELPHY-CP-800"
+#~ msgstr "Canon S400"
+
 #~ msgid "Basic Printer Setup"
 #~ msgstr "基本�表機設定"
 
@@ -15468,9 +16143,6 @@ msgstr ""
 #~ msgid "Cannot identify printer!\n"
 #~ msgstr "無法識別�表機�\n"
 
-#~ msgid "<Image>/File/Print..."
-#~ msgstr "<Image>/檔案/列�..."
-
 #~ msgid "Red Balance"
 #~ msgstr "紅色平衡"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index bccb632..29b6adc 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 04cc8d2..8250feb 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -90,6 +90,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -166,6 +167,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -186,6 +188,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -209,6 +213,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -255,7 +260,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index dee12ce..7a19bbd 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}'`
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index a72f2fd..3061e3c 100755
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4
 # 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.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010 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.
 
@@ -32,50 +32,56 @@
 #
 # 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
+#       --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
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed 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
+#         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.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # 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.6b
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.2.6b
+VERSION=2.4
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3293
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +97,15 @@ fi
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # 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).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +118,33 @@ do
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# 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"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
 : ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
+: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -144,6 +164,27 @@ IFS=" 	$lt_nl"
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# 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 ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +199,183 @@ basename="s,^.*/,,"
 # 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"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -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 "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# 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 "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
 }
 
-# Generated shell functions inserted here.
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
 
-# 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"
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
 
 # 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
@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|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.
@@ -243,7 +443,7 @@ opt_warning=:
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -258,18 +458,25 @@ func_verbose ()
     :
 }
 
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_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
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -326,9 +533,9 @@ func_mkdir_p ()
         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"`
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -378,7 +585,7 @@ func_mktempdir ()
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$my_tmpdir"
 }
 
 
@@ -392,7 +599,7 @@ func_quote_for_eval ()
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -419,7 +626,7 @@ func_quote_for_expand ()
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
+	my_arg=`$ECHO "$1" | $SED \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -488,15 +695,39 @@ func_show_eval_locale ()
     fi
 }
 
-
-
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
 
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +740,28 @@ func_version ()
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    $ECHO
+    echo
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -537,8 +774,15 @@ func_help ()
 	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
 	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
-     }' < "$progpath"
-    exit $?
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
 }
 
 # func_missing_arg argname
@@ -546,63 +790,106 @@ func_help ()
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $opt_debug
+
+    func_error "missing argument for $1."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
 
 
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+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
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
 
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # 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_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -636,16 +923,16 @@ func_config ()
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
+    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 $?
@@ -692,117 +979,204 @@ func_enable_tag ()
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# 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
+    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
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  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
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+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
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
     opt="$1"
     shift
-
     case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
 			$opt_debug
 			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
 			;;
-
-      --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"
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
 			shift
 			;;
-
       --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
+			opt_preserve_dup_deps=:
 			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg 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
+			shift
+			;;
+      --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
 			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
 			shift
 			;;
 
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
       # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
 			shift
 			;;
 
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
 			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
   done
 
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -810,82 +1184,44 @@ func_enable_tag ()
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
       ;;
   esac
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
-# 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
-    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
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
 
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
 
-  # 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
-    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 \`$progname --help --mode=$mode' for more information."
-}
 
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
 # 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_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1001,6 +1334,37 @@ func_source ()
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$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.
@@ -1013,13 +1377,15 @@ func_infer_tag ()
     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"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       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` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1030,11 +1396,13 @@ func_infer_tag ()
 	    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"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1097,6 +1465,486 @@ EOF
     }
 }
 
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # 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_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# 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.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # 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_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # 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_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
@@ -1137,12 +1985,12 @@ func_mode_compile ()
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1163,15 +2011,14 @@ func_mode_compile ()
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    func_append_quoted lastarg "$arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1187,8 +2034,7 @@ func_mode_compile ()
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1213,7 +2059,7 @@ func_mode_compile ()
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1288,7 +2134,7 @@ func_mode_compile ()
     # 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 "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -1319,17 +2165,16 @@ compiler."
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append 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
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1349,7 +2194,7 @@ compiler."
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1396,11 +2241,11 @@ compiler."
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1445,13 +2290,13 @@ compiler."
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1482,10 +2327,11 @@ 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
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build 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
+  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -1538,7 +2384,7 @@ 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
+  -inst-prefix-dir 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)."
@@ -1558,6 +2404,8 @@ 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
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
   -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)
@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND are treated specially:
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM."
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
-    $ECHO
+    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
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
@@ -1643,13 +2522,16 @@ func_mode_execute ()
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# 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"
@@ -1671,7 +2553,7 @@ func_mode_execute ()
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2594,7 @@ func_mode_execute ()
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2610,7 @@ func_mode_execute ()
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2635,66 @@ func_mode_execute ()
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
+	echo "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
     $opt_debug
-    libdirs="$nonopt"
+    libs=
+    libdirs=
     admincmds=
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
 
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,7 +2704,7 @@ func_mode_finish ()
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1795,53 +2713,55 @@ func_mode_finish ()
     # 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\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      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 "   - 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
+      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 "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -1852,7 +2772,7 @@ func_mode_install ()
     # 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
+       case $nonopt in *shtool*) :;; *) false;; esac; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2786,12 @@ func_mode_install ()
     # 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"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1876,10 +2801,12 @@ func_mode_install ()
     install_type=
     isdir=no
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -1887,10 +2814,9 @@ func_mode_install ()
       case $arg in
       -d) isdir=yes ;;
       -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +2830,10 @@ func_mode_install ()
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,7 +2844,11 @@ func_mode_install ()
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -1923,6 +2857,13 @@ func_mode_install ()
     test -n "$prev" && \
       func_fatal_help "the \`$prev' option requires an argument"
 
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
     if test -z "$files"; then
       if test -z "$dest"; then
 	func_fatal_help "no file or destination specified"
@@ -1977,10 +2918,13 @@ func_mode_install ()
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# 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"
@@ -1994,23 +2938,23 @@ func_mode_install ()
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append 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\$%%"`
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2023,9 +2967,9 @@ func_mode_install ()
 
 	  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%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  func_warning "relinking \`$file'"
@@ -2043,7 +2987,7 @@ func_mode_install ()
 	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
@@ -2083,7 +3027,7 @@ func_mode_install ()
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2183,7 +3127,7 @@ func_mode_install ()
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile="$libdir/"`$ECHO "$lib" | $SED '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
@@ -2202,7 +3146,7 @@ func_mode_install ()
 		file="$func_basename_result"
 	        outputname="$tmpdir/$file"
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_silent || {
 	          func_quote_for_expand "$relink_command"
@@ -2221,7 +3165,7 @@ func_mode_install ()
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2280,7 +3224,7 @@ func_mode_install ()
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
 extern \"C\" {
 #endif
 
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2332,10 +3292,11 @@ extern \"C\" {
 	  $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`
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$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'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2371,7 +3332,7 @@ extern \"C\" {
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
+	        *cygwin* | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2384,10 +3345,52 @@ extern \"C\" {
 	  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'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2415,36 +3418,19 @@ extern \"C\" {
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  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
+extern LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() {
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() {
 	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%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "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%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "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%"`
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() {
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
 }
 
@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() {
 # 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.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -2559,9 +3546,11 @@ func_win32_libid ()
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     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 |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -2590,6 +3579,131 @@ func_win32_libid ()
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -2598,7 +3712,18 @@ 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 test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2669,7 +3794,7 @@ func_extract_archives ()
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2684,25 +3809,30 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
 }
 
 
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [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 ()
+# 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_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
+	func_emit_wrapper_arg1=${1-no}
 
 	$ECHO "\
 #! $SHELL
@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
 
 # 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
@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
 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\
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
 "
-	$ECHO "\
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  for lt_wr_arg
+  do
+    case \$lt_wr_arg in
+    --lt-*) ;;
+    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+    esac
+    shift
+  done
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"\$file\" | $SED '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'\`
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +4013,13 @@ else
       esac
     fi
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+    file=\`\$ECHO \"\$file\" | $SED '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
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()
 
     # 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/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED '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
+      func_exec_program \${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
+    \$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
-      *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
@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()
 
    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"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 #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>
@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *, int);
 #include <fcntl.h>
 #include <sys/stat.h>
 
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int);
 # 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
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int);
 # 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
@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int);
   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);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
 #else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
 #endif
 
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3271,41 +4281,27 @@ 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_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
 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 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
 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";
+volatile 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"
+              func_to_host_path "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3314,10 +4310,10 @@ EOF
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
+              func_to_host_path "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3340,24 +4336,10 @@ EOF
 	    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 */
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv[])
@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
   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));
+  newargz = XMALLOC (char *, argc + 1);
 
-  /* very simple arg parsing; don't want to rely on getopt */
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
   for (i = 1; i < argc; i++)
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +4376,57 @@ EOF
 	      esac
 
 	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
+	  lt_dump_script (stdout);
 	  return 0;
 	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 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 (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
     }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
-  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));
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(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));
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3427,8 +4444,9 @@ EOF
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
 EOF
 
 	    cat <<EOF
@@ -3478,80 +4496,19 @@ EOF
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_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>")));
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
   for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
     }
 
 EOF
@@ -3560,11 +4517,14 @@ EOF
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
   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));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal ("Memory exhausted");
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 
   return p;
 }
@@ -3620,8 +4580,8 @@ check_executable (const char *path)
 {
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3638,8 +4598,8 @@ make_executable (const char *path)
   int rval = 0;
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
   int tmp_len;
   char *concat_name;
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
 	}
       else
 	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
 	}
     }
   XFREE (tmp_pathspec);
@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
   return str;
 }
 
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
 static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s: %s: ", program_name, mode);
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode,
 }
 
 void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
   va_end (ap);
 }
 
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
 void
 lt_setenv (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
   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>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *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>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value)
     }
 }
 
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
 
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+              $SED -e 's/\([\\"]\)/\\\1/g' \
+	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
+
+            cat <<"EOF"
+}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -4072,6 +5121,7 @@ func_mode_link ()
     new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4164,6 +5214,11 @@ func_mode_link ()
 	esac
 
 	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
@@ -4195,9 +5250,9 @@ func_mode_link ()
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -4221,7 +5276,7 @@ func_mode_link ()
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -4240,7 +5295,7 @@ func_mode_link ()
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -4269,7 +5324,7 @@ func_mode_link ()
 
 		  if test "$prev" = dlfiles; then
 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -4281,7 +5336,7 @@ func_mode_link ()
 		  # CHECK ME:  I think I busted this.  -Ossama
 		  if test "$prev" = dlprefiles; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
@@ -4351,12 +5406,12 @@ func_mode_link ()
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
@@ -4368,28 +5423,28 @@ func_mode_link ()
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4425,6 +5480,11 @@ func_mode_link ()
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4475,15 +5535,16 @@ func_mode_link ()
 	;;
 
       -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; 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
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4495,24 +5556,30 @@ func_mode_link ()
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4522,7 +5589,7 @@ func_mode_link ()
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -4536,7 +5603,7 @@ func_mode_link ()
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -4556,7 +5623,7 @@ func_mode_link ()
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -4568,8 +5635,8 @@ func_mode_link ()
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
@@ -4577,12 +5644,12 @@ func_mode_link ()
 	;;
 
       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+	func_append compiler_flags " $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" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
@@ -4649,13 +5716,17 @@ func_mode_link ()
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4708,8 +5779,8 @@ func_mode_link ()
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4724,9 +5795,9 @@ func_mode_link ()
 	for flag in $args; do
 	  IFS="$save_ifs"
           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"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4754,23 +5825,27 @@ func_mode_link ()
 	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
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
         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"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
@@ -4782,7 +5857,7 @@ func_mode_link ()
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4813,7 +5888,7 @@ func_mode_link ()
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4825,7 +5900,7 @@ func_mode_link ()
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
@@ -4870,24 +5945,25 @@ func_mode_link ()
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
+	func_resolve_sysroot "$arg"
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -4925,7 +6001,7 @@ func_mode_link ()
 
     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 \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
@@ -4934,6 +6010,8 @@ func_mode_link ()
 
     func_dirname "$output" "/" ""
     output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -4954,12 +6032,12 @@ func_mode_link ()
     # 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 $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps ; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -4972,9 +6050,9 @@ func_mode_link ()
       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" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -5041,17 +6119,19 @@ func_mode_link ()
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
+	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$lib" ;;
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 	  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"`
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
@@ -5072,11 +6152,11 @@ func_mode_link ()
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
+	    func_append compiler_flags " $deplib"
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5161,7 +6241,7 @@ func_mode_link ()
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5174,7 +6254,8 @@ func_mode_link ()
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -5188,7 +6269,8 @@ func_mode_link ()
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
 	    func_warning "\`-L' is ignored for archives/objects"
@@ -5199,17 +6281,21 @@ func_mode_link ()
 	-R*)
 	  if test "$pass" = link; then
 	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -5227,7 +6313,7 @@ func_mode_link ()
 		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 \
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
 		    valid_a_lib=yes
 		  fi
@@ -5237,15 +6323,15 @@ func_mode_link ()
 		;;
 	      esac
 	      if test "$valid_a_lib" != yes; then
-		$ECHO
+		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."
+		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
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
@@ -5272,11 +6358,11 @@ func_mode_link ()
 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
@@ -5318,20 +6404,20 @@ func_mode_link ()
 
 	# 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'`
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED '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";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -5342,20 +6428,20 @@ func_mode_link ()
 	      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"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    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
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done
 	  continue
 	fi # $pass = conv
@@ -5363,9 +6449,15 @@ func_mode_link ()
 
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
 	if test -z "$linklib"; then
 	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
@@ -5382,9 +6474,9 @@ func_mode_link ()
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -5406,14 +6498,14 @@ func_mode_link ()
 
 	# 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
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
 	  fi
 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
@@ -5421,12 +6513,12 @@ func_mode_link ()
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
@@ -5437,20 +6529,46 @@ func_mode_link ()
 	  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"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append 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" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append 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" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
@@ -5468,7 +6586,7 @@ func_mode_link ()
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -5481,7 +6599,8 @@ func_mode_link ()
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
@@ -5492,12 +6611,12 @@ func_mode_link ()
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -5512,7 +6631,7 @@ func_mode_link ()
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath:" in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5524,7 +6643,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5533,7 +6652,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5558,12 +6677,12 @@ func_mode_link ()
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
 	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5580,7 +6699,7 @@ func_mode_link ()
 	    fi
 	  done
 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
+	    echo
 	    if test "$linkmode" = prog; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
@@ -5598,7 +6717,7 @@ func_mode_link ()
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5607,7 +6726,7 @@ func_mode_link ()
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5661,7 +6780,7 @@ func_mode_link ()
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5683,9 +6802,9 @@ func_mode_link ()
 		      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"
+			  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
@@ -5717,7 +6836,7 @@ func_mode_link ()
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -5739,7 +6858,7 @@ func_mode_link ()
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -5753,13 +6872,13 @@ func_mode_link ()
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5773,7 +6892,7 @@ func_mode_link ()
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
@@ -5790,7 +6909,7 @@ func_mode_link ()
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -5825,21 +6944,21 @@ func_mode_link ()
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $ECHO
+	    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 "*** 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
@@ -5867,37 +6986,46 @@ func_mode_link ()
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
 	    # Add the search paths of all dependency libraries
 	    for deplib in $dependency_libs; do
+	      path=
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -5924,8 +7052,8 @@ func_mode_link ()
                       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}"
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
 		      path=
 		    fi
 		  fi
@@ -5958,7 +7086,7 @@ func_mode_link ()
 	  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'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -5975,7 +7103,7 @@ func_mode_link ()
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -6033,10 +7161,10 @@ func_mode_link ()
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -6052,7 +7180,7 @@ func_mode_link ()
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
@@ -6093,7 +7221,7 @@ func_mode_link ()
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
@@ -6126,10 +7254,10 @@ func_mode_link ()
 	if test "$deplibs_check_method" != pass_all; then
 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  $ECHO
+	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
@@ -6194,7 +7322,7 @@ func_mode_link ()
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
+	  freebsd-aout|freebsd-elf|qnx|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -6327,7 +7455,7 @@ func_mode_link ()
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
 	  ;;
 
 	qnx)
@@ -6395,10 +7523,10 @@ func_mode_link ()
       fi
 
       func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
+      func_append libobjs " $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
-      if test "$mode" != relink; then
+      if test "$opt_mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6414,7 +7542,7 @@ func_mode_link ()
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6425,27 +7553,28 @@ func_mode_link ()
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append 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 "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	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"`
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6459,7 +7588,7 @@ func_mode_link ()
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -6469,19 +7598,19 @@ func_mode_link ()
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6498,7 +7627,7 @@ func_mode_link ()
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6547,7 +7676,7 @@ EOF
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		    i=""
 		    ;;
 		  esac
@@ -6558,21 +7687,21 @@ EOF
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
-		    $ECHO
+		    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 "*** 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
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6590,7 +7719,7 @@ EOF
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		      i=""
 		      ;;
 		    esac
@@ -6601,29 +7730,29 @@ EOF
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
-		      $ECHO
+		      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 "*** 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
 		  $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 "*** 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
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6640,15 +7769,27 @@ EOF
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6665,13 +7806,13 @@ 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 "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -6680,12 +7821,12 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		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 "*** 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)"
 		else
@@ -6696,7 +7837,7 @@ EOF
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6712,7 +7853,7 @@ EOF
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -6723,9 +7864,9 @@ EOF
 		  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 \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -6734,12 +7875,12 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		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 "*** 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)"
 		else
@@ -6750,32 +7891,32 @@ EOF
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    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 " $deplibs" | $SED 's/ -lc$//; 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" | $Xsed -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 	    done
 	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    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
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -6787,23 +7928,23 @@ EOF
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED '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
+	    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 "*** 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"
@@ -6813,16 +7954,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
@@ -6839,9 +7980,9 @@ EOF
       # 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'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -6854,7 +7995,7 @@ EOF
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6864,10 +8005,10 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -6884,10 +8025,12 @@ EOF
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -6896,18 +8039,18 @@ EOF
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_apped perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -6925,7 +8068,7 @@ EOF
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -6933,7 +8076,7 @@ EOF
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6959,18 +8102,18 @@ EOF
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	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 "$libobjs" | $SP2NL | $SED "$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"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -7001,13 +8144,45 @@ EOF
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7029,7 +8204,7 @@ EOF
 	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"'
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7041,7 +8216,7 @@ EOF
 	  # 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"
+	  func_append 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
@@ -7051,7 +8226,7 @@ EOF
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -7071,21 +8246,21 @@ EOF
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append 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"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -7130,7 +8305,8 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+	  func_basename "$output"
+	  output_la=$func_basename_result
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7143,13 +8319,16 @@ EOF
 	  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
+	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  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"
@@ -7163,10 +8342,12 @@ EOF
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -7190,17 +8371,19 @@ EOF
 		  # 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\"
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
 		  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\"
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$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
+		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7210,11 +8393,12 @@ EOF
 	      # 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\"
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7248,7 +8432,7 @@ EOF
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7269,7 +8453,7 @@ EOF
 	    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"'
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
@@ -7281,7 +8465,7 @@ EOF
 	      # 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"
+	      func_append 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
@@ -7322,10 +8506,10 @@ EOF
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7341,7 +8525,7 @@ EOF
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7353,7 +8537,7 @@ EOF
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7434,18 +8618,21 @@ 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 "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # 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 "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7505,8 +8692,8 @@ EOF
       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 / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7517,14 +8704,14 @@ EOF
 	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"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append 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'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7538,7 +8725,7 @@ EOF
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7548,17 +8735,17 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7566,7 +8753,7 @@ EOF
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7585,18 +8772,18 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7605,12 +8792,12 @@ EOF
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7636,18 +8823,18 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -7661,8 +8848,8 @@ 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`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7674,15 +8861,15 @@ EOF
 
       wrappers_required=yes
       case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *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
@@ -7691,13 +8878,19 @@ EOF
       esac
       if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7720,7 +8913,7 @@ EOF
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7728,7 +8921,7 @@ EOF
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7738,11 +8931,18 @@ EOF
 	# 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 "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -7757,7 +8957,7 @@ EOF
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -7769,13 +8969,19 @@ EOF
       fi
 
       # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -7793,18 +8999,7 @@ EOF
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	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
-	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"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -7884,7 +9079,7 @@ EOF
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -7892,10 +9087,10 @@ EOF
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -7906,10 +9101,10 @@ EOF
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7925,9 +9120,9 @@ EOF
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7951,9 +9146,9 @@ EOF
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
@@ -7963,6 +9158,16 @@ EOF
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -8036,7 +9241,7 @@ EOF
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -8059,9 +9264,19 @@ EOF
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -8075,9 +9290,9 @@ EOF
 		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"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -8094,7 +9309,7 @@ EOF
 		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"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
@@ -8106,7 +9321,7 @@ EOF
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -8115,15 +9330,33 @@ EOF
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
@@ -8182,7 +9415,7 @@ relink_command=\"$relink_command\""
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -8202,9 +9435,9 @@ func_mode_uninstall ()
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8213,24 +9446,23 @@ func_mode_uninstall ()
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8256,18 +9488,17 @@ func_mode_uninstall ()
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8295,19 +9526,19 @@ func_mode_uninstall ()
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append 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
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8317,7 +9548,7 @@ func_mode_uninstall ()
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8326,7 +9557,7 @@ func_mode_uninstall ()
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8334,12 +9565,12 @@ func_mode_uninstall ()
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8347,7 +9578,6 @@ func_mode_uninstall ()
       esac
       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
@@ -8359,16 +9589,16 @@ func_mode_uninstall ()
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff --git a/src/Makefile.in b/src/Makefile.in
index 557cefd..30dc171 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -128,6 +128,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -204,6 +205,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +226,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -247,6 +251,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -293,7 +298,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index f395aa0..1e27ae0 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.120 2011/01/17 23:20:51 rlk Exp $
+## $Id: Makefile.am,v 1.122 2012/03/25 17:54:32 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -27,6 +27,8 @@ include $(top_srcdir)/scripts/global.mk
 empty=
 PACKAGE = cups
 
+BASE_VERSION = \"@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@\"
+
 bindir = @cups_bindir@
 sbindir = @cups_sbindir@
 
@@ -43,7 +45,7 @@ else
 cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/
 endif
 
-LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
+LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS) -DBASE_VERSION=$(BASE_VERSION)
 
 STP_NONLS_ENV= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 
@@ -95,12 +97,12 @@ commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 
@@ -209,20 +211,20 @@ ppd-catalog: ppd-catalog-clean
 ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	$(mkdir_p) ppd/C
 	$(MAKE) ppd-catalog-clean
-	LC_ALL= LANG= LANGUAGE= $(STP_NONLS_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_NONLS_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ $(EXTRA_GENPPD_OPTS) -l C -p ppd/C
 
 ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	@echo "Global PPDs:"
 	$(mkdir_p) ppd/Global
 	$(MAKE) ppd-catalog
-	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -p ppd/Global
 	$(MAKE) ppd-catalog-clean
 
 ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	@echo "Global PPDs (localized numbers for testing):"
 	$(mkdir_p) ppd/Global
 	$(MAKE) ppd-catalog
-	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -p ppd/Global -N
 	$(MAKE) ppd-catalog-clean
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-nonls
@@ -231,7 +233,7 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-n
 	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
 	$(MAKE) ppd-catalog-clean
 
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index 50a1c36..8f5418c 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -199,6 +199,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -275,6 +276,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -295,6 +297,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -318,6 +322,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -364,7 +369,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -383,13 +387,14 @@ 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
 empty = 
+BASE_VERSION = \"@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@.@GUTENPRINT_MICRO_VERSION@\"
 pkgsysconfdir = $(cups_conf_serverroot)
 cupsexec_driverdir = $(pkglibdir)/driver
 cupsexec_filterdir = $(pkglibdir)/filter
 @CUPS_PPDS_AT_TOP_LEVEL_FALSE@cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/
 @CUPS_PPDS_AT_TOP_LEVEL_TRUE@DONT_UNINSTALL_PPDS = true
-LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS)
+LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS) -DBASE_VERSION=$(BASE_VERSION)
 STP_NONLS_ENV = STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
 STP_ENV = $(STP_NONLS_ENV) STP_LOCALEDIR=$(top_srcdir)/src/cups/catalog
 @BUILD_GLOBALIZED_CUPS_PPDS_FALSE@@BUILD_TRANSLATED_CUPS_PPDS_TRUE@PPD = $(PPD_NLS_1)
@@ -409,11 +414,11 @@ commandtocanon_LDADD = $(CUPS_LIBS)
 commandtoepson_SOURCES = commandtoepson.c
 commandtoepson_LDADD = $(CUPS_LIBS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
 gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
 rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
@@ -1255,20 +1260,20 @@ ppd-catalog: ppd-catalog-clean
 ppd-nonls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	$(mkdir_p) ppd/C
 	$(MAKE) ppd-catalog-clean
-	LC_ALL= LANG= LANGUAGE= $(STP_NONLS_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l C -p ppd/C
+	LC_ALL= LANG= LANGUAGE= $(STP_NONLS_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ $(EXTRA_GENPPD_OPTS) -l C -p ppd/C
 
 ppd-global: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	@echo "Global PPDs:"
 	$(mkdir_p) ppd/Global
 	$(MAKE) ppd-catalog
-	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -p ppd/Global
 	$(MAKE) ppd-catalog-clean
 
 ppd-global-ln: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@
 	@echo "Global PPDs (localized numbers for testing):"
 	$(mkdir_p) ppd/Global
 	$(MAKE) ppd-catalog
-	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -p ppd/Global -N
+	LC_ALL= LANG= LANGUAGE= $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -p ppd/Global -N
 	$(MAKE) ppd-catalog-clean
 
 ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-nonls
@@ -1277,7 +1282,7 @@ ppd-nls: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ ppd-n
 	for language in `$(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ -L` ; do \
 	  mkdir ppd/$$language ; \
 	  echo "$$language:" ; \
-	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ @WHICH_PPDS@ -l $$language -p ppd/$$language; \
+	  LC_ALL=$$language LANG=$$language LANGUAGE=$$language $(STP_ENV) ./cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(EXTRA_GENPPD_OPTS) @WHICH_PPDS@ -l $$language -p ppd/$$language; \
 	done
 	$(MAKE) ppd-catalog-clean
 
diff --git a/src/cups/commandtocanon.c b/src/cups/commandtocanon.c
index db5bc92..b7b7ef2 100644
--- a/src/cups/commandtocanon.c
+++ b/src/cups/commandtocanon.c
@@ -14,6 +14,7 @@
 #include <cups/cups.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 
 /*
diff --git a/src/cups/commandtoepson.c b/src/cups/commandtoepson.c
index b907a2d..e2d03b2 100644
--- a/src/cups/commandtoepson.c
+++ b/src/cups/commandtoepson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: commandtoepson.c,v 1.3 2007/12/23 17:31:51 easysw Exp $"
+ * "$Id: commandtoepson.c,v 1.4 2011/08/13 16:24:17 rlk Exp $"
  *
  *   EPSON ESC/P2 command filter for the Common UNIX Printing System.
  *
@@ -32,6 +32,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 /*
  * Macros...
@@ -229,5 +230,5 @@ main(int  argc,		/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: commandtoepson.c,v 1.3 2007/12/23 17:31:51 easysw Exp $".
+ * End of "$Id: commandtoepson.c,v 1.4 2011/08/13 16:24:17 rlk Exp $".
  */
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index adf27e9..66d0a46 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.58 2010/01/01 19:22:18 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.60 2012/02/14 23:11:41 tillkamppeter Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 use strict;
-use Getopt::Std;
+use Getopt::Long;
 use Fcntl qw(:mode);
 use FileHandle;
 use IPC::Open2;
@@ -78,8 +78,6 @@ if (-x $driver_bin) {
     get_driver_version();
 }
 
-$Getopt::Std::STANDARD_HELP_VERSION = 1;
-
 my @ppd_files; # A list of in-use Gutenprint PPD files
 
 # Used to convert a language name to its two letter code
@@ -175,7 +173,14 @@ if (!$quiet || $verbose) {
 	print STDOUT "No Gutenprint PPD files to update.\n";
     } elsif ($updated_ppd_count > 0) {
 	my $plural = $updated_ppd_count == 1 ? "" : "s";
-	print STDOUT "Updated $updated_ppd_count PPD file${plural}.";
+	print STDOUT "Updated $updated_ppd_count PPD file${plural}";
+	if ($failed_ppd_count > 0) {
+	    print STDOUT ", $failed_ppd_count failed";
+	}
+	if ($skipped_ppd_count > 0) {
+	    print STDOUT ", $skipped_ppd_count skipped";
+	}
+	print STDOUT ".";
 	if (!defined $opt_o || $opt_o ne "") {
 	    print STDOUT "  Restart cupsd for the changes to take effect.";
 	}
@@ -247,7 +252,23 @@ sub get_driver_version() {
 }
 
 sub parse_options () {
-    if (!getopts('d:hnqs:vNo:p:P:r:ifl:')) {
+    Getopt::Long::Configure("bundling");
+    if (!GetOptions("d=i" => \$opt_d,
+                    "h" => \$opt_h,
+                    "n" => \$opt_n,
+                    "q" => \$opt_q,
+                    "s=s" => \$opt_s,
+                    "p=s" => \$opt_p,
+                    "P=s" => \$opt_P,
+                    "v" => \$opt_v,
+                    "N" => \$opt_N,
+                    "o=s" => \$opt_o,
+                    "r=s" => \$opt_r,
+                    "f" => \$opt_f,
+                    "i" => \$opt_i,
+                    "l=s" => \$opt_l,
+                    "version" => sub { VERSION_MESSAGE(\*STDOUT) },
+                    "help" => sub { VERSION_MESSAGE(\*STDOUT); HELP_MESSAGE(\*STDOUT) })) {
 	help();
     }
     if ($opt_n) {
@@ -514,7 +535,15 @@ sub update_ppd ($) {
 	get_ppd_fh($ppd_source_filename, $filename, $driver, $locale, $region);
 
     if (! defined $source_fd) {
-	print "Unable to retrieve PPD file!\n";
+	print "Unable to retrieve PPD file for $ppd_source_filename!\n";
+	close ORIG;
+	return 0;
+    }
+
+    my ($ndt, $nopt, $nres, $ndef, $source_data) = get_ppd_data($source_fd, 1, 1, 1, 1, 1);
+    if (! defined $ndt) {
+	print "Unable to retrieve PPD file for $ppd_source_filename!\n";
+	close ORIG;
 	return 0;
     }
 
@@ -537,14 +566,13 @@ sub update_ppd ($) {
     seek(ORIG, 0, 0);
 
     my ($odt, $oopt, $ores, $odef) = get_ppd_data(ORIG, 1, 0, 1, 1, 0);
-    my ($ndt, $nopt, $nres, $ndef, $source_data) = get_ppd_data($source_fd, 1, 1, 1, 1, 1);
 
     # Close original and temporary files...
 
     close ORIG;
     if (! $server_multicat && ! close $source_fd) {
 	print "Unable to retrieve new PPD file: $!\n";
-	return 0;
+	return -1;
     }
 
     my %orig_default_types = %$odt;
@@ -827,6 +855,7 @@ sub find_ppd ($$$$) {
 sub get_ppd_data(*$$$$$) {
     my ($fh, $types, $opts, $resolutions, $defaults, $data) = @_;
     my (%options, %defaults, %resolution_map, %default_types);
+    my ($fileversion_found) = 0;
     my $cur_opt = "";
     my (@optionlist);
     my ($source_data) = "";
@@ -840,6 +869,7 @@ sub get_ppd_data(*$$$$$) {
     if ($resolutions || $types || $opts || $defaults || $data) {
 	while (<$fh>) {
 	    last if $_ eq "*%*%EOFEOF\n";
+	    $fileversion_found = 1 if (/^\*FileVersion:/);
 	    $source_data .= $_ if ($data);
 	    chomp;
 	    if (($types || $opts) && m/^\*OpenUI/) {
@@ -870,5 +900,6 @@ sub get_ppd_data(*$$$$$) {
 	    }
 	}
     }
+    return (undef, undef, undef, undef, undef) if (! $fileversion_found);
     return (\%default_types, \%options, \%resolution_map, \%defaults, $source_data);
 }
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 4e85388..f2dded8 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: genppd.c,v 1.186 2011/03/13 19:28:50 rlk Exp $"
+ * "$Id: genppd.c,v 1.192 2012/03/25 17:54:32 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -81,6 +81,8 @@ static const char *gzext = "";
 
 #include "i18n.h"
 
+static int use_base_version = 0;
+
 /*
  * Some applications use the XxYdpi tags rather than the actual
  * hardware resolutions to decide what resolution to print at.  Some
@@ -249,18 +251,17 @@ main(int  argc,			    /* I - Number of command-line arguments */
     {
       char buf[1024];
       int status = 0;
-      while (status == 0 && fgets(buf, sizeof(buf) - 1, stdin))
+      while (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);
+	  status |= cat_ppd(buf);
 	  fputs("*%*%EOFEOF\n", stdout);
 	  (void) fflush(stdout);
 	}
-      return status;
     }
   else if (argc == 2 && !strcmp(argv[1], "VERSION"))
     {
@@ -273,11 +274,12 @@ main(int  argc,			    /* I - Number of command-line arguments */
       return (0);
     }
   else
-  {
-    fprintf(stderr, "Usage: %s list\n", argv[0]);
-    fprintf(stderr, "       %s cat URI\n", argv[0]);
-    return (1);
-  }
+    {
+      fprintf(stderr, "Usage: %s list\n", argv[0]);
+      fprintf(stderr, "       %s cat URI\n", argv[0]);
+      return (1);
+    }
+  return (0);
 }
 
 
@@ -457,7 +459,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
 
   for (;;)
   {
-    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:saNC")) == -1)
+    if ((i = getopt(argc, argv, "23hvqc:p:l:LMVd:saNCb")) == -1)
       break;
 
     switch (i)
@@ -528,6 +530,9 @@ main(int  argc,			    /* I - Number of command-line arguments */
 	   "GNU General Public License for more details.\n");
       exit(EXIT_SUCCESS);
       break;
+    case 'b':
+      use_base_version = 1;
+      break;
     default:
       usage();
       exit(EXIT_FAILURE);
@@ -944,7 +949,10 @@ print_ppd_header(gzFile fp, ppd_type_t ppd_type, int model, const char *driver,
   gzputs(fp, "*% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n");
   gzputs(fp, "*%\n");
   gzputs(fp, "*FormatVersion:	\"4.3\"\n");
-  gzputs(fp, "*FileVersion:	\"" VERSION "\"\n");
+  if (use_base_version)
+    gzputs(fp, "*FileVersion:	\"" BASE_VERSION "\"\n");
+  else
+    gzputs(fp, "*FileVersion:	\"" VERSION "\"\n");
   /* Specify language of PPD translation */
   /* TRANSLATORS: Specify the language of the PPD translation.
    * Use the English name of your language here, e.g. "Swedish" instead of
@@ -988,11 +996,6 @@ print_ppd_header(gzFile fp, ppd_type_t ppd_type, int model, const char *driver,
   gzprintf(fp, "*ShortNickName: \"%s\"\n", short_long_name);
 
  /*
-  * The Windows driver download stuff has problems with NickName fields
-  * with commas.  Now use a dash instead...
-  */
-
- /*
   * NOTE - code in rastertoprinter looks for this version string.
   * If this is changed, the corresponding change must be made in
   * rastertoprinter.c.  Look for "ppd->nickname"
@@ -1245,7 +1248,7 @@ print_color_setup(gzFile fp, int simplified, int printer_is_color,
   gzputs(fp, "*ColorKeyWords: \"ColorModel\"\n");
   gzprintf(fp, "*OpenUI *ColorModel/%s: PickOne\n", _("Color Model"));
   gzputs(fp, "*OPOptionHints ColorModel: \"radiobuttons\"\n");
-  gzputs(fp, "*OrderDependency: 10 AnySetup *ColorModel\n");
+  gzputs(fp, "*OrderDependency: 2 AnySetup *ColorModel\n");
 
   if (printer_is_color)
     {
@@ -1314,7 +1317,7 @@ print_color_setup(gzFile fp, int simplified, int printer_is_color,
       gzputs(fp, "*ColorKeyWords: \"StpColorPrecision\"\n");
       gzprintf(fp, "*OpenUI *StpColorPrecision/%s: PickOne\n", _("Color Precision"));
       gzputs(fp, "*OPOptionHints StpColorPrecision: \"radiobuttons\"\n");
-      gzputs(fp, "*OrderDependency: 10 AnySetup *StpColorPrecision\n");
+      gzputs(fp, "*OrderDependency: 1 AnySetup *StpColorPrecision\n");
       gzputs(fp, "*DefaultStpColorPrecision: Normal\n");
       gzputs(fp, "*StpDefaultStpColorPrecision: Normal\n");
       gzprintf(fp, "*StpColorPrecision Normal/%s:\t\"<<"
@@ -1874,12 +1877,15 @@ write_ppd(
 		   all_langs);
 
   /* Macintosh color management */
+
+#ifdef __APPLE__
   gzputs(fp, "*cupsICCProfile Gray../Grayscale:	\"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
   gzputs(fp, "*cupsICCProfile RGB../Color:	\"/System/Library/ColorSync/Profiles/sRGB Profile.icc\"\n");
   gzputs(fp, "*cupsICCProfile CMYK../Color:	\"/System/Library/ColorSync/Profiles/Generic CMYK Profile.icc\"\n");
   gzputs(fp, "*APSupportsCustomColorMatching: true\n");
   gzputs(fp, "*APDefaultCustomColorMatchingProfile: sRGB\n");
   gzputs(fp, "*APCustomColorMatchingProfile: sRGB\n");
+#endif
 
   gzputs(fp, "\n");
 
@@ -2157,6 +2163,7 @@ write_ppd(
 	}
 
       stp_string_list_destroy(res_list);
+      stp_clear_string_parameter(v, "Resolution");
       gzputs(fp, "*CloseUI: *Resolution\n\n");
     }
 
@@ -2563,5 +2570,5 @@ write_ppd(
 
 
 /*
- * End of "$Id: genppd.c,v 1.186 2011/03/13 19:28:50 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.192 2012/03/25 17:54:32 rlk Exp $".
  */
diff --git a/src/cups/rastertoprinter.c b/src/cups/rastertoprinter.c
index 38b685e..065aa9b 100644
--- a/src/cups/rastertoprinter.c
+++ b/src/cups/rastertoprinter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoprinter.c,v 1.137 2011/04/09 00:19:59 rlk Exp $"
+ * "$Id: rastertoprinter.c,v 1.139 2011/12/18 16:20:31 rlk Exp $"
  *
  *   Gutenprint based raster filter for the Common UNIX Printing System.
  *
@@ -36,6 +36,10 @@
  * Include necessary headers...
  */
 
+#if 0
+#define ENABLE_CUPS_LOAD_SAVE_OPTIONS
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -53,6 +57,7 @@
 #include <limits.h>
 #endif
 #include "i18n.h"
+#include <gutenprint/xml.h>
 
 /* Solaris with gcc has problems because gcc's limits.h doesn't #define */
 /* this */
@@ -64,6 +69,14 @@
  * Structure for page raster data...
  */
 
+#if (CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1))
+#define CUPS_HEADER_T cups_page_header2_t
+#define CUPS_READ_HEADER cupsRasterReadHeader2
+#else
+#define CUPS_HEADER_T cups_page_header_t
+#define CUPS_READ_HEADER cupsRasterReadHeader
+#endif
+
 typedef struct
 {
   cups_raster_t		*ras;		/* Raster stream to read from */
@@ -83,7 +96,7 @@ typedef struct
   int			adjusted_height;
   int			last_percent;
   int			shrink_to_fit;
-  cups_page_header_t	header;		/* Page header from file */
+  CUPS_HEADER_T		header;		/* Page header from file */
 } cups_image_t;
 
 static void	cups_writefunc(void *file, const char *buf, size_t bytes);
@@ -114,7 +127,14 @@ static volatile stp_image_status_t Image_status = STP_IMAGE_STATUS_OK;
 static double total_bytes_printed = 0;
 static int print_messages_as_errors = 0;
 static int suppress_messages = 0;
-static stp_string_list_t *po = NULL;
+static int suppress_verbose_messages = 0;
+static const stp_string_list_t *po = NULL;
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+static const char *save_file_name = NULL;
+static const char *load_file_name = NULL;
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
+
+extern void stpi_vars_print_error(const stp_vars_t *v, const char *prefix);
 
 static void
 set_string_parameter(stp_vars_t *v, const char *name, const char *val)
@@ -132,7 +152,16 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
   stp_describe_parameter(v, name, &desc);
   if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
-      if (choice < 0)
+#if 0
+      if (stp_check_string_parameter(v, name, STP_PARAMETER_ACTIVE))
+	{
+	  if (! suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Not overriding special parameter %s (%s)\n",
+		    name, stp_get_string_parameter(v, name));
+	}
+      else
+#endif
+	if (choice < 0)
 	{
 	  stp_clear_string_parameter(v, name);
 	  if (! suppress_messages)
@@ -168,9 +197,6 @@ set_special_parameter(stp_vars_t *v, const char *name, int choice)
 static void
 print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
 {
-  stp_parameter_list_t params;
-  int nparams;
-  int i;
   fprintf(stderr, "DEBUG: Gutenprint: Page data:\n");
   fprintf(stderr, "DEBUG: Gutenprint:   MediaClass = \"%s\"\n", cups->header.MediaClass);
   fprintf(stderr, "DEBUG: Gutenprint:   MediaColor = \"%s\"\n", cups->header.MediaColor);
@@ -221,54 +247,9 @@ print_debug_block(const stp_vars_t *v, const cups_image_t *cups)
   fprintf(stderr, "DEBUG: Gutenprint:   cupsRowCount = %d\n", cups->header.cupsRowCount);
   fprintf(stderr, "DEBUG: Gutenprint:   cupsRowFeed = %d\n", cups->header.cupsRowFeed);
   fprintf(stderr, "DEBUG: Gutenprint:   cupsRowStep = %d\n", cups->header.cupsRowStep);
-  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_driver(v) |%s|\n", stp_get_driver(v));
-  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_left(v) %d\n", stp_get_left(v));
-  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_top(v) %d\n", stp_get_top(v));
-  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_width(v) %d\n", stp_get_page_width(v));
-  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_page_height(v) %d\n", stp_get_page_height(v));
   fprintf(stderr, "DEBUG: Gutenprint:   shrink page to fit %d\n", cups->shrink_to_fit);
-  params = stp_get_parameter_list(v);
-  nparams = stp_parameter_list_count(params);
-  for (i = 0; i < nparams; i++)
-    {
-      const stp_parameter_t *p = stp_parameter_list_param(params, i);
-      switch (p->p_type)
-	{
-	case STP_PARAMETER_TYPE_STRING_LIST:
-	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_string %s(v) |%s| %d\n",
-		  p->name, stp_get_string_parameter(v, p->name) ?
-		  stp_get_string_parameter(v, p->name) : "NULL",
-		  stp_get_string_parameter_active(v, p->name));
-	  break;
-	case STP_PARAMETER_TYPE_DOUBLE:
-	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_float %s(v) |%.3f| %d\n",
-		  p->name, stp_get_float_parameter(v, p->name),
-		  stp_get_float_parameter_active(v, p->name));
-	  break;
-	case STP_PARAMETER_TYPE_DIMENSION:
-	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_dimension %s(v) |%d| %d\n",
-		  p->name, stp_get_dimension_parameter(v, p->name),
-		  stp_get_dimension_parameter_active(v, p->name));
-	  break;
-	case STP_PARAMETER_TYPE_INT:
-	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_int %s(v) |%d| %d\n",
-		  p->name, stp_get_int_parameter(v, p->name),
-		  stp_get_int_parameter_active(v, p->name));
-	  break;
-	case STP_PARAMETER_TYPE_BOOLEAN:
-	  fprintf(stderr, "DEBUG: Gutenprint:   stp_get_boolean %s(v) |%d| %d\n",
-		  p->name, stp_get_boolean_parameter(v, p->name),
-		  stp_get_boolean_parameter_active(v, p->name));
-	  break;
-	  /*
-	   * We don't handle raw, curve, or filename arguments.
-	   */
-	default:
-	  break;
-	}
-    }
+  stpi_vars_print_error(v, "DEBUG");
   fprintf(stderr, "DEBUG: Gutenprint: End page data\n");
-  stp_parameter_list_destroy(params);
 }
 
 static int
@@ -290,7 +271,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
   int nparams = stp_parameter_list_count(params);
   int i;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint: Validating options\n");
+    fprintf(stderr, "DEBUG: Gutenprint:   Validating options\n");
   for (i = 0; i < nparams; i++)
     {
       const stp_parameter_t *param = stp_parameter_list_param(params, i);
@@ -304,14 +285,14 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 	      if (! suppress_messages)
 		{
 		  const char *val = stp_get_string_parameter(v, desc.name);
-		  fprintf(stderr, "DEBUG: Gutenprint:   Clearing string %s (%s)\n",
+		  fprintf(stderr, "DEBUG: Gutenprint:     Clearing string %s (%s)\n",
 			  desc.name, val ? val : "(null)");
 		}
 	      stp_clear_string_parameter(v, desc.name);
 	      if (!desc.read_only && desc.is_mandatory && desc.is_active)
 		{
 		  if (! suppress_messages)
-		    fprintf(stderr, "DEBUG: Gutenprint:   Setting default string %s to %s\n",
+		    fprintf(stderr, "DEBUG: Gutenprint:     Setting default string %s to %s\n",
 			    desc.name, desc.deflt.str ? desc.deflt.str : "(null)");
 		  stp_set_string_parameter(v, desc.name, desc.deflt.str);
 		  if (strcmp(desc.name, "PageSize") == 0)
@@ -321,7 +302,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 		      if (ps->width > 0)
 			{
 			  if (! suppress_messages)
-			    fprintf(stderr, "DEBUG: Gutenprint:   Setting page width to %d\n",
+			    fprintf(stderr, "DEBUG: Gutenprint:     Setting page width to %d\n",
 				    ps->width);
 			  if (ps->width < stp_get_page_width(v))
 			    stp_set_page_width(v, ps->width);
@@ -329,7 +310,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
 		      if (ps->height > 0)
 			{
 			  if (! suppress_messages)
-			    fprintf(stderr, "DEBUG: Gutenprint:   Setting page height to %d\n",
+			    fprintf(stderr, "DEBUG: Gutenprint:     Setting page height to %d\n",
 				    ps->height);
 			  if (ps->height < stp_get_page_height(v))
 			    stp_set_page_height(v, ps->height);
@@ -341,7 +322,7 @@ validate_options(stp_vars_t *v, cups_image_t *cups)
       stp_parameter_description_destroy(&desc);
     }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint: Done validating options\n");
+    fprintf(stderr, "DEBUG: Gutenprint:   Done validating options\n");
   stp_parameter_list_destroy(params);
 }
 
@@ -472,7 +453,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
         set_string_parameter(v, "Duplex", "DuplexNoTumble");
     }
 
-  cups->shrink_to_fit = stp_get_int_parameter(v, "CUPSShrinkPage");
+  cups->shrink_to_fit =
+    (stp_check_int_parameter(v, "CUPSShrinkPage", STP_PARAMETER_ACTIVE) ?
+     stp_get_int_parameter(v, "CUPSShrinkPage") : 0);
 
   set_string_parameter(v, "JobMode", "Job");
   validate_options(v, cups);
@@ -483,9 +466,9 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
 			 &(cups->bottom), &(cups->top));
   if (! suppress_messages)
     {
-      fprintf(stderr, "DEBUG:   Gutenprint: limits w %d l %d r %d  h %d t %d b %d\n",
+      fprintf(stderr, "DEBUG: Gutenprint:   limits w %d l %d r %d  h %d t %d b %d\n",
 	      cups->width, cups->left, cups->right, cups->height, cups->top, cups->bottom);
-      fprintf(stderr, "DEBUG:   Gutenprint: max limits l %d r %d t %d b %d\n",
+      fprintf(stderr, "DEBUG: Gutenprint:   max limits l %d r %d t %d b %d\n",
 	      tmp_left, tmp_right, tmp_top, tmp_bottom);
     }
 
@@ -509,7 +492,7 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
       else
 	cups->left_trim = 0;
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG:   Gutenprint: left margin %d\n", cups->left_trim);
+	fprintf(stderr, "DEBUG: Gutenprint:   left margin %d\n", cups->left_trim);
     }
   else
     {
@@ -625,9 +608,14 @@ initialize_page(cups_image_t *cups, const stp_vars_t *default_settings,
   if (cups->adjusted_height > cups->header.cupsHeight)
     cups->adjusted_height = cups->header.cupsHeight;
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint:   CUPS settings w %d (%d) l %d r %d  h %d (%d) t %d b %d\n",
-	    cups->width, cups->adjusted_width, cups->left, cups->right,
-	    cups->height, cups->adjusted_height, cups->top, cups->bottom);
+    {
+      fprintf(stderr, "DEBUG: Gutenprint:   CUPS settings w %d l %d r %d  h %d t %d b %d\n",
+	      cups->width, cups->left, cups->right,
+	      cups->height, cups->top, cups->bottom);
+      fprintf(stderr, "DEBUG: Gutenprint:        adjusted w %d h %d\n",
+	      cups->adjusted_width, cups->adjusted_height);
+
+    }
 
   if (! suppress_messages)
     fprintf(stderr, "DEBUG: Gutenprint: End initialize page\n");
@@ -641,8 +629,9 @@ purge_excess_data(cups_image_t *cups)
   if (buffer)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint: Purging %d rows\n",
-		cups->header.cupsHeight - cups->row);
+	fprintf(stderr, "DEBUG: Gutenprint: Purging %d row%s\n",
+		cups->header.cupsHeight - cups->row,
+		((cups->header.cupsHeight - cups->row) == 1 ? "" : "s"));
       while (cups->row < cups->header.cupsHeight)
 	{
 	  cupsRasterReadPixels(cups->ras, (unsigned char *)buffer,
@@ -758,6 +747,8 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	  if (val && ((strlen(val) > 0 && strcmp(val, "None") != 0) ||
 		      (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)))
 	    {
+	      stp_curve_t *curve;
+	      stp_raw_t *raw;
 	      switch (desc.p_type)
 		{
 		case STP_PARAMETER_TYPE_STRING_LIST:
@@ -792,9 +783,30 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 		  stp_set_boolean_parameter
 		    (v, desc.name, strcasecmp(val, "true") == 0 ? 1 : 0);
 		  break;
-		case STP_PARAMETER_TYPE_CURVE: /* figure this out later... */
-		case STP_PARAMETER_TYPE_FILE: /* Probably not, security hole */
+		case STP_PARAMETER_TYPE_CURVE:
+		  curve = stp_curve_create_from_string(val);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set curve %s to %s\n",
+			    desc.name, curve ? val : "(NULL)");
+		  if (curve)
+		    {
+		      stp_set_curve_parameter(v, desc.name, curve);
+		      stp_curve_destroy(curve);
+		    }
+		  break;
 		case STP_PARAMETER_TYPE_RAW: /* figure this out later, too */
+		  raw = stp_xmlstrtoraw(val);
+		  if (! suppress_messages)
+		    fprintf(stderr, "DEBUG: Gutenprint:   Set raw %s to %s\n",
+			    desc.name, raw ? val : "(NULL)");
+		  if (raw)
+		    {
+		      stp_set_raw_parameter(v, desc.name, raw->data, raw->bytes);
+		      stp_free((void *)raw->data);
+		      stp_free(raw);
+		    }
+		  break;
+		case STP_PARAMETER_TYPE_FILE: /* Probably not, security hole */
 		  if (! suppress_messages)
 		    fprintf(stderr, "DEBUG: Gutenprint:   Ignoring option %s %s type %d\n",
 			    desc.name, val, desc.p_type);
@@ -806,13 +818,13 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
 	  else if (val)
 	    {
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint:   Not setting %s to '%s'\n",
+		fprintf(stderr, "DEBUG: Gutenprint:     Not setting %s to '%s'\n",
 			desc.name, val);
 	    }
 	  else
 	    {
 	      if (! suppress_messages)
-		fprintf(stderr, "DEBUG: Gutenprint:   Not setting %s to (null)\n",
+		fprintf(stderr, "DEBUG: Gutenprint:     Not setting %s to (null)\n",
 			desc.name);
 	    }
 	}
@@ -824,6 +836,233 @@ set_all_options(stp_vars_t *v, cups_option_t *options, int num_options,
   stp_parameter_list_destroy(params);
 }
 
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+static void
+save_options(const char *save_name, const stp_vars_t *v)
+{
+  FILE *f_options;
+  int i;
+  stp_vars_t *c = stp_vars_create();
+  stp_parameter_list_t params = stp_get_parameter_list(v);
+  stp_parameter_t desc;
+  stp_mxml_node_t *mxml = NULL;
+  int param_count;
+
+  if (!params)
+    {
+      stp_vars_destroy(c);
+      return;
+    }
+  f_options = fopen(save_name, "w");
+  if (!f_options)
+    {
+      stp_parameter_list_destroy(params);
+      stp_vars_destroy(c);
+      return;
+    }
+  param_count = stp_parameter_list_count(params);
+  stp_set_driver(c, stp_get_driver(v));
+  if (!suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint: Saving parameters to %s\n", save_name);
+  for (i = 0; i < param_count; i++)
+    {
+      const stp_parameter_t *lparam =
+	stp_parameter_list_param(params, i);
+      stp_describe_parameter(v, lparam->name, &desc);
+      if (desc.read_only || !strcmp(desc.name, "ChannelBitDepth") ||
+	  !stp_parameter_has_category_value(v, &desc, "Color", "Yes"))
+	{
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping non-color %s\n",
+		    desc.name);
+	  stp_parameter_description_destroy(&desc);
+	  continue;
+	}
+      switch (desc.p_type)
+	{
+	case STP_PARAMETER_TYPE_STRING_LIST:
+	  if (stp_check_string_parameter(v, desc.name,
+					 STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING string %s %s\n",
+			desc.name, stp_get_string_parameter(v, desc.name));
+	      stp_set_string_parameter(c, desc.name,
+				       stp_get_string_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted string %s %s\n",
+			desc.name, desc.deflt.str);
+	      stp_set_string_parameter(c, desc.name, desc.deflt.str);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping string %s\n", desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_RAW:
+	  if (stp_check_raw_parameter(v, desc.name,
+				      STP_PARAMETER_DEFAULTED))
+	    {
+	      const stp_raw_t *raw = stp_get_raw_parameter(v, desc.name);
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING raw %s\n", desc.name);
+	      stp_set_raw_parameter(c, desc.name, raw->data, raw->bytes);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping raw %s\n",
+		    desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_BOOLEAN:
+	  if (stp_check_boolean_parameter(v, desc.name, STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING bool %s %d\n",
+			desc.name, stp_get_boolean_parameter(v, desc.name));
+	      stp_set_boolean_parameter(c, desc.name,
+					stp_get_boolean_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted bool %s %d\n",
+			desc.name, desc.deflt.boolean);
+	      stp_set_boolean_parameter(c, desc.name, desc.deflt.boolean);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping bool %s\n", desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_INT:
+	  if (stp_check_int_parameter(v, desc.name, STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING int %s %d\n",
+			desc.name, stp_get_int_parameter(v, desc.name));
+	      stp_set_int_parameter(c, desc.name, stp_get_int_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted int %s %d\n",
+			desc.name, desc.deflt.integer);
+	      stp_set_int_parameter(c, desc.name, desc.deflt.integer);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping int %s\n", desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_DOUBLE:
+	  if (stp_check_float_parameter(v, desc.name, STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING float %s %f\n",
+			desc.name, stp_get_float_parameter(v, desc.name));
+	      stp_set_float_parameter(c, desc.name,
+				      stp_get_float_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted float %s %f\n",
+			desc.name, desc.deflt.dbl);
+	      stp_set_float_parameter(c, desc.name, desc.deflt.dbl);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping float %s\n", desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_DIMENSION:
+	  if (stp_check_dimension_parameter(v, desc.name, STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING dimension %s %d\n",
+			desc.name, stp_get_dimension_parameter(v, desc.name));
+	      stp_set_dimension_parameter(c, desc.name,
+					  stp_get_dimension_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted dimension %s %d\n",
+			desc.name, desc.deflt.dimension);
+	      stp_set_dimension_parameter(c, desc.name, desc.deflt.dimension);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping dimension %s\n", desc.name);
+	  break;
+	case STP_PARAMETER_TYPE_CURVE:
+	  if (stp_check_curve_parameter(v, desc.name, STP_PARAMETER_DEFAULTED))
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING curve %s\n", desc.name);
+	      stp_set_curve_parameter(c, desc.name,
+				      stp_get_curve_parameter(v, desc.name));
+	    }
+	  else if (desc.is_mandatory)
+	    {
+	      if (!suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint:  SAVING defaulted curve %s\n", desc.name);
+	      stp_set_curve_parameter(c, desc.name, desc.deflt.curve);
+	    }
+	  else if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:    skipping curve %s\n",
+		    desc.name);
+	  break;
+	default:
+	  if (!suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:   Ignoring unknown type parameter %s (%d)\n",
+		    desc.name, desc.p_type);
+	  break;
+	}
+      stp_parameter_description_destroy(&desc);
+    }
+  stp_parameter_list_destroy(params);
+  mxml = stp_xmltree_create_from_vars(c);
+  if (mxml)
+    {
+      fputs("<?xml version=\"1.0\"?>\n\n", f_options);
+      stp_mxmlSaveFile(mxml, f_options, STP_MXML_NO_CALLBACK);
+      stp_mxmlDelete(mxml);
+    }
+  (void) fclose(f_options);
+  stp_vars_destroy(c);
+  if (!suppress_messages)
+    fprintf(stderr, "DEBUG: Gutenprint: Done saving parameters to %s\n", save_name);
+}
+
+static stp_vars_t *
+load_options(const char *load_name)
+{
+  FILE *f_options = fopen(load_name, "r");
+  if (f_options)
+    {
+      stp_vars_t *settings = NULL;
+      stp_mxml_node_t *mxml;
+      mxml = stp_mxmlLoadFile(NULL, f_options, STP_MXML_NO_CALLBACK);
+      if (mxml)
+	{
+	  stp_mxml_node_t *nxml =
+	    stp_mxmlFindElement(mxml, mxml, "vars", NULL, NULL,
+				STP_MXML_DESCEND);
+	  if (nxml)
+	    {
+	      settings = stp_vars_create_from_xmltree_ref(nxml->child, mxml);
+	      if (! suppress_messages)
+		fprintf(stderr, "DEBUG: Gutenprint: loading options from %s\n",
+			load_file_name);
+	      if (! suppress_messages)
+		stpi_vars_print_error(settings, "DEBUG");
+	    }
+	}
+      else
+	fprintf(stderr, "DEBUG: Unable to load options from %s\n",
+		load_file_name);
+      fclose(f_options);
+      return settings;
+    }
+  return NULL;
+}
+
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
+
 /*
  * 'main()' - Main entry and processing of driver.
  */
@@ -851,6 +1090,10 @@ main(int  argc,				/* I - Number of command-line arguments */
   struct timeval	t1, t2;
   struct timezone	tz;
   char			*page_size_name = NULL;
+  int			aborted = 0;
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+  stp_vars_t		*loaded_settings = NULL;
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
 
 
  /*
@@ -862,6 +1105,9 @@ main(int  argc,				/* I - Number of command-line arguments */
   if (getenv("STP_SUPPRESS_MESSAGES"))
     suppress_messages = 1;
 
+  if (getenv("STP_SUPPRESS_VERBOSE_MESSAGES"))
+    suppress_verbose_messages = 1;
+
  /*
   * Initialize libgutenprint
   */
@@ -893,8 +1139,10 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   if (! suppress_messages)
     {
-      fprintf(stderr, "DEBUG: Gutenprint %s Starting\n", version_id);
-      fprintf(stderr, "DEBUG: Gutenprint command line: %s '%s' '%s' '%s' '%s' %s%s%s%s\n",
+      fprintf(stderr, "DEBUG: Gutenprint: ============================================================\n");
+      fprintf(stderr, "DEBUG: Gutenprint: VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV\n");
+      fprintf(stderr, "DEBUG: Gutenprint: %s Starting\n", version_id);
+      fprintf(stderr, "DEBUG: Gutenprint: command line: %s '%s' '%s' '%s' '%s' %s%s%s%s\n",
 	      argv[0], argv[1], argv[2], argv[3], argv[4], "<args>",
 	      argc >= 7 ? " '" : "",
 	      argc >= 7 ? argv[6] : "",
@@ -911,7 +1159,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     return (1);
   }
   if (! suppress_messages)
-    fprintf(stderr, "DEBUG: Gutenprint using PPD file %s\n", ppdfile);
+    fprintf(stderr, "DEBUG: Gutenprint: using PPD file %s\n", ppdfile);
 
   if ((ppd = ppdOpenFile(ppdfile)) == NULL)
   {
@@ -960,7 +1208,7 @@ main(int  argc,				/* I - Number of command-line arguments */
     fprintf(stderr, "DEBUG: Gutenprint: If you have upgraded your version of Gutenprint\n");
     fprintf(stderr, "DEBUG: Gutenprint: recently, you must reinstall all printer queues.\n");
     fprintf(stderr, "DEBUG: Gutenprint: If the previous installed version of Gutenprint\n");
-    fprintf(stderr, "DEBUG: Gutenprint: was 4.3.19 or higher, you can use the `cups-genppdupdate.%s'\n", release_version_id);
+    fprintf(stderr, "DEBUG: Gutenprint: was 5.0.0 or higher, you can use the `cups-genppdupdate.%s'\n", release_version_id);
     fprintf(stderr, "DEBUG: Gutenprint: program to do this; if the previous installed version\n");
     fprintf(stderr, "DEBUG: Gutenprint: was older, you can use the Modify Printer command via\n");
     fprintf(stderr, "DEBUG: Gutenprint: the CUPS web interface: http://localhost:631/printers.\n");
@@ -988,9 +1236,17 @@ main(int  argc,				/* I - Number of command-line arguments */
     {
       int i;
       for (i = 0; i < num_options; i++)
-	if (! suppress_messages)
-	  fprintf(stderr, "DEBUG: Gutenprint: CUPS option %d %s = %s\n",
-		  i, options[i].name, options[i].value);
+	{
+	  if (! suppress_messages)
+	    fprintf(stderr, "DEBUG: Gutenprint:  CUPS option %d %s = %s\n",
+		    i, options[i].name, options[i].value);
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+	  if (!strcmp(options[i].name, "SaveFileName"))
+	    save_file_name = options[i].value;
+	  if (!strcmp(options[i].name, "LoadFileName"))
+	    load_file_name = options[i].value;
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
+	}
     }
 
  /*
@@ -1031,9 +1287,13 @@ main(int  argc,				/* I - Number of command-line arguments */
     fprintf(stderr, "DEBUG: Gutenprint: Using fd %d\n", fd);
 
   stp_set_printer_defaults(default_settings, printer);
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+  if (load_file_name)
+    loaded_settings = load_options(load_file_name);
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
   stp_set_float_parameter(default_settings, "AppGamma", 1.0);
   set_all_options(default_settings, options, num_options, ppd);
-  stp_merge_printvars(default_settings, stp_printer_get_defaults(printer));
+
   ppdClose(ppd);
 
   cups.ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
@@ -1052,7 +1312,7 @@ main(int  argc,				/* I - Number of command-line arguments */
    * the page.
    */
   signal(SIGTERM, cancel_job);
-  while (cupsRasterReadHeader(cups.ras, &cups.header))
+  while (CUPS_READ_HEADER(cups.ras, &cups.header))
     {
       /*
        * We don't know how many pages we're going to print, and
@@ -1070,10 +1330,25 @@ main(int  argc,				/* I - Number of command-line arguments */
        */
       if (! suppress_messages)
 	{
-	  fprintf(stderr, "DEBUG: Gutenprint: Printing page %d\n", cups.page + 1);
+	  fprintf(stderr, "DEBUG: Gutenprint: ================ Printing page %d      ================\n", cups.page + 1);
 	  fprintf(stderr, "PAGE: %d 1\n", cups.page + 1);
 	}
       v = initialize_page(&cups, default_settings, page_size_name);
+#ifdef ENABLE_CUPS_LOAD_SAVE_OPTIONS
+      if (loaded_settings)
+	stp_copy_vars_from(v, loaded_settings);
+      if (save_file_name)
+	{
+	  save_options(save_file_name, v);
+	  save_file_name = NULL;
+	}
+#endif /* ENABLE_CUPS_LOAD_SAVE_OPTIONS */
+      if (! suppress_messages)
+	{
+	  fprintf(stderr, "DEBUG: Gutenprint: Interim page settings:\n");
+	  stpi_vars_print_error(v, "DEBUG");
+	}
+      stp_merge_printvars(v, stp_printer_get_defaults(printer));
       stp_set_int_parameter(v, "PageNumber", cups.page);
       cups.row = 0;
       if (! suppress_messages)
@@ -1085,7 +1360,8 @@ main(int  argc,				/* I - Number of command-line arguments */
 	  fprintf(stderr, "DEBUG: Gutenprint: Make sure that you are using ESP Ghostscript rather\n");
 	  fprintf(stderr, "DEBUG: Gutenprint: than GNU or AFPL Ghostscript with CUPS.\n");
 	  fprintf(stderr, "DEBUG: Gutenprint: If this is not the cause, set LogLevel to debug to identify the problem.\n");
-	  goto cups_abort;
+	  aborted = 1;
+	  break;
 	}
 
       if (!initialized_job)
@@ -1095,7 +1371,10 @@ main(int  argc,				/* I - Number of command-line arguments */
 	}
 
       if (!stp_print(v, &theImage))
-	  goto cups_abort;
+	{
+	  aborted = 1;
+	  break;
+	}
       print_messages_as_errors = 0;
 
       fflush(stdout);
@@ -1106,13 +1385,14 @@ main(int  argc,				/* I - Number of command-line arguments */
       if (cups.row < cups.header.cupsHeight)
 	purge_excess_data(&cups);
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint: Done printing page %d\n", cups.page + 1);
+	fprintf(stderr, "DEBUG: Gutenprint: ================ Done printing page %d ================\n", cups.page + 1);
       cups.page ++;
     }
   if (v)
     {
       if (! suppress_messages)
-	fprintf(stderr, "DEBUG: Gutenprint: Ending job\n");
+	fprintf(stderr, "DEBUG: Gutenprint: %s job\n",
+		aborted ? "Aborted" : "Ending");
       stp_end_job(v, &theImage);
       fflush(stdout);
       stp_vars_destroy(v);
@@ -1123,43 +1403,22 @@ main(int  argc,				/* I - Number of command-line arguments */
   clocks_per_sec = sysconf(_SC_CLK_TCK);
   fprintf(stderr, "DEBUG: Gutenprint: Printed total %.0f bytes\n",
 	  total_bytes_printed);
-  fprintf(stderr, "DEBUG: Gutenprint: Used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
+  fprintf(stderr, "DEBUG: Gutenprint: Time %.3f user, %.3f sys, %.3f elapsed\n",
 	  (double) tms.tms_utime / clocks_per_sec,
 	  (double) tms.tms_stime / clocks_per_sec,
 	  (double) (t2.tv_sec - t1.tv_sec) +
 	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
-  stp_vars_destroy(default_settings);
-  if (page_size_name)
-    stp_free(page_size_name);
-  if (fd != 0)
-    close(fd);
-  return 0;
-
-cups_abort:
-  if (v)
+  if (!suppress_messages)
     {
-      stp_end_job(v, &theImage);
-      fflush(stdout);
-      stp_vars_destroy(v);
+      fprintf(stderr, "DEBUG: Gutenprint: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n");
+      fprintf(stderr, "DEBUG: Gutenprint: ============================================================\n");
     }
-  cupsRasterClose(cups.ras);
-  clk = times(&tms);
-  (void) gettimeofday(&t2, &tz);
-  clocks_per_sec = sysconf(_SC_CLK_TCK);
-  fprintf(stderr, "DEBUG: Gutenprint: Printed total %.0f bytes\n",
-	  total_bytes_printed);
-  fprintf(stderr, "DEBUG: Gutenprint: Used %.3f seconds user, %.3f seconds system, %.3f seconds elapsed\n",
-	  (double) tms.tms_utime / clocks_per_sec,
-	  (double) tms.tms_stime / clocks_per_sec,
-	  (double) (t2.tv_sec - t1.tv_sec) +
-	  ((double) (t2.tv_usec - t1.tv_usec)) / 1000000.0);
-  stp_i18n_printf(po, _("ERROR: Invalid Gutenprint driver settings!\n"));
   stp_vars_destroy(default_settings);
   if (page_size_name)
     stp_free(page_size_name);
   if (fd != 0)
     close(fd);
-  return 1;
+  return aborted ? 1 : 0;
 }
 
 
@@ -1282,14 +1541,14 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 
   if (cups->row < cups->header.cupsHeight)
   {
-    if (! suppress_messages)
+    if (! suppress_messages && ! suppress_verbose_messages)
       fprintf(stderr, "DEBUG2: Gutenprint: Reading %d %d\n",
 	      bytes_per_line, cups->row);
     while (cups->row <= row && cups->row < cups->header.cupsHeight)
       {
 	if (left_margin > 0)
 	  {
-	    if (! suppress_messages)
+	    if (! suppress_messages && ! suppress_verbose_messages)
 	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing left %d (%d)\n",
 		      left_margin, cups->left_trim);
 	    throwaway_data(left_margin, cups);
@@ -1298,7 +1557,7 @@ Image_get_row(stp_image_t   *image,	/* I - Image */
 	cups->row ++;
 	if (margin + right_margin > 0)
 	  {
-	    if (!suppress_messages)
+	    if (! suppress_messages && ! suppress_verbose_messages)
 	      fprintf(stderr, "DEBUG2: Gutenprint: Tossing right %d (%d) + %d\n",
 		      right_margin, cups->right_trim, margin);
 	    throwaway_data(margin + right_margin, cups);
@@ -1445,5 +1704,5 @@ Image_width(stp_image_t *image)	/* I - Image */
 
 
 /*
- * End of "$Id: rastertoprinter.c,v 1.137 2011/04/09 00:19:59 rlk Exp $".
+ * End of "$Id: rastertoprinter.c,v 1.139 2011/12/18 16:20:31 rlk Exp $".
  */
diff --git a/src/cups/test-ppds b/src/cups/test-ppds
index 4e60d2b..4044b02 100755
--- a/src/cups/test-ppds
+++ b/src/cups/test-ppds
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-make ppd-clean ppd-global ppd-nls ppd-nonls
+make EXTRA_GENPPD_OPTS=-b ppd-clean ppd-global ppd-nls ppd-nonls
 
 # Most non-Macintosh systems won't have the Macintosh-specific profiles
 # installed in Macintosh-specific locations.
diff --git a/src/cups/test-rastertogutenprint.in b/src/cups/test-rastertogutenprint.in
index 97ae27d..9e4f07d 100755
--- a/src/cups/test-rastertogutenprint.in
+++ b/src/cups/test-rastertogutenprint.in
@@ -27,6 +27,7 @@ make_ppds=1
 md5dir=''
 outdir=''
 cupsargs=''
+npages=3
 
 usage() {
     echo "Usage: test-rastertogutenprint [-s] [-v|--valgrind]"
@@ -46,6 +47,7 @@ set_args() {
 	    -O|--output) shift; outdir="$1" ;;
 	    -o|--option) shift; cupsargs="$cupsargs $1" ;;
 	    -m|--md5dir) shift; md5dir="$1" ;;
+	    -p|--pages) shift; npages="$1" ;;
 	    --) shift; args="$@"; return ;;
 	    *) return ;;
 	esac
@@ -53,7 +55,7 @@ set_args() {
     done
 }
 
-set_args `getopt vcgsVnO:m:o: "$@"`
+set_args `getopt hvcgsVnO:m:o:p: "$@"`
 
 if [ -n "$outdir" -a ! -d "$outdir" ] ; then
     mkdir -p "$outdir"
@@ -65,7 +67,7 @@ fi
 version="@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@";
 cupsdir="@cups_conf_serverbin@/filter"
 if [ -x "$cupsdir/pstoraster" -o -x "$cupsdir/cgpdftoraster" ] ; then
-    pages='page-ranges=24-26 '
+    pages="page-ranges=24-`expr 24 + $npages - 1` "
 else
     pages=''
 fi
@@ -91,7 +93,7 @@ fi
 if [ -n "$pdftops" -a ! -x "$cupsdir/cgpdftoraster" ] ; then
     tfile=`mktemp`
     trap cleanup 1 2 3 6 14 15 30
-    $pdftops -f 24 -l 26 "$sdir/../../doc/gutenprint-users-manual.pdf" $tfile
+    $pdftops -f 24 -l `expr 24 + $npages - 1` "$sdir/../../doc/gutenprint-users-manual.pdf" $tfile
 fi
 
 if [ -z "$verbose" ] ; then
@@ -118,10 +120,11 @@ is_duplicate() {
 
 run_rastertogp() {
     case "$valgrind" in
-	1) valgrind $valopts -q --num-callers=100 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
-	2) valgrind $valopts --num-callers=100 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
-	3) valgrind $valopts --error-limit=no --num-callers=100 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	1) valgrind $valopts -q --num-callers=50 --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	2) valgrind $valopts --num-callers=50 --leak-resolution=high --leak-check=yes --error-limit=no ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	3) valgrind $valopts --error-limit=no --num-callers=50 --show-reachable=yes --leak-resolution=high --leak-check=yes ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
 	4) valgrind $valopts ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
+	5) cat ;;
 	*) ./rastertogutenprint.$version 1 1 1 1 "$cupsargs" ;;
     esac
     if [ $? -ne 0 ] ; then
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 67c3f69..eeb6b13 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -111,6 +111,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -187,6 +188,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -207,6 +209,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -230,6 +234,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -276,7 +281,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/escputil/d4lib.c b/src/escputil/d4lib.c
index 04ed24d..0ba46b6 100644
--- a/src/escputil/d4lib.c
+++ b/src/escputil/d4lib.c
@@ -201,7 +201,7 @@ static void printHexValues(const char *dir, const unsigned char *buf, int len)
 #if 0
    len = len > 30 ? 30 : len;
 #endif
-   printf("%s\n",dir);
+   printf("+++%s\n",dir);
    for (i = 0; i < len; i++)
      {
        if (isprint(buf[i]))
@@ -223,11 +223,17 @@ static void printHexValues(const char *dir, const unsigned char *buf, int len)
      print_strings = 1;
    if (print_strings)
      {
+       int print_prefix = 1;
        for (i = 0; i < len; i++)
 	 {
-	   printf("%c",isprint(buf[i])||isspace(buf[i])?buf[i]:'*');
+	   printf("%s%c", (print_prefix ? "+++" : ""),
+		  isprint(buf[i])||isblank(buf[i])?buf[i]:'*');
+	   print_prefix = 0;
 	   if (buf[i] == ';' && i < len - 1)
-	     printf("\n");
+	     {
+	       printf("\n");
+	       print_prefix = 1;
+	     }
 	 }
        printf("\n");
      }
@@ -237,7 +243,7 @@ static void printHexValues(const char *dir, const unsigned char *buf, int len)
        int count = len;
        if (count > baseidx + 16)
 	 count =  baseidx + 16;
-       printf("%4d: ", baseidx);
+       printf("+++ %4d: ", baseidx);
        for ( i = baseidx; i < count;i++)
 	 {
 	   if (i % 4 == 0)
@@ -246,7 +252,7 @@ static void printHexValues(const char *dir, const unsigned char *buf, int len)
 	 }
        if (print_strings)
 	 {
-	   printf("\n      ");
+	   printf("\n+++      ");
 	   for ( i = baseidx; i < count;i++)
 	     {
 	       if (i % 4 == 0)
@@ -312,7 +318,7 @@ static int printError(unsigned char errorNb)
       if ( msg->result == errorNb )
       {
 	 if (debugD4)
-	   printf("%s\n", msg->message);
+	   printf("+++ %s\n", msg->message);
          return msg->errorClass;
       }
       msg++;
@@ -333,6 +339,7 @@ static int printError(unsigned char errorNb)
 
 static void printCmdType(unsigned char *cmd)
 {
+  printf("+++");
    if (cmd[6] & 0x80)
      printf(">>>");
    if ( cmd[0] == 0 && cmd[1] == 0 )
@@ -420,15 +427,15 @@ static int writeCmd(int fd, unsigned char *cmd, int len)
          i += w;
    }
 
+# if PTIME
    if ( debugD4 )
    {
-# if PTIME
       gettimeofday(&end, NULL);
       dt = (end.tv_sec  - beg.tv_sec) * 1000000;
       dt += end.tv_usec - beg.tv_usec;
-      printf("Write time %5.3f s\n",(double)dt/1000000);
-# endif
+      printf("+++Write time %5.3f s\n",(double)dt/1000000);
    }
+# endif
 
    if ( timeoutGot )
       return -1;
@@ -469,7 +476,7 @@ int readAnswer(int fd, unsigned char *buf, int len, int allowExtra)
    gettimeofday(&beg, NULL);
 
    if (debugD4)
-     printf("length: %i\n", len);
+     printf("+++length: %i\n", len);
    while ( total < len )
    {
       SET_TIMER(ti,oti, d4RdTimeout);
@@ -478,7 +485,7 @@ int readAnswer(int fd, unsigned char *buf, int len, int allowExtra)
 	{
 	  if (first_read)
 	    {
-	      printf("read: ");
+	      printf("+++read: ");
 	      first_read = 0;
 	    }
 	  if (rd < 0)
@@ -498,7 +505,7 @@ int readAnswer(int fd, unsigned char *buf, int len, int allowExtra)
          if ( dt > d4RdTimeout * 2 )
          {
             if ( debugD4 )
-               printf("Timeout 1 at readAnswer() rcv %d bytes\n",total);
+               printf("\n+++Timeout 1 at readAnswer() rcv %d bytes",total);
             timeoutGot = 1;
             break;
          }
@@ -523,20 +530,22 @@ int readAnswer(int fd, unsigned char *buf, int len, int allowExtra)
 	    if (len > newlen)
 	      {
 		if (debugD4)
-		  printf("Changing len from %d to %d\n", len, newlen);
+		  printf("\n+++Changing len from %d to %d", len, newlen);
 		len = newlen;
 	      }
 	    else if (len < newlen)
 	      {
 		excess = newlen - len;
 		if (debugD4)
-		  printf("Expected %d, getting %d, %sflushing %d\n",
+		  printf("\n+++Expected %d, getting %d, %sflushing %d",
 			  len, newlen, allowExtra ? "not " : "", excess);
 	      }
          }
       }
       usleep(d4RdTimeout);
    }
+   if (debugD4)
+     printf("\n");
    if (! allowExtra)
      {
        int retry_count = 0;
@@ -567,18 +576,18 @@ int readAnswer(int fd, unsigned char *buf, int len, int allowExtra)
 #  if PTIME
       gettimeofday(&end, NULL);
 #  endif
-      printf("total: %i\n", total);
+      printf("+++total: %i\n", total);
       printHexValues("Recv: ",buf,total);
 #  if PTIME
       dt = (end.tv_sec  - beg.tv_sec) * 1000000;
       dt += end.tv_usec - beg.tv_usec;
-      printf("Read time %5.3f s\n",(double)dt/1000000);
+      printf("+++Read time %5.3f s\n",(double)dt/1000000);
 #  endif
    }
    if ( timeoutGot )
    {
       if ( debugD4 )
-         printf("Timeout 2 at readAnswer()\n");
+         printf("+++Timeout 2 at readAnswer()\n");
       return -1;
    }
    return total;
@@ -601,14 +610,14 @@ static void _flushData(int fd)
    errno = 0;
 
    if (debugD4)
-     printf("flush data: length: %i\n", len);
+     printf("+++flush data: length: %i\n", len);
    do
      {
        usleep(d4RdTimeout);
        SET_TIMER(ti,oti, d4RdTimeout);
        rd = read(fd, buf, len);
        if (debugD4)
-	 printf("flush: read: %i %s\n", rd,
+	 printf("+++flush: read: %i %s\n", rd,
 		 rd < 0 && errno != 0 ?strerror(errno) : "");
        RESET_TIMER(ti,oti);
        count--;
@@ -655,7 +664,7 @@ static int _readData(int fd, unsigned char *buf, int len)
          if ( dt > d4RdTimeout*3 )
          {
             if ( debugD4 )
-               printf("Timeout at _readData(), dt = %ld ms\n", dt);
+               printf("+++Timeout at _readData(), dt = %ld ms\n", dt);
             return -1;
             break;
          }
@@ -674,7 +683,7 @@ static int _readData(int fd, unsigned char *buf, int len)
    {
       toGet = (header[2] >> 8) + header[3] - 6;
       if (debugD4)
-	printf("toGet: %i\n", toGet);
+	printf("+++toGet: %i\n", toGet);
       total = 0;
       gettimeofday(&beg, NULL);
       while ( total < toGet )
@@ -690,7 +699,7 @@ static int _readData(int fd, unsigned char *buf, int len)
             if ( dt > d4RdTimeout*3 )
             {
                if ( debugD4 )
-                  printf("Timeout at _readData(), dt = %ld ms\n",dt);
+                  printf("+++Timeout at _readData(), dt = %ld ms\n",dt);
                return -1;
                break;
             }
@@ -739,7 +748,7 @@ static int sendReceiveCmd(int fd, unsigned char *cmd, int len, unsigned char *an
    {
       /* interrupted write call */
       if ( debugD4 )
-         printf("interrupt received\n");
+         printf("+++interrupt received\n");
       return -1;
    }
    else
@@ -797,13 +806,13 @@ Loop:
    {
       /* no answer from device */
       if (debugD4)
-        printf(">>>No answer from printer\n");
+        printf("+++>>>No answer from printer\n");
       return 0;
    }
    else if ( rd < 0 )
    {
       if (debugD4)
-        printf(">>>Interrupted write\n");
+        printf("+++>>>Interrupted write\n");
       /* interrupted write call */
       return 0;
    }
@@ -953,11 +962,11 @@ int OpenChannel(int fd, unsigned char sockId, int *sndSz, int *rcvSz)
       if ( rd == -1 )
       {
 	if (debugD4)
-	  printf("OpenChannel %d fails, error %d\n", sockId, d4Errno);
+	  printf("+++OpenChannel %d fails, error %d\n", sockId, d4Errno);
 	if (d4Errno == 6)	/* channel already open */
 	  {
 	    if ( debugD4 )
-	      printf("Channel %d already open, closing\n", sockId);
+	      printf("+++Channel %d already open, closing\n", sockId);
 	    CloseChannel(fd, sockId);
 	    continue;
 	  }
@@ -974,7 +983,7 @@ int OpenChannel(int fd, unsigned char sockId, int *sndSz, int *rcvSz)
          else if ( buf[7] != 0 )
          {
 	   if (debugD4)
-	     printf("OpenChannel %d fails, hard error\n", sockId);
+	     printf("+++OpenChannel %d fails, hard error\n", sockId);
             /* hard error */
             return -1;
          }
@@ -987,13 +996,13 @@ int OpenChannel(int fd, unsigned char sockId, int *sndSz, int *rcvSz)
 	if (d4Errno == 6)	/* channel already open */
 	  {
 	    if ( debugD4 )
-	      printf("Channel %d already open, closing\n", sockId);
+	      printf("+++Channel %d already open, closing\n", sockId);
 	    CloseChannel(fd, sockId);
 	    continue;
 	  }
          /* at this stage we can only have an error */
 	if (debugD4)
-	  printf("OpenChannel %d fails, wrong count %d\n", sockId, rd);
+	  printf("+++OpenChannel %d fails, wrong count %d\n", sockId, rd);
          return -1;
       }
    }
@@ -1150,7 +1159,7 @@ int askForCredit(int fd, unsigned char socketID, int *sndSize, int *rcvSize)
          if ( Init(fd) )
          {
 	   if (debugD4)
-	     printf("askForCredit init succeeded, now try to open\n");
+	     printf("+++askForCredit init succeeded, now try to open\n");
             OpenChannel(fd, socketID, sndSize, rcvSize);
          }
       }
@@ -1187,7 +1196,7 @@ int writeData(int fd, unsigned char socketID, const unsigned char *buf, int len,
    static int bLen   = 0;
    if ( debugD4 )
    {
-      printf("--- Send Data      ---\n");
+      printf("+++--- Send Data      ---\n");
       gettimeofday(&beg, NULL);
    }
    len += 6;
@@ -1232,15 +1241,15 @@ int writeData(int fd, unsigned char socketID, const unsigned char *buf, int len,
       dt = (end.tv_sec  - beg.tv_sec) * 1000000;
       dt += end.tv_usec - beg.tv_usec;
 # endif  
-      printf("Send: ");
+      printf("+++Send: ");
       for ( ret = 0; (wr > 0) && (ret < ((wr > 20) ? 20 : wr)) ; ret++ )
          printf("%02x ", buffer[ret]);
-      printf("\n      ");
+      printf("\n+++      ");
       for ( ret = 0; (wr > 0) && (ret < ((wr > 20) ? 20 : wr)) ; ret++ )
          printf("%c  ", isprint(buffer[ret])&&!isspace(buffer[ret])?buffer[ret]:' ');
       printf("\n");
 # if PTIME
-       printf("Write time %5.3f s\n",(double)dt/1000000);
+       printf("+++Write time %5.3f s\n",(double)dt/1000000);
 # endif
    }
 
@@ -1350,7 +1359,7 @@ int writeAndReadData(int fd, unsigned char socketID,
 void flushData(int fd, unsigned char socketID)
 {
   if (debugD4)
-    printf("flushData %d\n", socketID);
+    printf("+++flushData %d\n", socketID);
    /* give credit */
    if (socketID != (unsigned char) -1)
      {
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index ffe4d19..2abec6e 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.104 2010/12/11 22:04:07 rlk Exp $"
+ * "$Id: escputil.c,v 1.108 2012/01/19 13:26:57 m0m Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -264,7 +264,7 @@ exit_packet_mode_old(int do_init)
 {
   static char hdr[] = "\000\000\000\033\001@EJL 1284.4\n@EJL     \n\033@";
   memcpy(printer_cmd + bufpos, hdr, sizeof(hdr) - 1); /* DON'T include null! */
-  STP_DEBUG(printf("Exit packet mode (%d)\n", do_init));
+  STP_DEBUG(printf("***Exit packet mode (%d)\n", do_init));
   bufpos += sizeof(hdr) - 1;
   if (!do_init)
     bufpos -= 2;
@@ -274,7 +274,7 @@ static void
 initialize_print_cmd(int do_init)
 {
   bufpos = 0;
-  STP_DEBUG(printf("Initialize print command\n"));
+  STP_DEBUG(printf("***Initialize print command\n"));
   if (isnew)
     exit_packet_mode_old(do_init);
 }
@@ -283,7 +283,7 @@ static void
 initialize_print_cmd_new(int do_init)
 {
   bufpos = 0;
-  STP_DEBUG(printf("Initialize print command (force new)\n"));
+  STP_DEBUG(printf("***Initialize print command (force new)\n"));
   exit_packet_mode_old(do_init);
 }
 
@@ -445,7 +445,7 @@ print_debug_data(const char *buf, size_t count)
   for (i = 0; i < count; i++)
     {
       if (i % 16 == 0)
-	printf("\n%4d: ", i);
+	printf("\n***%4d: ", i);
       else if (i % 4 == 0)
 	printf(" ");
       if (isgraph(buf[i]))
@@ -498,7 +498,7 @@ do_print_cmd(void)
 	  return 1;
 	}
     }
-  STP_DEBUG(printf("Sending print command to %s:",
+  STP_DEBUG(printf("***Sending print command to %s:",
 		    raw_device ? raw_device : command));
   STP_DEBUG(print_debug_data(printer_cmd, bufpos));
   while (bytes < bufpos)
@@ -573,7 +573,7 @@ read_from_printer(int fd, char *buf, int bufsize, int quiet)
 
   if (status > 0)
     {
-      STP_DEBUG(printf("read_from_printer returns %d\n", status));
+      STP_DEBUG(printf("***read_from_printer returns %d\n", status));
       STP_DEBUG(print_debug_data(buf, status));
     }
   else if (status == 0 && retry == 0)
@@ -596,7 +596,7 @@ start_remote_sequence(void)
   static char remote_hdr[] = "\033@\033(R\010\000\000REMOTE1";
   memcpy(printer_cmd + bufpos, remote_hdr, sizeof(remote_hdr) - 1);
   bufpos += sizeof(remote_hdr) - 1;
-  STP_DEBUG(printf("Start remote sequence\n"));
+  STP_DEBUG(printf("***Start remote sequence\n"));
 }
 
 static void
@@ -605,7 +605,7 @@ end_remote_sequence(void)
   static char remote_trailer[] = "\033\000\000\000\033\000";
   memcpy(printer_cmd + bufpos, remote_trailer, sizeof(remote_trailer) - 1);
   bufpos += sizeof(remote_trailer) - 1;
-  STP_DEBUG(printf("End remote sequence\n"));
+  STP_DEBUG(printf("***End remote sequence\n"));
 }
 
 static void
@@ -617,7 +617,7 @@ do_remote_cmd(const char *cmd, int nargs, ...)
 
   start_remote_sequence();
   memcpy(printer_cmd + bufpos, cmd, 2);
-  STP_DEBUG(printf("Remote command: %s", cmd));
+  STP_DEBUG(printf("***Remote command: %s", cmd));
   bufpos += 2;
   printer_cmd[bufpos] = nargs % 256;
   printer_cmd[bufpos + 1] = (nargs >> 8) % 256;
@@ -634,6 +634,7 @@ do_remote_cmd(const char *cmd, int nargs, ...)
   STP_DEBUG(printf("\n"));
   bufpos += 2 + nargs;
   end_remote_sequence();
+  va_end(args);
 }
 
 static void
@@ -644,7 +645,7 @@ do_remote_cmd_only(const char *cmd, int nargs, ...)
   va_start(args, nargs);
 
   memcpy(printer_cmd + bufpos, cmd, 2);
-  STP_DEBUG(printf("Remote command: %s", cmd));
+  STP_DEBUG(printf("***Remote command: %s", cmd));
   bufpos += 2;
   printer_cmd[bufpos] = nargs % 256;
   printer_cmd[bufpos + 1] = (nargs >> 8) % 256;
@@ -660,13 +661,14 @@ do_remote_cmd_only(const char *cmd, int nargs, ...)
       }
   STP_DEBUG(printf("\n"));
   bufpos += 2 + nargs;
+  va_end(args);
 }
 
 static void
 add_resets(int count)
 {
   int i;
-  STP_DEBUG(printf("Add %d resets\n", count));
+  STP_DEBUG(printf("***Add %d resets\n", count));
   for (i = 0; i < count; i++)
     {
       printer_cmd[bufpos++] = '\033';
@@ -674,7 +676,7 @@ add_resets(int count)
     }
 }
 
-static int
+static void
 send_nulls(int fd)
 {
   char buf[16384];
@@ -687,35 +689,35 @@ init_packet(int fd, int force)
 {
   int status;
   int tries = 0;
-  STP_DEBUG(printf("Init packet mode %d\n", force));
+  STP_DEBUG(printf("***Init packet mode %d\n", force));
 
  Loop:
   if (!force)
     {
-      STP_DEBUG(printf("Flushing early data...\n"));
+      STP_DEBUG(printf("***Flushing early data...\n"));
       flushData(fd, (unsigned char) -1);
     }
 
-  STP_DEBUG(printf("EnterIEEE...\n"));
+  STP_DEBUG(printf("***EnterIEEE...\n"));
   if (!EnterIEEE(fd))
     {
-      STP_DEBUG(printf("EnterIEEE failed!\n"));
+      STP_DEBUG(printf("***EnterIEEE failed!\n"));
       if (tries++ < 5)
 	{
-	  STP_DEBUG(printf("Retrying\n"));
+	  STP_DEBUG(printf("***Retrying\n"));
 	  send_nulls(fd);
 	  flushData(fd, (unsigned char) -1);
 	  goto Loop;
 	}
       return 1;
     }
-  STP_DEBUG(printf("Init...\n"));
+  STP_DEBUG(printf("***Init...\n"));
   if (!Init(fd))
     {
-      STP_DEBUG(printf("Init failed!\n"));
+      STP_DEBUG(printf("***Init failed!\n"));
       if (tries++ < 5)
 	{
-	  STP_DEBUG(printf("Retrying\n"));
+	  STP_DEBUG(printf("***Retrying\n"));
 	  send_nulls(fd);
 	  flushData(fd, (unsigned char) -1);
 	  goto Loop;
@@ -723,28 +725,28 @@ init_packet(int fd, int force)
       return 1;
     }
 
-  STP_DEBUG(printf("GetSocket...\n"));
+  STP_DEBUG(printf("***GetSocket...\n"));
   socket_id = GetSocketID(fd, "EPSON-CTRL");
   if (!socket_id)
     {
-      STP_DEBUG(printf("GetSocket failed!\n"));
+      STP_DEBUG(printf("***GetSocket failed!\n"));
       return 1;
     }
-  STP_DEBUG(printf("OpenChannel...\n"));
+  STP_DEBUG(printf("***OpenChannel...\n"));
   switch ( OpenChannel(fd, socket_id, &send_size, &receive_size) )
     {
     case -1:
-      STP_DEBUG(printf("Fatal Error return 1\n"));
+      STP_DEBUG(printf("***Fatal Error return 1\n"));
       return 1; /* unrecoverable error */
       break;
     case  0:
-      STP_DEBUG(printf("Error\n")); /* recoverable error ? */
+      STP_DEBUG(printf("***Error\n")); /* recoverable error ? */
       return 1;
       break;
     }
 
   status = 1;
-  STP_DEBUG(printf("Flushing data...\n"));
+  STP_DEBUG(printf("***Flushing data...\n"));
   flushData(fd, socket_id);
   return 0;
 }
@@ -813,7 +815,7 @@ set_printer_model(void)
 	      if (desc.p_type == STP_PARAMETER_TYPE_BOOLEAN)
 		interchangeable_inks = desc.deflt.boolean;
 	      stp_parameter_description_destroy(&desc);
-	      STP_DEBUG(printf("Found it! %s\n", printer_model));
+	      STP_DEBUG(printf("***Found it! %s\n", printer_model));
 	      return;
 	    }
 	}
@@ -870,14 +872,14 @@ initialize_printer(int quiet, int fail_if_not_found)
 	  status = SafeWrite(fd, init_str, sizeof(init_str) - 1);
 	  alarm(0);
 	  signal(SIGALRM, SIG_DFL);
-	  STP_DEBUG(printf("status %d alarm %d\n", status, alarm_interrupt));
+	  STP_DEBUG(printf("***status %d alarm %d\n", status, alarm_interrupt));
 	  if (status != sizeof(init_str) - 1 && (status != -1 || !alarm_interrupt))
 	    {
 	      fprintf(stderr, _("Cannot write to %s: %s\n"), raw_device,
 		      strerror(errno));
 	      exit(1);
 	    }
-	  STP_DEBUG(printf("Try old command %d alarm %d\n",
+	  STP_DEBUG(printf("***Try old command %d alarm %d\n",
 			    tries, alarm_interrupt));
 	  status = read_from_printer(fd, (char*)buf, 1024, 1);
 	  if (status <= 0 && tries > 0)
@@ -888,7 +890,7 @@ initialize_printer(int quiet, int fail_if_not_found)
 	  if (!forced_packet_mode &&
 	      status > 0 && !strstr((char *) buf, "@EJL ID") && tries < 3)
 	    {
-	      STP_DEBUG(printf("Found bad data: %s\n", buf));
+	      STP_DEBUG(printf("***Found bad data: %s\n", buf));
 	      /*
 	       * We know the printer's not dead.  Try to turn off status
 	       * and try again.
@@ -914,7 +916,7 @@ initialize_printer(int quiet, int fail_if_not_found)
 	  (void) SafeWrite(fd, printer_cmd, bufpos);
 	  flushData(fd, (unsigned char) -1);
 	  forced_packet_mode = !init_packet(fd, 1);
-	  STP_DEBUG(printf("Printer in packet mode....\n"));
+	  STP_DEBUG(printf("***Printer in packet mode....\n"));
 	  packet_initialized = 1;
 	  isnew = 1;
 	  /* request status command */
@@ -930,24 +932,38 @@ initialize_printer(int quiet, int fail_if_not_found)
 	      return NULL;
 	    }
 	}
-      STP_DEBUG(printf("status: %i\n", status));
-      STP_DEBUG(printf("Buf: %s\n", buf));
+      STP_DEBUG(printf("***status: %i\n", status));
+      STP_DEBUG(printf("***Buf: %s\n", buf));
       if (status > 0)
 	{
+	  char *xpos;
 	  pos = strstr((char*)buf, "@EJL ID");
-	  STP_DEBUG(printf("pos: %s\n", pos ? pos : "(null)"));
-	  if (pos)
-	    pos = strchr(pos, (int) ';');
-	  STP_DEBUG(printf("pos: %s\n", pos ? pos : "(null)"));
-	  if (pos)
-	    pos = strchr(pos + 1, (int) ';');
-	  STP_DEBUG(printf("pos: %s\n", pos ? pos : "(null)"));
-	  if (pos)
-	    pos = strchr(pos, (int) ':');
-	  STP_DEBUG(printf("pos: %s\n", pos ? pos : "(null)"));
+	  STP_DEBUG(printf("***pos: %s\n", pos ? pos : "(null)"));
 	  if (pos)
 	    {
-	      spos = strchr(pos, (int) ';');
+	      if (((xpos = strstr((char *)pos, "MDL:")) != NULL) ||
+		  ((xpos = strstr((char *)pos, "DES:")) != NULL))
+		{
+		  STP_DEBUG(printf("***xpos: %s\n", xpos ? xpos : "(null)"));
+		  pos = xpos + 4;
+		  STP_DEBUG(printf("***pos: %s\n", pos ? pos : "(null)"));
+		}
+	      else
+		{
+		  if (pos)
+		    pos = strchr(pos, (int) ';');
+		  STP_DEBUG(printf("***pos: %s\n", pos ? pos : "(null)"));
+		  if (pos)
+		    pos = strchr(pos + 1, (int) ';');
+		  STP_DEBUG(printf("***pos: %s\n", pos ? pos : "(null)"));
+		  if (pos)
+		    pos = strchr(pos, (int) ':');
+		  STP_DEBUG(printf("***pos: %s\n", pos ? pos : "(null)"));
+		  if (pos)
+		    pos++;
+		}
+	      if (pos)
+		spos = strchr(pos, (int) ';');
 	    }
 	  if (!pos)
 	    {
@@ -972,12 +988,12 @@ initialize_printer(int quiet, int fail_if_not_found)
 		   * However, make it clear that this is a dummy,
 		   * so we don't actually try to print it out.
 		   */
-		  STP_DEBUG(printf("Can't find printer name, assuming Stylus Photo\n"));
+		  STP_DEBUG(printf("***Can't find printer name, assuming Stylus Photo\n"));
 		  printer_model = c_strdup("escp2-photo");
 		}
 	      else
 		{
-		  STP_DEBUG(printf("Can't get response to @EJL ID\n"));
+		  STP_DEBUG(printf("***Can't get response to @EJL ID\n"));
 		  close(fd);
 		  return NULL;
 		}
@@ -986,8 +1002,8 @@ initialize_printer(int quiet, int fail_if_not_found)
 	    {
 	      if (spos)
 		*spos = '\000';
-	      printer_model = pos + 1;
-	      STP_DEBUG(printf("printer model: %s\n", printer_model));
+	      printer_model = pos;
+	      STP_DEBUG(printf("***printer model: %s\n", printer_model));
 	    }
 	}
     }
@@ -1000,7 +1016,7 @@ initialize_printer(int quiet, int fail_if_not_found)
     }
 
   close(fd);
-  STP_DEBUG(printf("new? %s\n", isnew ? "yes" : "no"));
+  STP_DEBUG(printf("***new? %s\n", isnew ? "yes" : "no"));
   return the_printer_t;
 }
 
@@ -1013,7 +1029,7 @@ get_printer(int quiet, int fail_if_not_found)
     {
       const stp_printer_t *printer =
 	initialize_printer(quiet, fail_if_not_found);
-      STP_DEBUG(printf("init done, printer found? %s...\n",
+      STP_DEBUG(printf("***init done, printer found? %s...\n",
 			printer ? "yes" : "no"));
       return printer;
     }
@@ -1303,7 +1319,7 @@ do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer)
 	      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 		{
 		  color_list = stp_string_list_create_copy(desc.bounds.str);
-		  STP_DEBUG(printf("Using color list from driver (%ld %ld)\n",
+		  STP_DEBUG(printf("***Using color list from driver (%ld %ld)\n",
 				   (long)stp_string_list_count(desc.bounds.str),
 				   (long)stp_string_list_count(color_list)));
 		  stp_parameter_description_destroy(&desc);
@@ -1327,7 +1343,7 @@ do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer)
 	  if (cmd == CMD_STATUS)
 	    printf("\n");
 	}
-      STP_DEBUG(printf("looking at %s\n", buf));
+      STP_DEBUG(printf("***looking at %s\n", buf));
     } while ((buf = find_group(buf)) != NULL);
 }  
 
@@ -1340,11 +1356,16 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
   const char *ind;
   const stp_string_list_t *color_list = NULL;
   stp_parameter_t desc;
-  const stp_vars_t *printvars = stp_printer_get_defaults(printer);
-  stp_describe_parameter(printvars, "ChannelNames", &desc);
-  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
-    color_list = desc.bounds.str;
-  STP_DEBUG(printf("New format bytes: %d bytes\n", bytes));
+
+  const stp_vars_t *printvars = NULL;
+  if (printer)
+    {
+      printvars = stp_printer_get_defaults(printer);
+      stp_describe_parameter(printvars, "ChannelNames", &desc);
+      if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+        color_list = desc.bounds.str;
+    }
+  STP_DEBUG(printf("***New format bytes: %d bytes\n", bytes));
   if (cmd == CMD_STATUS)
     printf(_("Printer Name: %s\n"),
 	    printer ? stp_printer_get_long_name(printer) : _("Unknown"));
@@ -1353,7 +1374,7 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
       unsigned hdr = buf[i];
       unsigned total_param_count = buf[i + 1];
       unsigned param = buf[i + 2];
-      STP_DEBUG(printf("Header: %x param count: %d\n", hdr, total_param_count));
+      STP_DEBUG(printf("***Header: %x param count: %d\n", hdr, total_param_count));
       if (hdr == 0x0f)	/* Always report ink */
 	{
 	  size_t count = (total_param_count - 1) / param;
@@ -1363,26 +1384,26 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	  printf("%20s    %20s\n", _("Ink color"), _("Percent remaining"));
 	  for (j = 0; j < count; j++)
 	    {
-	      STP_DEBUG(printf("    Ink %d: ind[0] %d ind[1] %d ind[2] %d interchangeable %d param %d count %d aux %d\n",
+	      STP_DEBUG(printf("***    Ink %d: ind[0] %d ind[1] %d ind[2] %d interchangeable %d param %d count %d aux %d\n",
 				j, ind[0], ind[1], ind[2], interchangeable_inks,
 				param, color_count, aux_color_count));
 	      if (ind[0] < color_count && param == 3 /* &&
 		  (interchangeable_inks || ind[1] >= aux_color_count ||
 		   ! aux_colors[(int) ind[1]]) */)
 		{
-		  STP_DEBUG(printf("Case 0\n"));
+		  STP_DEBUG(printf("***Case 0\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]])
 		{
-		  STP_DEBUG(printf("Case 1\n"));
+		  STP_DEBUG(printf("***Case 1\n"));
 		  printf("%20s    %20d\n",
 			 gettext(aux_colors[(int) ind[1]]), ind[2]);
 		}
 	      else
 		{
-		  STP_DEBUG(printf("Case 2\n"));
+		  STP_DEBUG(printf("***Case 2\n"));
 		  printf("%8s 0x%02x 0x%02x    %20d\n",
 			 _("Unknown"), (unsigned char) ind[0],
 			 (unsigned char) ind[1], ind[2]);
@@ -1428,7 +1449,8 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	}
       i += total_param_count + 2;
     }
-  stp_parameter_description_destroy(&desc);
+  if (printer)
+    stp_parameter_description_destroy(&desc);
   exit(0);
 }
 
@@ -1457,10 +1479,10 @@ do_status_command_internal(status_cmd_t cmd)
       exit(1);
     }
 
-  STP_DEBUG(printf("%s...\n", cmd_name));
+  STP_DEBUG(printf("***%s...\n", cmd_name));
   printer = get_printer(1, 0);
   if (!found_unknown_old_printer)
-    STP_DEBUG(printf("%s found %s%s\n", gettext(cmd_name),
+    STP_DEBUG(printf("***%s found %s%s\n", gettext(cmd_name),
 		      printer ? stp_printer_get_long_name(printer) :
 		      printer_model ? printer_model : "(null)",
 		      printer ? "" : "(Unknown model)"));
@@ -1561,7 +1583,7 @@ do_extended_ink_info(int extended_output)
 
       if (printer && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 	{
-	  STP_DEBUG(printf("Using color list from driver (%ld %ld)\n",
+	  STP_DEBUG(printf("***Using color list from driver (%ld %ld)\n",
 			    (long)stp_string_list_count(desc.bounds.str),
 			    (long)stp_string_list_count(color_list)));
 	  color_list = stp_string_list_create_copy(desc.bounds.str);
@@ -1590,7 +1612,7 @@ do_extended_ink_info(int extended_output)
 	  buf[status] = '\0';
 	  if ( buf[7] == '2' )
 	    {
-	      STP_DEBUG(printf("New format ink!\n"));
+	      STP_DEBUG(printf("***New format ink!\n"));
 	      /* new binary format ! */
 	      i = 10;
 	      while (buf[i] != 0x0f && i < status)
@@ -1601,7 +1623,7 @@ do_extended_ink_info(int extended_output)
 		{
 		  if (ind[i] < color_count)
 		    {
-		      STP_DEBUG(printf("   Case 0: Ink %d %d (%s)\n",
+		      STP_DEBUG(printf("***   Case 0: Ink %d %d (%s)\n",
 				       i, ind[i], colors_new[(int) ind[i]]));
 		      stp_string_list_add_string(color_list,
 						 colors_new[(int) ind[i]],
@@ -1609,7 +1631,7 @@ do_extended_ink_info(int extended_output)
 		    }
 		  else if (ind[i] == 0x40 && ind[i + 1] < aux_color_count)
 		    {
-		      STP_DEBUG(printf("   Case 1: Ink %d %d (%s)\n",
+		      STP_DEBUG(printf("***   Case 1: Ink %d %d (%s)\n",
 				       i, ind[i+1], aux_colors[(int) ind[i+1]]));
 		      stp_string_list_add_string(color_list,
 						 aux_colors[(int) ind[i + 1]],
@@ -1617,14 +1639,14 @@ do_extended_ink_info(int extended_output)
 		    }
 		  else
 		    {
-		      STP_DEBUG(printf("   Case 2: Unknown\n"));
+		      STP_DEBUG(printf("***   Case 2: Unknown\n"));
 		      stp_string_list_add_string(color_list, "Unknown",
 						 "Unknown");
 		    }
 		  i+=3;
 		}
 	    }
-	  STP_DEBUG(printf("Using color list from status message\n"));
+	  STP_DEBUG(printf("***Using color list from status message\n"));
 	}
 
       for (i = 0; i < stp_string_list_count(color_list); i++)
@@ -1643,7 +1665,7 @@ do_extended_ink_info(int extended_output)
 	  ind = strchr(buf, 'I');
 	  if (!ind)
 	    {
-	      STP_DEBUG(printf("Case 0: failure %i (%s)\n", i, buf));
+	      STP_DEBUG(printf("***Case 0: failure %i (%s)\n", i, buf));
 	      printf("Cannot identify cartridge in slot %d\n", i);
 	    }
 	  else if (sscanf(ind,
@@ -1658,7 +1680,7 @@ do_extended_ink_info(int extended_output)
 			  &year2, &month2, &id2) == 12)
 	    {
 	      int j;
-	      STP_DEBUG(printf("Case 1: i %i iv %ud %ud %ud %ud %ud %ud year %ud %ud mo %ud %ud id %ud %ud\n",
+	      STP_DEBUG(printf("***Case 1: i %i iv %ud %ud %ud %ud %ud %ud year %ud %ud mo %ud %ud id %ud %ud\n",
 				i, iv[0], iv[1], iv[2], iv[3], iv[4], iv[5],
 				year, year2, month, month2, id, id2));
 	      printf("%20s    %20s   %12s   %7s\n",
@@ -1685,7 +1707,7 @@ do_extended_ink_info(int extended_output)
 			  &year2, &month2, &id2) == 10)
 	    {
 	      int j;
-	      STP_DEBUG(printf("Case 2: i %i iv %ud %ud %ud %ud year %ud %ud mo %ud %ud id %ud %ud\n",
+	      STP_DEBUG(printf("***Case 2: i %i iv %ud %ud %ud %ud year %ud %ud mo %ud %ud id %ud %ud\n",
 				i, iv[0], iv[1], iv[2], iv[3],
 				year, year2, month, month2, id, id2));
 	      printf("%20s    %20s   %12s   %7s\n",
@@ -1707,7 +1729,7 @@ do_extended_ink_info(int extended_output)
 			  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
 			  &val, &year, &month, &id ) == 4)
 	    {
-	      STP_DEBUG(printf("Case 3: i %i val %ud year %ud mo %ud id %ud\n",
+	      STP_DEBUG(printf("***Case 3: i %i val %ud year %ud mo %ud id %ud\n",
 				i, val, year, month, id));
 	      if (i == 0)
 		printf("%20s    %20s   %12s   %7s\n",
@@ -1724,7 +1746,7 @@ do_extended_ink_info(int extended_output)
 			  "IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
 			  &val, &year, &month, &id ) == 4)
 	    {
-	      STP_DEBUG(printf("Case 4: i %i val %ud year %ud mo %ud id %ud\n",
+	      STP_DEBUG(printf("***Case 4: i %i val %ud year %ud mo %ud id %ud\n",
 				i, val, year, month, id));
 	      if (i == 0)
 		printf("%20s    %20s   %12s   %7s\n",
@@ -1736,7 +1758,7 @@ do_extended_ink_info(int extended_output)
 	    }
 	  else
 	    {
-	      STP_DEBUG(printf("Case 5: failure %i (%s)\n", i, ind));
+	      STP_DEBUG(printf("***Case 5: failure %i (%s)\n", i, ind));
 	      printf("Cannot identify cartridge in slot %d\n", i);
 	    }
 	}
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index fc5880d..bc5666d 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.53 2010/08/07 02:30:38 rlk Exp $
+## $Id: Makefile.am,v 1.56 2011/12/24 02:10:46 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -91,12 +91,12 @@ install-kit:
 	fi
 
 clean-local:
-	-$(RM) -r foomatic-db
+	-$(RM) -rf foomatic-db
 
 foomatic-data: foomatic-stamp
 
 foomatic-stamp: foomatic-generator $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp
-	-$(RM) -r foomatic-db
+	-$(RM) -rf foomatic-db
 	$(FOOMATIC_GENERATOR) -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	touch foomatic-stamp
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index a1f28f3..74f9922 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -130,6 +130,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -206,6 +207,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -226,6 +228,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -249,6 +253,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -295,7 +300,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -674,12 +678,12 @@ install-kit:
 	fi
 
 clean-local:
-	-$(RM) -r foomatic-db
+	-$(RM) -rf foomatic-db
 
 foomatic-data: foomatic-stamp
 
 foomatic-stamp: foomatic-generator $(noinst_PROGRAMS) mk_printerlist $(top_builddir)/src/xml/xml-stamp
-	-$(RM) -r foomatic-db
+	-$(RM) -rf foomatic-db
 	$(FOOMATIC_GENERATOR) -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	$(FOOMATIC_GENERATOR) -s -t $(srcdir)/foomatic-templates $(FOOMATIC_GENERATOR_EXTRA_OPTS) $(FOOMATIC_GENERATOR_FOOMATIC_3_OPTS)
 	touch foomatic-stamp
diff --git a/src/foomatic/foomatic-generator.in b/src/foomatic/foomatic-generator.in
index 69a8e7e..626bc9c 100644
--- a/src/foomatic/foomatic-generator.in
+++ b/src/foomatic/foomatic-generator.in
@@ -89,8 +89,6 @@ my @parameter_level_names = (
 my $option_remap = "";
 my $opt_index = 0;
 
-use Data::Dumper;
-
 if (! $opt_x) {
     open PIPE, "./printer_options $simplified_subopt|" or die "Cannot run printer_options: $!\n";
     print STDERR "Loading options from ./printer_options $simplified_subopt...";
@@ -1284,21 +1282,36 @@ sub qualityorder {
 		    "dpi_high2",
 		    "dpi_high3",
 		    "dpi_high4",
+		    "dpi_high5",
 		    "dpi_highmono",
 		    "dpi_highmono2",
+		    "dpi_highmono3",
+		    "dpi_highmono4",
+		    "dpi_highmono5",
 		    "dpi_mono",
+		    "dpi_mono2",
+		    "dpi_mono3",
+		    "dpi_mono4",
+		    "dpi_mono5",
 		    "dpi_draft",
 		    "dpi_draft2",
 		    "dpi_draft3",
+		    "dpi_draft4",
+		    "dpi_draft5",
                     "dpi_std2",
                     "dpi_std3",
+                    "dpi_std4",
+                    "dpi_std5",
 		    "dpi_draftmono",
 		    "dpi_draftmono2",
-		    "dpi_glossphotohigh",
+		    "dpi_draftmono3",
+		    "dpi_draftmono4",
+		    "dpi_draftmono5",
 		    "dpi_photohigh",
 		    "dpi_photohigh2",
 		    "dpi_photohigh3",
 		    "dpi_photohigh4",
+		    "dpi_photohigh5",
 	            "dpi_tshirt",
 		    "dpi_photomed",
 		    "dpi_photomed2",
@@ -1306,13 +1319,19 @@ sub qualityorder {
 		    "dpi_photo2",
 		    "dpi_photo3",
 		    "dpi_photo4",
+		    "dpi_photo5",
 		    "dpi_photodraft",
 		    "dpi_photodraft2",
 		    "dpi_photodraft3",
+		    "dpi_photodraft4",
+		    "dpi_photodraft5",
 		    "dpi_photomonohigh",
+		    "dpi_photomonohigh2",
 		    "dpi_photomonomed",
 		    "dpi_photomono",
+		    "dpi_photomono2",
 		    "dpi_photomonodraft",
+		    "dpi_photomonodraft2",
                     "dpi_ohphigh",
                     "dpi_ohp"
 		    );
diff --git a/src/foomatic/foomatic-templates-ijs/gutenprint.xml b/src/foomatic/foomatic-templates-ijs/gutenprint.xml
index 399dd8d..040ccf6 100644
--- a/src/foomatic/foomatic-templates-ijs/gutenprint.xml
+++ b/src/foomatic/foomatic-templates-ijs/gutenprint.xml
@@ -3,7 +3,7 @@
  <url>http://gimp-print.sourceforge.net/</url>
  <execution>
   <filter />
-  <prototype>gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=ijs -sIjsServer=ijsgutenprint.@@STPREL@@ -dIjsUseOutputFD%A -sIjsParams=&quot;@@REMAP@@STP_VERSION=@@STPVER@@,%B&quot;%Z -sOutputFile=- -</prototype>
+  <prototype>gs -q -dPARANOIDSAFER -dNOPAUSE -dBATCH -dNOINTERPOLATE -sDEVICE=ijs -sIjsServer=ijsgutenprint.@@STPREL@@ -dIjsUseOutputFD%A -sIjsParams=&quot;@@REMAP@@STP_VERSION=@@STPVER@@,%B&quot;%Z -sOutputFile=- -</prototype>
  </execution>
  <comments>
   <en>
diff --git a/src/foomatic/printer_options.c b/src/foomatic/printer_options.c
index a5b4c45..331d32e 100644
--- a/src/foomatic/printer_options.c
+++ b/src/foomatic/printer_options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_options.c,v 1.52 2007/05/06 19:38:10 rlk Exp $"
+ * "$Id: printer_options.c,v 1.53 2012/05/26 15:57:35 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -186,6 +186,7 @@ main(int argc, char **argv)
 				  printf("$$x_t{'%s'} = '%d';",param->name, x);
 				  printf("$$y_t{'%s'} = '%d';",param->name, y);
 				}
+			      stp_clear_string_parameter(pv, "Resolution");
 			    }
 			}
 		      printf("}\n");
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 52ec7dd..38c9823 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -121,6 +121,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -197,6 +198,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -217,6 +219,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -240,6 +244,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -286,7 +291,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index f059394..9228e74 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -115,6 +115,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -191,6 +192,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -211,6 +213,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -234,6 +238,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -280,7 +285,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/gimp2/print.c b/src/gimp2/print.c
index dd76d83..65e8015 100644
--- a/src/gimp2/print.c
+++ b/src/gimp2/print.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print.c,v 1.8 2006/07/04 02:57:59 rlk Exp $"
+ * "$Id: print.c,v 1.9 2012/01/19 13:25:51 m0m Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -295,6 +295,7 @@ run (const char        *name,		/* I - Name of print program. */
 	    case 0:
 	    default:
 	      stp_set_string_parameter(gimp_vars.v, "PrintingMode", "BW");
+	      break;
 	    case 1:
 	      stp_set_string_parameter(gimp_vars.v, "PrintingMode", "Color");
 	    }
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 122ba64..e5fb61f 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -155,6 +155,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -231,6 +232,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -251,6 +253,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -274,6 +278,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -320,7 +325,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index 9e47848..088e296 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/printrcl.c
@@ -717,7 +717,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "printrcl.l"
 /*		-*-Mode: C-*-
- * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: printrcl.l,v 1.2 2012/05/11 13:16:12 rlk Exp $"
  *
  *   printrc parser
  *
@@ -756,6 +756,8 @@ char *yytext;
 
 int mylineno = 1;
 
+extern YYSTYPE yylval;
+
 #define DBG(x)						\
 do							\
   {							\
@@ -774,7 +776,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 778 "printrcl.c"
+#line 780 "printrcl.c"
 
 #define INITIAL 0
 
@@ -956,10 +958,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 73 "printrcl.l"
+#line 75 "printrcl.l"
 
 
-#line 963 "printrcl.c"
+#line 965 "printrcl.c"
 
 	if ( !(yy_init) )
 		{
@@ -1044,208 +1046,208 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 75 "printrcl.l"
+#line 77 "printrcl.l"
 DBG(CURRENT_PRINTER); return CURRENT_PRINTER;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 76 "printrcl.l"
+#line 78 "printrcl.l"
 DBG(SHOW_ALL_PAPER_SIZES); return SHOW_ALL_PAPER_SIZES;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 77 "printrcl.l"
+#line 79 "printrcl.l"
 DBG(PRINTER); return PRINTER;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 78 "printrcl.l"
+#line 80 "printrcl.l"
 DBG(DESTINATION); return DESTINATION;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 79 "printrcl.l"
+#line 81 "printrcl.l"
 DBG(SCALING); return SCALING;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 80 "printrcl.l"
+#line 82 "printrcl.l"
 DBG(ORIENTATION); return ORIENTATION;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 81 "printrcl.l"
+#line 83 "printrcl.l"
 DBG(AUTOSIZE_ROLL_PAPER); return AUTOSIZE_ROLL_PAPER;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 82 "printrcl.l"
+#line 84 "printrcl.l"
 DBG(UNIT); return UNIT;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 83 "printrcl.l"
+#line 85 "printrcl.l"
 DBG(DRIVER); return DRIVER;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 84 "printrcl.l"
+#line 86 "printrcl.l"
 DBG(LEFT); return LEFT;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 85 "printrcl.l"
+#line 87 "printrcl.l"
 DBG(TOP); return TOP;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 86 "printrcl.l"
+#line 88 "printrcl.l"
 DBG(CUSTOM_PAGE_WIDTH); return CUSTOM_PAGE_WIDTH;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 87 "printrcl.l"
+#line 89 "printrcl.l"
 DBG(CUSTOM_PAGE_HEIGHT); return CUSTOM_PAGE_HEIGHT;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 88 "printrcl.l"
+#line 90 "printrcl.l"
 DBG(OUTPUT_TYPE); return OUTPUT_TYPE;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 89 "printrcl.l"
+#line 91 "printrcl.l"
 DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 90 "printrcl.l"
+#line 92 "printrcl.l"
 DBG(QUEUE_NAME); return QUEUE_NAME;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 91 "printrcl.l"
+#line 93 "printrcl.l"
 DBG(OUTPUT_FILENAME); return OUTPUT_FILENAME;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 92 "printrcl.l"
+#line 94 "printrcl.l"
 DBG(EXTRA_PRINTER_OPTIONS); return EXTRA_PRINTER_OPTIONS;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 93 "printrcl.l"
+#line 95 "printrcl.l"
 DBG(CUSTOM_COMMAND); return CUSTOM_COMMAND;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 94 "printrcl.l"
+#line 96 "printrcl.l"
 DBG(COMMAND_TYPE); return COMMAND_TYPE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 95 "printrcl.l"
+#line 97 "printrcl.l"
 DBG(GLOBAL_SETTINGS); return GLOBAL_SETTINGS;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 96 "printrcl.l"
+#line 98 "printrcl.l"
 DBG(END_GLOBAL_SETTINGS); return END_GLOBAL_SETTINGS;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 97 "printrcl.l"
+#line 99 "printrcl.l"
 DBG(GLOBAL); return GLOBAL;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 99 "printrcl.l"
+#line 101 "printrcl.l"
 DBG(pINT); return pINT;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 100 "printrcl.l"
+#line 102 "printrcl.l"
 DBG(pSTRING_LIST); return pSTRING_LIST;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 101 "printrcl.l"
+#line 103 "printrcl.l"
 DBG(pFILE); return pFILE;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 102 "printrcl.l"
+#line 104 "printrcl.l"
 DBG(pDOUBLE); return pDOUBLE;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 103 "printrcl.l"
+#line 105 "printrcl.l"
 DBG(pDIMENSION); return pDIMENSION;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 104 "printrcl.l"
+#line 106 "printrcl.l"
 DBG(pBOOLEAN); return pBOOLEAN;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 105 "printrcl.l"
+#line 107 "printrcl.l"
 DBG(pCURVE); return pCURVE;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 107 "printrcl.l"
+#line 109 "printrcl.l"
 yylval.ival = atoi(yytext); DBG(tINT); return tINT;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 108 "printrcl.l"
+#line 110 "printrcl.l"
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
 /* rule 33 can match eol */
 YY_RULE_SETUP
-#line 109 "printrcl.l"
+#line 111 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 110 "printrcl.l"
+#line 112 "printrcl.l"
 yylval.sval = g_strdup(yytext); DBG(tBOOLEAN); return tBOOLEAN;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 111 "printrcl.l"
+#line 113 "printrcl.l"
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP
-#line 112 "printrcl.l"
+#line 114 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 113 "printrcl.l"
+#line 115 "printrcl.l"
 DBG(whitespace1); 	/* Skip blanks/tabs */
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 114 "printrcl.l"
+#line 116 "printrcl.l"
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
-#line 115 "printrcl.l"
+#line 117 "printrcl.l"
 DBG(newline); mylineno++;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 116 "printrcl.l"
+#line 118 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1249 "printrcl.c"
+#line 1251 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2243,4 +2245,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 116 "printrcl.l"
+#line 118 "printrcl.l"
diff --git a/src/gutenprintui2/printrcl.l b/src/gutenprintui2/printrcl.l
index 018adf0..e9ac6d1 100644
--- a/src/gutenprintui2/printrcl.l
+++ b/src/gutenprintui2/printrcl.l
@@ -1,5 +1,5 @@
 /*		-*-Mode: C-*-
- * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
+ * "$Id: printrcl.l,v 1.2 2012/05/11 13:16:12 rlk Exp $"
  *
  *   printrc parser
  *
@@ -39,6 +39,8 @@
 
 int mylineno = 1;
 
+extern YYSTYPE yylval;
+
 #define DBG(x)						\
 do							\
   {							\
diff --git a/src/gutenprintui2/ui-utils.c b/src/gutenprintui2/ui-utils.c
index 9b8cb01..d45d22a 100644
--- a/src/gutenprintui2/ui-utils.c
+++ b/src/gutenprintui2/ui-utils.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ui-utils.c,v 1.3 2006/05/28 16:59:04 rlk Exp $"
+ * "$Id: ui-utils.c,v 1.4 2012/01/19 13:26:57 m0m Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -214,10 +214,10 @@ stpui_dialog_new (const gchar       *title,
   GtkWidget *dialog;
   va_list    args;
 
-  va_start (args, resizable);
-
   g_return_val_if_fail (title != NULL, NULL);
 
+  va_start (args, resizable);
+
   dialog = gtk_dialog_new ();
   gtk_window_set_title (GTK_WINDOW (dialog), title);
   gtk_window_set_position (GTK_WINDOW (dialog), position);
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 9bd6192..daedcf2 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.104 2010/07/18 18:05:23 rlk Exp $
+## $Id: Makefile.am,v 1.105 2012/03/18 16:43:34 gernot2270 Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -55,7 +55,8 @@ print_canon_la_SOURCES = \
 	canon-inks.h \
 	canon-media.h \
 	canon-modes.h \
-	canon-printers.h
+	canon-printers.h \
+	canon-media-mode.h
 
 print_canon_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 4c520bb..9b05bf3 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -107,10 +107,11 @@ am__libgutenprint_la_SOURCES_DIST = array.c bit-ops.c channel.c \
 	generic-options.h gutenprint-internal.h print-color.c \
 	color-conversion.h color-conversions.c print-canon.c \
 	print-canon.h canon-inks.h canon-media.h canon-modes.h \
-	canon-printers.h print-escp2.c escp2-driver.c print-escp2.h \
-	print-escp2-data.c escp2-channels.c escp2-papers.c \
-	escp2-resolutions.c print-lexmark.c print-pcl.c print-ps.c \
-	xmlppd.c xmlppd.h print-olympus.c print-raw.c
+	canon-printers.h canon-media-mode.h print-escp2.c \
+	escp2-driver.c print-escp2.h print-escp2-data.c \
+	escp2-channels.c escp2-papers.c escp2-resolutions.c \
+	print-lexmark.c print-pcl.c print-ps.c xmlppd.c xmlppd.h \
+	print-olympus.c print-raw.c
 am__objects_1 = mxml-attr.lo mxml-file.lo mxml-node.lo mxml-search.lo
 am__objects_2 =
 am__objects_3 = print-color.lo color-conversions.lo
@@ -243,6 +244,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -319,6 +321,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -339,6 +342,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -362,6 +367,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -408,7 +414,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -450,7 +455,8 @@ print_canon_la_SOURCES = \
 	canon-inks.h \
 	canon-media.h \
 	canon-modes.h \
-	canon-printers.h
+	canon-printers.h \
+	canon-media-mode.h
 
 print_canon_la_LDFLAGS = -module -avoid-version
 print_escp2_la_SOURCES = \
diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c
index 6ecf227..3a5e746 100644
--- a/src/main/bit-ops.c
+++ b/src/main/bit-ops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.c,v 1.14 2009/06/07 15:21:22 rlk Exp $"
+ * "$Id: bit-ops.c,v 1.15 2012/04/19 14:41:03 gernot2270 Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -279,6 +279,109 @@ stp_fold_4bit(const unsigned char *line,
     }
 }
 
+void
+stp_fold_8bit(const unsigned char *line,
+                int single_length,
+                unsigned char *outbuf)
+{
+  int i;
+  memset(outbuf, 0, single_length * 8);
+  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];
+      unsigned char l4 = line[single_length*4];
+      unsigned char l5 = line[single_length*5];
+      unsigned char l6 = line[single_length*6];
+      unsigned char l7 = line[single_length*7];
+      if (l0 || l1 || l2 || l3 || l4 || l5 || l6 || l7)
+	{
+	  outbuf[0] =		/* H7 G7 F7 E7 D7 C7 B7 A7 */
+            ((l7 & (1 << 7)) >> 0)|
+            ((l6 & (1 << 7)) >> 1)|
+            ((l5 & (1 << 7)) >> 2)|
+            ((l4 & (1 << 7)) >> 3)|
+            ((l3 & (1 << 7)) >> 4)|
+            ((l2 & (1 << 7)) >> 5)|
+            ((l1 & (1 << 7)) >> 6)|
+            ((l0 & (1 << 7)) >> 7);
+
+	  outbuf[1] =		/* H6 G6 F6 E6 D6 C6 B6 A6 */
+            ((l7 & (1 << 6)) << 1)|
+            ((l6 & (1 << 6)) >> 0)|
+            ((l5 & (1 << 6)) >> 1)|
+            ((l4 & (1 << 6)) >> 2)|
+            ((l3 & (1 << 6)) >> 3)|
+            ((l2 & (1 << 6)) >> 4)|
+            ((l1 & (1 << 6)) >> 5)|
+            ((l0 & (1 << 6)) >> 6);
+
+	  outbuf[2] =		/* H5 G5 F5 E5 D5 C5 B5 A5 */
+            ((l7 & (1 << 5)) << 2)|
+            ((l6 & (1 << 5)) << 1)|
+            ((l5 & (1 << 5)) >> 0)|
+            ((l4 & (1 << 5)) >> 1)|
+            ((l3 & (1 << 5)) >> 2)|
+            ((l2 & (1 << 5)) >> 3)|
+            ((l1 & (1 << 5)) >> 4)|
+            ((l0 & (1 << 5)) >> 5);
+
+	  outbuf[3] =		/* H4 G4 F4 E4 D4 C4 B4 A4 */
+            ((l7 & (1 << 4)) << 3)|
+            ((l6 & (1 << 4)) << 2)|
+            ((l5 & (1 << 4)) << 1)|
+            ((l4 & (1 << 4)) >> 0)|
+            ((l3 & (1 << 4)) >> 1)|
+            ((l2 & (1 << 4)) >> 2)|
+            ((l1 & (1 << 4)) >> 3)|
+            ((l0 & (1 << 4)) >> 4);
+	  outbuf[4] =		/* H3 G3 F3 E3 D3 C3 B3 A3 */
+            ((l7 & (1 << 3)) << 4)|
+            ((l6 & (1 << 3)) << 3)|
+            ((l5 & (1 << 3)) << 2)|
+            ((l4 & (1 << 3)) << 1)|
+            ((l3 & (1 << 3)) >> 0)|
+            ((l2 & (1 << 3)) >> 1)|
+            ((l1 & (1 << 3)) >> 2)|
+            ((l0 & (1 << 3)) >> 3);
+
+	  outbuf[5] =		/* H2 G2 F2 E2 D2 C2 B2 A2 */
+            ((l7 & (1 << 2)) << 5)|
+            ((l6 & (1 << 2)) << 4)|
+            ((l5 & (1 << 2)) << 3)|
+            ((l4 & (1 << 2)) << 2)|
+            ((l3 & (1 << 2)) << 1)|
+            ((l2 & (1 << 2)) >> 0)|
+            ((l1 & (1 << 2)) >> 1)|
+            ((l0 & (1 << 2)) >> 2);
+
+	  outbuf[6] =		/* H1 G1 F1 E1 D1 C1 B1 A1 */
+            ((l7 & (1 << 1)) << 6)|
+            ((l6 & (1 << 1)) << 5)|
+            ((l5 & (1 << 1)) << 4)|
+            ((l4 & (1 << 1)) << 3)|
+            ((l3 & (1 << 1)) << 2)|
+            ((l2 & (1 << 1)) << 1)|
+            ((l1 & (1 << 1)) >> 0)|
+            ((l0 & (1 << 1)) >> 1);
+
+	  outbuf[7] =		/* H0 G0 F0 E0 D0 C0 B0 A0 */
+            ((l7 & (1 << 0)) << 7)|
+            ((l6 & (1 << 0)) << 6)|
+            ((l5 & (1 << 0)) << 5)|
+            ((l4 & (1 << 0)) << 4)|
+            ((l3 & (1 << 0)) << 3)|
+            ((l2 & (1 << 0)) << 2)|
+            ((l1 & (1 << 0)) << 1)|
+            ((l0 & (1 << 0)) >> 0);
+	}
+      line++;
+      outbuf += 8;
+    }
+}
+
 #define SPLIT_MASK(k, b) (((1 << (b)) - 1) << ((k) * (b)))
 
 #define SPLIT_STEP(k, b, i, o, in, r, inc, rl)	\
diff --git a/src/main/canon-inks.h b/src/main/canon-inks.h
index 90fbb1e..ff478a9 100644
--- a/src/main/canon-inks.h
+++ b/src/main/canon-inks.h
@@ -110,6 +110,7 @@ DECLARE_INK(2,4);
 
 /*under development*/
 DECLARE_INK(4,4);
+DECLARE_INK_EXTENDED(4,4,INK_FLAG_5pixel_in_1byte);
 
 static const stp_dotsize_t dotsizes_5l[] = {
   { 0x1, 0.45 },
@@ -168,13 +169,30 @@ static const stp_dotsize_t dotsizes_9l[] = {
   { 0x5, 0.66 },
   { 0x6, 0.71 },
   { 0x7, 0.88 },
-  { 0x8, 1.00 }
+  { 0x8, 1.00 },
 };
 
-/*under development*/
 DECLARE_INK(4,9);
 DECLARE_INK(8,9);
 
+static const stp_dotsize_t dotsizes_14l[] = {
+  { 0x1, 0.07 },
+  { 0x2, 0.13 },
+  { 0x3, 0.20 },
+  { 0x4, 0.27 },
+  { 0x5, 0.33 },
+  { 0x6, 0.40 },
+  { 0x7, 0.47 },
+  { 0x8, 0.53 },
+  { 0x9, 0.60 },
+  { 0xA, 0.67 },
+  { 0xB, 0.75 },
+  { 0xC, 0.87 },
+  { 0xD, 1.00 },
+};
+
+DECLARE_INK(4,14);
+
 static const stp_dotsize_t dotsizes_16l[] = {
   { 0x1, 0.07 },
   { 0x2, 0.13 },
@@ -325,6 +343,42 @@ static const canon_inkset_t canon_7_C4M4Y4c4m4k4K4_inkset[] = {
         {'K',1.0,&canon_2b_4l_ink},
 };
 
+static const canon_inkset_t canon_9_K2_inkset[] = {
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'K',1.0,&canon_1b_2l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_K5_c_inkset[] = {
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'K',1.0,&canon_4b_5l_c_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_K9_inkset[] = {
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'K',1.0,&canon_4b_9l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_9_C2M2Y2K2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
         {'M',1.0,&canon_1b_2l_ink},
@@ -337,6 +391,30 @@ static const canon_inkset_t canon_9_C2M2Y2K2_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_9_C2M2Y2K2c2m2y2_inkset[] = {
+        {'C',1.0,&canon_1b_2l_ink},
+        {'M',1.0,&canon_1b_2l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_1b_2l_ink},
+        {'m',1.0,&canon_1b_2l_ink},
+        {'y',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_c3m3y3_inkset[] = {
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,NULL},
+	{'c',1.0,&canon_2b_3l_ink},
+	{'m',1.0,&canon_2b_3l_ink},
+	{'y',1.0,&canon_2b_3l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_9_C3M3Y2K2h_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -373,7 +451,6 @@ static const canon_inkset_t canon_9_C3M3Y2K2_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* iP6000D */
 static const canon_inkset_t canon_9_C3M3Y3K3_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -386,7 +463,6 @@ static const canon_inkset_t canon_9_C3M3Y3K3_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* iP4000 default print mode (quality 2) */
 static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
@@ -399,6 +475,30 @@ static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = {
         {0,0.0,NULL}
 };
 
+static const canon_inkset_t canon_9_C3M3Y2K2k3on_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C3M3Y2K2k3photo_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* switch off */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_9_C3M3Y3K2c3m3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
@@ -411,12 +511,11 @@ static const canon_inkset_t canon_9_C3M3Y3K2c3m3_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* iP4000 mode used for Super Photo Paper (quality 1) */
 static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
         {'Y',1.0,&canon_2b_3l_c_ink},
-        {'K',0.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* switch off */
         {'c',0.5,&canon_2b_3l_c_ink},
         {'m',0.5,&canon_2b_3l_c_ink},
         {0,0.0,NULL},
@@ -436,7 +535,6 @@ static const canon_inkset_t canon_9_C4M4Y4K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP4000 mode used for T-Shirt (quality 2) */
 static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -461,7 +559,18 @@ static const canon_inkset_t canon_9_C4M4Y4K3_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* check this one!!!! */
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4plain_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_9_C4M4Y4K2c4m4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -474,11 +583,48 @@ static const canon_inkset_t canon_9_C4M4Y4K2c4m4_inkset[] = {
         {0,0.0,NULL}
 };
 
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4p_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',0.0,&canon_2b_4l_ink}, /* do not use but need to define in inkset */
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',0.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_4l_ink},
+        {'m',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4on_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_4l_ink},
+        {'m',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_9_C4M4Y4K4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
         {'Y',1.0,&canon_2b_4l_ink},
-        {'K',1.0,&canon_2b_4l_ink}, /* put K back in for OHP */
+        {'K',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -486,7 +632,6 @@ static const canon_inkset_t canon_9_C4M4Y4K4_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* check this one !!! */
 static const canon_inkset_t canon_9_C4M4Y4K4c4m4_inkset[] = {
         {'C',1.0,&canon_4b_4l_ink},
         {'M',1.0,&canon_4b_4l_ink},
@@ -499,12 +644,11 @@ static const canon_inkset_t canon_9_C4M4Y4K4c4m4_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* check this one!!! */
-static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4_inkset[] = {
+static const canon_inkset_t canon_9_C4M4Y4c4m4y4_inkset[] = {
         {'C',1.0,&canon_4b_4l_ink},
         {'M',1.0,&canon_4b_4l_ink},
         {'Y',1.0,&canon_4b_4l_ink},
-        {'K',0.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
         {'c',0.5,&canon_4b_4l_ink},
         {'m',0.5,&canon_4b_4l_ink},
         {'y',1.0,&canon_4b_4l_ink},
@@ -512,18 +656,51 @@ static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* iP4000 mode used for CD printing (quality 3) */
-/* Gernot: This is also the normal hi-quality mode for iP4000 at quality level 3 */
-/*         The same inket is used at quality levels 4, 3 and 2 for CD printing */
-static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4plain_inkset[] = {
+        {'C',1.0,&canon_4b_4l_ink},
+        {'M',1.0,&canon_4b_4l_ink},
+        {'Y',1.0,&canon_4b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_4b_4l_ink},
+        {'m',1.0,&canon_4b_4l_ink},
+        {'y',1.0,&canon_4b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4photo_inkset[] = {
+        {'C',1.0,&canon_4b_4l_ink},
+        {'M',1.0,&canon_4b_4l_ink},
+        {'Y',1.0,&canon_4b_4l_ink},
+        {'K',0.0,&canon_1b_2l_ink},/* Photo modes do not use K */
+        {'c',0.5,&canon_4b_4l_ink},
+        {'m',0.5,&canon_4b_4l_ink},
+        {'y',1.0,&canon_4b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4plain2_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4photo2_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
         {'Y',1.0,&canon_2b_4l_ink},
         {'K',0.0,&canon_1b_2l_ink},
-        {'c',0.5,&canon_2b_4l_ink},
-        {'m',0.5,&canon_2b_4l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
-        {'k',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL}
 };
 
@@ -543,7 +720,127 @@ static const canon_inkset_t canon_9_C5M5Y5K2_inkset[] = {
         {'C',1.0,&canon_4b_5l_ink},
         {'M',1.0,&canon_4b_5l_ink},
         {'Y',1.0,&canon_4b_5l_ink},
-        {'K',0.0,&canon_1b_2l_ink}, /* for PPpro, so no use */
+        {'K',0.0,&canon_1b_2l_ink}, /* for CMY only, so no use */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K2plain_inkset[] = {
+        {'C',1.0,&canon_4b_5l_ink},
+        {'M',1.0,&canon_4b_5l_ink},
+        {'Y',1.0,&canon_4b_5l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K5_c_inkset[] = {
+        {'C',1.0,&canon_4b_5l_c_ink},
+        {'M',1.0,&canon_4b_5l_c_ink},
+        {'Y',1.0,&canon_4b_5l_c_ink},
+        {'K',1.0,&canon_4b_5l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K5c5m5_c_inkset[] = {
+        {'C',1.0,&canon_4b_5l_c_ink},
+        {'M',1.0,&canon_4b_5l_c_ink},
+        {'Y',1.0,&canon_4b_5l_c_ink},
+        {'K',1.0,&canon_4b_5l_c_ink},
+        {'c',1.0,&canon_4b_5l_c_ink},
+        {'m',1.0,&canon_4b_5l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K5c9m9_c_inkset[] = {
+        {'C',1.0,&canon_4b_5l_c_ink},
+        {'M',1.0,&canon_4b_5l_c_ink},
+        {'Y',1.0,&canon_4b_5l_c_ink},
+        {'K',1.0,&canon_4b_5l_c_ink},
+        {'c',1.0,&canon_4b_9l_ink},
+        {'m',1.0,&canon_4b_9l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K9c5m5_c_inkset[] = {
+        {'C',1.0,&canon_4b_5l_c_ink},
+        {'M',1.0,&canon_4b_5l_c_ink},
+        {'Y',1.0,&canon_4b_5l_c_ink},
+        {'K',1.0,&canon_4b_9l_ink},
+        {'c',1.0,&canon_4b_5l_c_ink},
+        {'m',1.0,&canon_4b_5l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C6M6Y6K6_c_inkset[] = {
+        {'C',1.0,&canon_4b_6l_c_ink},
+        {'M',1.0,&canon_4b_6l_c_ink},
+        {'Y',1.0,&canon_4b_6l_c_ink},
+        {'K',1.0,&canon_4b_6l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C6M6Y6K6c6m6_c_inkset[] = {
+        {'C',1.0,&canon_4b_6l_c_ink},
+        {'M',1.0,&canon_4b_6l_c_ink},
+        {'Y',1.0,&canon_4b_6l_c_ink},
+        {'K',1.0,&canon_4b_6l_c_ink},
+        {'c',1.0,&canon_4b_6l_c_ink},
+        {'m',1.0,&canon_4b_6l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C6M6Y6K9c6m6_c_inkset[] = {
+        {'C',1.0,&canon_4b_6l_c_ink},
+        {'M',1.0,&canon_4b_6l_c_ink},
+        {'Y',1.0,&canon_4b_6l_c_ink},
+        {'K',1.0,&canon_4b_9l_ink},
+        {'c',1.0,&canon_4b_6l_c_ink},
+        {'m',1.0,&canon_4b_6l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C6M6Y6K6c16m16_c_inkset[] = {
+        {'C',1.0,&canon_4b_6l_c_ink},
+        {'M',1.0,&canon_4b_6l_c_ink},
+        {'Y',1.0,&canon_4b_6l_c_ink},
+        {'K',1.0,&canon_4b_6l_c_ink},
+        {'c',1.0,&canon_4b_16l_ink},
+        {'m',1.0,&canon_4b_16l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C7M7Y7K2_inkset[] = {
+        {'C',1.0,&canon_4b_7l_ink},
+        {'M',1.0,&canon_4b_7l_ink},
+        {'Y',1.0,&canon_4b_7l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -575,7 +872,6 @@ static const canon_inkset_t canon_9_C8M8Y8c16m16_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* iP4000 mode used for Professional Photo Paper in Quality 4 */
 static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
         {'C',1.0,&canon_4b_8l_ink},
         {'M',1.0,&canon_4b_8l_ink},
@@ -600,6 +896,18 @@ static const canon_inkset_t canon_9_C9M9Y9K2_inkset[] = {
         {0,0.0,NULL}
 };
 
+static const canon_inkset_t canon_9_C9M9Y9K9c9m9_inkset[] = {
+        {'C',1.0,&canon_4b_9l_ink},
+        {'M',1.0,&canon_4b_9l_ink},
+        {'Y',1.0,&canon_4b_9l_ink},
+        {'K',1.0,&canon_4b_9l_ink},
+        {'c',1.0,&canon_4b_9l_ink},
+        {'m',1.0,&canon_4b_9l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_9_C9M9Y9K2c9m9y9_inkset[] = {
         {'C',1.0,&canon_4b_9l_ink},
         {'M',1.0,&canon_4b_9l_ink},
@@ -612,23 +920,56 @@ static const canon_inkset_t canon_9_C9M9Y9K2c9m9y9_inkset[] = {
         {0,0.0,NULL}
 };
 
+static const canon_inkset_t canon_9_C9M9Y9K2c9m9y9plain8_inkset[] = {
+        {'C',1.0,&canon_8b_9l_ink},
+        {'M',1.0,&canon_8b_9l_ink},
+        {'Y',1.0,&canon_8b_9l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_8b_9l_ink},
+        {'m',1.0,&canon_8b_9l_ink},
+        {'y',1.0,&canon_8b_9l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C9M9Y9K2c9m9y9photo8_inkset[] = {
+        {0,0.0,&canon_8b_9l_ink},
+        {0,0.0,&canon_8b_9l_ink},
+        {0,0.0,&canon_8b_9l_ink},
+        {0,0.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_8b_9l_ink},
+        {'m',1.0,&canon_8b_9l_ink},
+        {'y',1.0,&canon_8b_9l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_9_c9m9y9_inkset[] = {
-	{0,0.0,NULL},
-	{0,0.0,NULL},
-	{0,0.0,NULL},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
 	{0,0.0,NULL},
 	{'c',1.0,&canon_8b_9l_ink},
 	{'m',1.0,&canon_8b_9l_ink},
 	{'y',1.0,&canon_8b_9l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{0,0.0,NULL},
-	{0,0.0,NULL},
-	{0,0.0,NULL},
-	{0,0.0,NULL},
 };
 
-/* PIXMA Pro9000, Pro9000 Mk.II, Pro9500, Pro9500 Mk.II, PIXMA iP8500 */
+static const canon_inkset_t canon_11_K2_inkset[] = {
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_11_C2M2Y2K2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
         {'M',1.0,&canon_1b_2l_ink},
@@ -643,7 +984,62 @@ static const canon_inkset_t canon_11_C2M2Y2K2_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Pro9000 */
+static const canon_inkset_t canon_11_C3M3Y2K2_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_11_C4M4Y4K2_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_11_C5M5Y3k4_inkset[] = {
+        {'C',1.0,&canon_4b_5l_ink},
+        {'M',1.0,&canon_4b_5l_ink},
+        {'Y',1.0,&canon_2b_3l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_11_C5M5Y4k4_inkset[] = {
+        {'C',1.0,&canon_4b_5l_ink},
+        {'M',1.0,&canon_4b_5l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_11_C5M5Y5K5c5m5_c_inkset[] = {
         {'C',1.0,&canon_4b_5l_c_ink},
         {'M',1.0,&canon_4b_5l_c_ink},
@@ -658,7 +1054,34 @@ static const canon_inkset_t canon_11_C5M5Y5K5c5m5_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* PIXMA Pro9000, Pro9000 Mk.II, Pro9500, Pro9500 Mk.II, PIXMA iP8500 */
+static const canon_inkset_t canon_11_C6M6Y4K2_inkset[] = {
+        {'C',1.0,&canon_4b_6l_ink},
+        {'M',1.0,&canon_4b_6l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_11_C6M6Y4k4_inkset[] = {
+        {'C',1.0,&canon_4b_6l_ink},
+        {'M',1.0,&canon_4b_6l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_11_C6M6Y6K6_c_inkset[] = {
         {'C',1.0,&canon_4b_6l_c_ink},
         {'M',1.0,&canon_4b_6l_c_ink},
@@ -673,7 +1096,6 @@ static const canon_inkset_t canon_11_C6M6Y6K6_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Pro9000, Pro9000 Mk.II */
 static const canon_inkset_t canon_11_C6M6Y6K6c6m6_c_inkset[] = {
         {'C',1.0,&canon_4b_6l_c_ink},
         {'M',1.0,&canon_4b_6l_c_ink},
@@ -688,7 +1110,6 @@ static const canon_inkset_t canon_11_C6M6Y6K6c6m6_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Pro9000, Pro9000 Mk.II */
 static const canon_inkset_t canon_11_C6M6Y6K6c16m16_c_inkset[] = {
         {'C',1.0,&canon_4b_6l_c_ink},
         {'M',1.0,&canon_4b_6l_c_ink},
@@ -703,7 +1124,6 @@ static const canon_inkset_t canon_11_C6M6Y6K6c16m16_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Pro9000, Pro9000 Mk.II, PIXMA iP8500 */
 static const canon_inkset_t canon_11_C6M6Y6K9c6m6_c_inkset[] = {
         {'C',1.0,&canon_4b_6l_c_ink},
         {'M',1.0,&canon_4b_6l_c_ink},
@@ -718,7 +1138,20 @@ static const canon_inkset_t canon_11_C6M6Y6K9c6m6_c_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* PIXMA Pro9500, Pro9500 Mk.II */
+static const canon_inkset_t canon_11_C9M9Y4k6_inkset[] = {
+        {'C',1.0,&canon_4b_9l_ink},
+        {'M',1.0,&canon_4b_9l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_4b_6l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL}
+};
+
 static const canon_inkset_t canon_11_C16M16Y16k16_inkset[] = {
         {'C',1.0,&canon_4b_16l_ink},
         {'M',1.0,&canon_4b_16l_ink},
@@ -733,7 +1166,6 @@ static const canon_inkset_t canon_11_C16M16Y16k16_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Pro9000 Mk.II */
 static const canon_inkset_t canon_11_C16M16Y16K16c16m16_inkset[] = {
         {'C',1.0,&canon_4b_16l_ink},
         {'M',1.0,&canon_4b_16l_ink},
@@ -748,7 +1180,6 @@ static const canon_inkset_t canon_11_C16M16Y16K16c16m16_inkset[] = {
         {0,0.0,NULL}
 };
 
-/* Gernot: MP150 (MP170 for tests) greyscale */
 static const canon_inkset_t canon_13_K2_inkset[] = {
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -765,7 +1196,6 @@ static const canon_inkset_t canon_13_K2_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* MP150 (MP250 for tests) greyscale */
 static const canon_inkset_t canon_13_K3_inkset[] = {
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -782,7 +1212,6 @@ static const canon_inkset_t canon_13_K3_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* iP2700, MP270 color cartridge only, plain fast mode */
 static const canon_inkset_t canon_13_C2M2Y2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
         {'M',1.0,&canon_1b_2l_ink},
@@ -815,7 +1244,38 @@ static const canon_inkset_t canon_13_C2M2Y2K2_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* MX7600, iX7000 */
+static const canon_inkset_t canon_13_C2M2Y2K2off_inkset[] = {
+	{'C',1.0,&canon_1b_2l_ink},
+	{'M',1.0,&canon_1b_2l_ink},
+	{'Y',1.0,&canon_1b_2l_ink},
+	{'K',0.0,&canon_1b_2l_ink}, /* declared in inkset but not used */
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C2M2Y2k2_inkset[] = {
+	{'C',1.0,&canon_1b_2l_ink},
+	{'M',1.0,&canon_1b_2l_ink},
+	{'Y',1.0,&canon_1b_2l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_1b_2l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_13_C2M2Y2K2k2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
         {'M',1.0,&canon_1b_2l_ink},
@@ -832,7 +1292,6 @@ static const canon_inkset_t canon_13_C2M2Y2K2k2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP2700, MP270 color cartridge only, plain mode */
 static const canon_inkset_t canon_13_C3M3Y2_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -849,7 +1308,6 @@ static const canon_inkset_t canon_13_C3M3Y2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP1900 color cartridge only, plain mode */
 static const canon_inkset_t canon_13_C3M3Y2b_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -882,7 +1340,38 @@ static const canon_inkset_t canon_13_C3M3Y2K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP1900, std mode, plain media */
+static const canon_inkset_t canon_13_C3M3Y2K3_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_2b_3l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C3M3Y2K3off_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_2b_3l_ink}, /* declared in inkset but not used */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_13_C3M3Y2K2b_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -899,11 +1388,6 @@ static const canon_inkset_t canon_13_C3M3Y2K2b_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* Gernot: iP4500 standard mode changed from the compressed one below */
-/*         iP4700 also uses this */
-/*         iP4800 also uses this */
-/*         MG5100, MG5200 */
-/* TODO: how to get both K and k working, for Hagaki and Env modes */
 static const canon_inkset_t canon_13_C3M3Y2K2y3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
@@ -911,7 +1395,7 @@ static const canon_inkset_t canon_13_C3M3Y2K2y3_c_inkset[] = {
         {'K',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
-        {'k',0.0,&canon_2b_3l_c_ink}, /* swap y for k, but in any case it is not in output for plain modes */
+	{'k',0.0,&canon_2b_3l_c_ink}, /* swap y for k, switch off */
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -920,24 +1404,70 @@ static const canon_inkset_t canon_13_C3M3Y2K2y3_c_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iX7000 */
-static const canon_inkset_t canon_13_C3M3Y2K2k3_c_inkset[] = {
+static const canon_inkset_t canon_13_C3M3Y2K2k3on_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
         {'Y',1.0,&canon_1b_2l_ink},
         {'K',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
-        {'k',0.0,&canon_2b_3l_c_ink}, /* swap y and k */
+        {'k',1.0,&canon_2b_3l_c_ink}, /* swap y for k */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C3M3Y2K2k3photo_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* switched off */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink}, /* swap y for k */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C3M3Y3k3c3m3_inkset[] = {
+	{'C',1.0,&canon_2b_3l_ink},
+	{'M',1.0,&canon_2b_3l_ink},
+	{'Y',1.0,&canon_2b_3l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_3l_ink},
+	{'c',1.0,&canon_2b_3l_ink},
+	{'m',1.0,&canon_2b_3l_ink},
+};
+
+static const canon_inkset_t canon_13_C3M3Y3k4_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_2b_3l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
 };
 
-/* Gernot: MP250, MP280 photo modes */
 static const canon_inkset_t canon_13_C4M4Y4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -970,7 +1500,6 @@ static const canon_inkset_t canon_13_C4M4Y4K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* Gernot: MP250, MP270, MP280 high mode */
 static const canon_inkset_t canon_13_C4M4Y3K3_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -987,8 +1516,70 @@ static const canon_inkset_t canon_13_C4M4Y3K3_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_13_C4M4Y3K4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_3l_ink},
+        {'K',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C4M4Y4k4_inkset[] = {
+	{'C',1.0,&canon_2b_4l_ink},
+	{'M',1.0,&canon_2b_4l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_4l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C4M4Y4k4c4m4_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C4M4Y4K2c4m4y4on2_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* switch off */
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {'k',1.0,&canon_2b_4l_ink}, /* swap to k */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
 
-/* Gernot: MP150 (MP170 for tests) high-quality mode */
 static const canon_inkset_t canon_13_C4M4Y4K2c4m4y4_inkset[] = {
         {'C',1.0,&canon_4b_4l_ink},
         {'M',1.0,&canon_4b_4l_ink},
@@ -1005,7 +1596,6 @@ static const canon_inkset_t canon_13_C4M4Y4K2c4m4y4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* test on iP5300 --- swap y and k */
 static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
         {'C',1.0,&canon_4b_4l_ink},
         {'M',1.0,&canon_4b_4l_ink},
@@ -1022,14 +1612,10 @@ static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP2700 in user-defined highest quality mode for PPGlossPro paper */
-/* MP270 same for PPGpro */
-/* MP280 same for PPGproPlat */
-/* less 0x60 in bytes */
 static const canon_inkset_t canon_13_c3m3y3_inkset[] = {
-	{0,0.0,NULL},
-	{0,0.0,NULL},
-	{0,0.0,NULL},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
+	{0,0.0,&canon_2b_3l_ink},
 	{0,0.0,NULL},
 	{'c',1.0,&canon_2b_3l_ink},
 	{'m',1.0,&canon_2b_3l_ink},
@@ -1042,17 +1628,6 @@ static const canon_inkset_t canon_13_c3m3y3_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* Gernot: MP150 (MP170 for tests) high-quality mode for
-           High Resolution Paper
-           Inkjet Hagaki
-	   pro Photo Paper
-	   super Photo Paper
-	   super Photo Paper Double Sided
-	   matte Photo Paper
-	   other Photo Paper
-
-Also used for all modes of gloss Photo Paper	  
-*/
 static const canon_inkset_t canon_13_C4M4Y4c4m4y4_inkset[] = {
         {'C',1.0,&canon_4b_4l_ink},
         {'M',1.0,&canon_4b_4l_ink},
@@ -1060,7 +1635,7 @@ static const canon_inkset_t canon_13_C4M4Y4c4m4y4_inkset[] = {
         {0,0.0,NULL},
         {'c',1.0,&canon_4b_4l_ink},
         {'m',1.0,&canon_4b_4l_ink},
-        {'k',1.0,&canon_4b_4l_ink}, /* swap y and k */
+        {'y',1.0,&canon_4b_4l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -1069,15 +1644,14 @@ static const canon_inkset_t canon_13_C4M4Y4c4m4y4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* Gernot: MP150 (MP170 for tests) T-shirt transfers */
-static const canon_inkset_t canon_13_C5M5Y5_inkset[] = {
+static const canon_inkset_t canon_13_C5M5Y4y4_inkset[] = {
         {'C',1.0,&canon_4b_5l_ink},
         {'M',1.0,&canon_4b_5l_ink},
-        {'Y',1.0,&canon_4b_5l_ink},
-        {0,0.0,NULL},
+        {'Y',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -1086,10 +1660,7 @@ static const canon_inkset_t canon_13_C5M5Y5_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* Gernot: added for iP4700 CD printing */
-/* iP4800 also uses this */
-/* also MG5200 */
-static const canon_inkset_t canon_13_C5M5Y4y4_inkset[] = {
+static const canon_inkset_t canon_13_C5M5Y4k4_inkset[] = {
         {'C',1.0,&canon_4b_5l_ink},
         {'M',1.0,&canon_4b_5l_ink},
         {'Y',1.0,&canon_2b_4l_ink},
@@ -1105,7 +1676,22 @@ static const canon_inkset_t canon_13_C5M5Y4y4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iX7000 photo mode */
+static const canon_inkset_t canon_13_C5M5Y5_inkset[] = {
+        {'C',1.0,&canon_4b_5l_ink},
+        {'M',1.0,&canon_4b_5l_ink},
+        {'Y',1.0,&canon_4b_5l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_13_C6M6Y2K2k4_inkset[] = {
 	{'C',1.0,&canon_4b_6l_ink},
 	{'M',1.0,&canon_4b_6l_ink},
@@ -1122,8 +1708,6 @@ static const canon_inkset_t canon_13_C6M6Y2K2k4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* Gernot: added for iP4700 photo standard quality */
-/*         MG5100, MG5200 */
 static const canon_inkset_t canon_13_C6M6Y4y4_inkset[] = {
 	{'C',1.0,&canon_4b_6l_ink},
 	{'M',1.0,&canon_4b_6l_ink},
@@ -1140,10 +1724,22 @@ static const canon_inkset_t canon_13_C6M6Y4y4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* Gernot: added for iP4500 high quality --- check the pos of k/y */
-/*         iP4700 also uses this */
-/*         iP4800 also uses this */
-/*         MG5100, MG5200 */
+static const canon_inkset_t canon_13_C6M6Y4k4_inkset[] = {
+	{'C',1.0,&canon_4b_6l_ink},
+	{'M',1.0,&canon_4b_6l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_13_C6M6Y4K2y4_inkset[] = {
 	{'C',1.0,&canon_4b_6l_ink},
 	{'M',1.0,&canon_4b_6l_ink},
@@ -1151,7 +1747,7 @@ static const canon_inkset_t canon_13_C6M6Y4K2y4_inkset[] = {
 	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+	{'k',0.0,&canon_2b_4l_ink}, /* set y to k, switched off */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1160,14 +1756,14 @@ static const canon_inkset_t canon_13_C6M6Y4K2y4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-static const canon_inkset_t canon_13_C6M6Y4K2k4_inkset[] = {
+static const canon_inkset_t canon_13_C6M6Y4K2k4on_inkset[] = {
 	{'C',1.0,&canon_4b_6l_ink},
 	{'M',1.0,&canon_4b_6l_ink},
 	{'Y',1.0,&canon_2b_4l_ink},
 	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',0.0,&canon_2b_4l_ink},
+	{'k',1.0,&canon_2b_4l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1176,7 +1772,6 @@ static const canon_inkset_t canon_13_C6M6Y4K2k4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* MX7600, iX7000 */
 static const canon_inkset_t canon_13_C6M6Y4K3k4_c_inkset[] = {
 	{'C',1.0,&canon_4b_6l_ink},
 	{'M',1.0,&canon_4b_6l_ink},
@@ -1209,10 +1804,6 @@ static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* Gernot: iP4500 photo mode */
-/*         iP4700 also uses this */
-/*         iP4800 also uses this */
-/*         MG5100, MG5200 */
 static const canon_inkset_t canon_13_C8M8Y4y4_inkset[] = {
 	{'C',1.0,&canon_4b_8l_ink},
 	{'M',1.0,&canon_4b_8l_ink},
@@ -1229,6 +1820,22 @@ static const canon_inkset_t canon_13_C8M8Y4y4_inkset[] = {
 	{0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_13_C8M8Y4k4_inkset[] = {
+	{'C',1.0,&canon_4b_8l_ink},
+	{'M',1.0,&canon_4b_8l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_13_C8M8Y4K4k4_inkset[] = {
 	{'C',1.0,&canon_4b_8l_ink},
 	{'M',1.0,&canon_4b_8l_ink},
@@ -1261,25 +1868,46 @@ static const canon_inkset_t canon_13_C8M8Y4k4yask_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* Gernot: MP150 (MP170 for tests) high-quality mode for
-           High Resolution Paper
-           Inkjet Hagaki
-	   pro Photo Paper
-	   super Photo Paper
-	   super Photo Paper Double Sided
-	   matte Photo Paper
-	   other Photo Paper
-	  
- for some reason there is a hack for iP6700 appearing here which might make the y into a k (swapping)
-*/
 static const canon_inkset_t canon_13_c9m9y9_inkset[] = {
+	{0,0.0,&canon_8b_9l_ink},
+	{0,0.0,&canon_8b_9l_ink},
+	{0,0.0,&canon_8b_9l_ink},
+	{0,0.0,NULL},
+	{'c',1.0,&canon_8b_9l_ink},
+	{'m',1.0,&canon_8b_9l_ink},
+	{'y',1.0,&canon_8b_9l_ink},
+	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_13_C9M9Y9k9c9m9_inkset[] = {
+	{'C',1.0,&canon_8b_9l_ink},
+	{'M',1.0,&canon_8b_9l_ink},
+	{'Y',1.0,&canon_8b_9l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_8b_9l_ink},
 	{'c',1.0,&canon_8b_9l_ink},
 	{'m',1.0,&canon_8b_9l_ink},
-	{'y',1.0,&canon_8b_9l_ink},
+};
+
+static const canon_inkset_t canon_13_C14M14Y14c14m14y14_inkset[] = {
+	{'C',1.0,&canon_4b_14l_ink},
+	{'M',1.0,&canon_4b_14l_ink},
+	{'Y',1.0,&canon_4b_14l_ink},
+	{0,0.0,NULL},
+	{'c',1.0,&canon_4b_14l_ink},
+	{'m',1.0,&canon_4b_14l_ink},
+	{'y',1.0,&canon_4b_14l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1288,15 +1916,14 @@ static const canon_inkset_t canon_13_c9m9y9_inkset[] = {
 	{0,0.0,NULL},
 };
 
-/* MP980 uss 16 inks */
-static const canon_inkset_t canon_16_C8M8Y4k4_inkset[] = {
-	{'C',1.0,&canon_4b_8l_ink},
-	{'M',1.0,&canon_4b_8l_ink},
-	{'Y',1.0,&canon_2b_4l_ink},
+static const canon_inkset_t canon_16_C2M2Y2K2_inkset[] = {
+	{'C',1.0,&canon_1b_2l_ink},
+	{'M',1.0,&canon_1b_2l_ink},
+	{'Y',1.0,&canon_1b_2l_ink},
+	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1308,14 +1935,14 @@ static const canon_inkset_t canon_16_C8M8Y4k4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-static const canon_inkset_t canon_16_C6M6Y4K2k4_inkset[] = {
-	{'C',1.0,&canon_4b_6l_ink},
-	{'M',1.0,&canon_4b_6l_ink},
-	{'Y',1.0,&canon_2b_4l_ink},
+static const canon_inkset_t canon_16_C3M3Y2K2k3off_c_inkset[] = {
+	{'C',1.0,&canon_2b_3l_c_ink},
+	{'M',1.0,&canon_2b_3l_c_ink},
+	{'Y',1.0,&canon_1b_2l_ink},
 	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+	{'k',0.0,&canon_2b_3l_c_ink}, /* y and k swapped */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1327,14 +1954,14 @@ static const canon_inkset_t canon_16_C6M6Y4K2k4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-static const canon_inkset_t canon_16_C6M6Y4k4_inkset[] = {
-	{'C',1.0,&canon_4b_6l_ink},
-	{'M',1.0,&canon_4b_6l_ink},
-	{'Y',1.0,&canon_2b_4l_ink},
-	{0,0.0,NULL},
+static const canon_inkset_t canon_16_C3M3Y2K2k3on_c_inkset[] = {
+	{'C',1.0,&canon_2b_3l_c_ink},
+	{'M',1.0,&canon_2b_3l_c_ink},
+	{'Y',1.0,&canon_1b_2l_ink},
+	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+	{'k',1.0,&canon_2b_3l_c_ink}, /* y and k swapped */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1365,14 +1992,14 @@ static const canon_inkset_t canon_16_C5M5Y4k4_inkset[] = {
 	{0,0.0,NULL},
 };
 
-static const canon_inkset_t canon_16_C3M3Y2K2k3_c_inkset[] = {
-	{'C',1.0,&canon_2b_3l_c_ink},
-	{'M',1.0,&canon_2b_3l_c_ink},
-	{'Y',1.0,&canon_1b_2l_ink},
-	{'K',1.0,&canon_1b_2l_ink},
+static const canon_inkset_t canon_16_C6M6Y4k4_inkset[] = {
+	{'C',1.0,&canon_4b_6l_ink},
+	{'M',1.0,&canon_4b_6l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{'k',1.0,&canon_2b_3l_c_ink}, /* y and k swapped */
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1384,14 +2011,14 @@ static const canon_inkset_t canon_16_C3M3Y2K2k3_c_inkset[] = {
 	{0,0.0,NULL},
 };
 
-static const canon_inkset_t canon_16_C2M2Y2K2_inkset[] = {
-	{'C',1.0,&canon_1b_2l_ink},
-	{'M',1.0,&canon_1b_2l_ink},
-	{'Y',1.0,&canon_1b_2l_ink},
+static const canon_inkset_t canon_16_C6M6Y4K2k4off_inkset[] = {
+	{'C',1.0,&canon_4b_6l_ink},
+	{'M',1.0,&canon_4b_6l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
 	{'K',1.0,&canon_1b_2l_ink},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
-	{0,0.0,NULL},
+	{'k',0.0,&canon_2b_4l_ink}, /* y and k swapped */
 	{0,0.0,NULL},
 	{0,0.0,NULL},
 	{0,0.0,NULL},
@@ -1403,6 +2030,24 @@ static const canon_inkset_t canon_16_C2M2Y2K2_inkset[] = {
 	{0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_16_C8M8Y4k4_inkset[] = {
+	{'C',1.0,&canon_4b_8l_ink},
+	{'M',1.0,&canon_4b_8l_ink},
+	{'Y',1.0,&canon_2b_4l_ink},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+	{0,0.0,NULL},
+};
 
 static const canon_inkset_t canon_19_C2M2Y2K2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
@@ -1426,7 +2071,6 @@ static const canon_inkset_t canon_19_C2M2Y2K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP6700D Fast plain mode */
 static const canon_inkset_t canon_19_C2M2Y2k2_inkset[] = {
         {'C',1.0,&canon_1b_2l_ink},
         {'M',1.0,&canon_1b_2l_ink},
@@ -1471,7 +2115,28 @@ static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* works OK on MP960 */
+static const canon_inkset_t canon_19_C3M3Y3K2k3off_inkset[] = {
+        {'C',1.0,&canon_2b_3l_ink},
+        {'M',1.0,&canon_2b_3l_ink},
+        {'Y',1.0,&canon_2b_3l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',0.0,&canon_2b_3l_ink},/* need to swap y -> k, switch off */
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_19_C3M3Y3K2k3_inkset[] = {
         {'C',1.0,&canon_2b_3l_ink},
         {'M',1.0,&canon_2b_3l_ink},
@@ -1494,7 +2159,6 @@ static const canon_inkset_t canon_19_C3M3Y3K2k3_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo mode iP6700D T-shirt transfers */
 static const canon_inkset_t canon_19_C4M4Y4k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -1517,11 +2181,54 @@ static const canon_inkset_t canon_19_C4M4Y4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo mode MP960 T-shirt transfers --- works OK! */
 static const canon_inkset_t canon_19_C4M4Y4K2k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
         {'Y',1.0,&canon_2b_4l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* not used */
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_19_C4M4Y4K2k4off_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {'k',0.0,&canon_2b_4l_ink}, /* switch off */
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_19_C4M4Y4K2k4on_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
         {'K',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
         {0,0.0,NULL}, 
@@ -1540,7 +2247,6 @@ static const canon_inkset_t canon_19_C4M4Y4K2k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo mode MP960 CDs and iP6700D Photo High 2 [PPmatte, Coated] */
 static const canon_inkset_t canon_19_C4M4Y4c4m4k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -1563,7 +2269,6 @@ static const canon_inkset_t canon_19_C4M4Y4c4m4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo mode iP6700D CDs, position of cmk guessed */
 static const canon_inkset_t canon_19_C4M4Y4c4m4k4CD_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -1586,7 +2291,6 @@ static const canon_inkset_t canon_19_C4M4Y4c4m4k4CD_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo mode MP960 PPmatte works! */
 static const canon_inkset_t canon_19_C4M4Y4K2c4m4k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -1609,7 +2313,6 @@ static const canon_inkset_t canon_19_C4M4Y4K2c4m4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* MP960 HIGH works OK */
 static const canon_inkset_t canon_19_C6M6Y4K2_inkset[] = {
         {'C',1.0,&canon_4b_6l_ink},
         {'M',1.0,&canon_4b_6l_ink},
@@ -1632,7 +2335,6 @@ static const canon_inkset_t canon_19_C6M6Y4K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP6700D Plain High: CMYk */
 static const canon_inkset_t canon_19_C6M6Y4c6m6k4_inkset[] = {
         {'C',1.0,&canon_4b_6l_ink},
         {'M',1.0,&canon_4b_6l_ink},
@@ -1655,7 +2357,6 @@ static const canon_inkset_t canon_19_C6M6Y4c6m6k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP6700D Photo Std: CMYKcmk */
 static const canon_inkset_t canon_19_C6M6Y4c6m6k4photo_inkset[] = {
         {'C',1.0,&canon_4b_6l_ink},
         {'M',1.0,&canon_4b_6l_ink},
@@ -1678,7 +2379,6 @@ static const canon_inkset_t canon_19_C6M6Y4c6m6k4photo_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* hagaki std & high MP960 : CMYKk*/
 static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4hagaki_inkset[] = {
         {'C',1.0,&canon_4b_6l_ink},
         {'M',1.0,&canon_4b_6l_ink},
@@ -1701,7 +2401,6 @@ static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4hagaki_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo std mode MP960 and inkjet Hagaki Std: CMYcmk*/
 static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4_inkset[] = {
         {'C',1.0,&canon_4b_6l_ink},
         {'M',1.0,&canon_4b_6l_ink},
@@ -1724,7 +2423,28 @@ static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* iP6700D Photo High: CMYkcm */
+static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4off_inkset[] = {
+        {'C',1.0,&canon_4b_6l_ink},
+        {'M',1.0,&canon_4b_6l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_4b_6l_ink},
+        {'m',1.0,&canon_4b_6l_ink},
+        {'k',0.0,&canon_2b_4l_ink}, /* change y to k, switch off */ 
+        {0,0.0,NULL},
+        {0,0.0,NULL}, 
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_19_C7M7Y4c7m7k4_inkset[] = {
         {'C',1.0,&canon_4b_7l_ink},
         {'M',1.0,&canon_4b_7l_ink},
@@ -1747,7 +2467,6 @@ static const canon_inkset_t canon_19_C7M7Y4c7m7k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* photo high mode MP960 and inkjetHagaki High: CMYcmk */
 static const canon_inkset_t canon_19_C7M7Y4K2c7m7k4_inkset[] = {
         {'C',1.0,&canon_4b_7l_ink},
         {'M',1.0,&canon_4b_7l_ink},
@@ -1820,6 +2539,31 @@ static const canon_inkset_t canon_22_C3M3Y2K2_c_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_22_C3M3Y2K2photo_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* set to 0*/
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
@@ -1828,7 +2572,58 @@ static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
-        {'k',0.0,&canon_2b_3l_c_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {'k',0.0,&canon_2b_3l_c_ink}, /* off for plain modes */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C3M3Y2K2k3photo_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* set to 0 */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C3M3Y2K2k3on_c_inkset[] = {
+        {'C',1.0,&canon_2b_3l_c_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
+        {'Y',1.0,&canon_1b_2l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -1845,7 +2640,6 @@ static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* MP520 photo standard */
 static const canon_inkset_t canon_22_C3M3Y3K2c3m3_c_inkset[] = {
         {'C',1.0,&canon_2b_3l_c_ink},
         {'M',1.0,&canon_2b_3l_c_ink},
@@ -1854,7 +2648,7 @@ static const canon_inkset_t canon_22_C3M3Y3K2c3m3_c_inkset[] = {
         {'c',1.0,&canon_2b_3l_c_ink},
         {'m',1.0,&canon_2b_3l_c_ink},
         {0,0.0,NULL},
-	{'k',0.0,&canon_2b_3l_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -1921,7 +2715,31 @@ static const canon_inkset_t canon_22_C4M4Y4K2_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* MP830 T-Shirt */
+static const canon_inkset_t canon_22_C4M4Y4K2k4one_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',0.0,&canon_1b_2l_ink}, /* no K */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 static const canon_inkset_t canon_22_C4M4Y4K2k4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
@@ -1947,16 +2765,40 @@ static const canon_inkset_t canon_22_C4M4Y4K2k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* MP520 high */
 static const canon_inkset_t canon_22_C4M4Y4K2c4m4_inkset[] = {
         {'C',1.0,&canon_2b_4l_ink},
         {'M',1.0,&canon_2b_4l_ink},
         {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',1.0,&canon_2b_4l_ink},
+        {'m',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C4M4Y4K2c4m4photo_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
         {'K',0.0,&canon_1b_2l_ink}, /* set to 0 */
         {'c',1.0,&canon_2b_4l_ink},
         {'m',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
-	{'k',0.0,&canon_2b_4l_ink},  /* even though we won't use the photo black in this mode its parameters have to be set */
+        {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -1998,19 +2840,45 @@ static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* high */
+static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4on_inkset[] = {
+        {'C',1.0,&canon_2b_4l_ink},
+        {'M',1.0,&canon_2b_4l_ink},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {'K',1.0,&canon_1b_2l_ink},
+        {'c',0.5,&canon_2b_4l_ink},
+        {'m',0.5,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+
+/* fast */
 /* MP990, MG6100, MG800 */
 /* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
-/*static const canon_inkset_t canon_30_C2M6K6m4k4_inkset[] = {*/
-static const canon_inkset_t canon_30_K2C6M6Y4k4_inkset[] = {
+/*static const canon_inkset_t canon_30_C2M2K2m2_inkset[] = {*/
+static const canon_inkset_t canon_30_K2C2M2Y2_inkset[] = {
         {'K',1.0,&canon_1b_2l_ink},
-        {'C',1.0,&canon_4b_6l_ink},
+        {'C',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
-        {'M',1.0,&canon_4b_6l_ink},
+        {'M',1.0,&canon_1b_2l_ink},
+        {0,0.0,NULL},
+        {'Y',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
-        {'Y',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
-        {'k',0.0,&canon_2b_4l_ink}, /* will not use it, but need to specify it */
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -2036,7 +2904,7 @@ static const canon_inkset_t canon_30_K2C6M6Y4k4_inkset[] = {
 };
 
 /* standard */
-/* MP990, MG6100, MG800 */
+/* MP990, MG6100, MG6200, MG800 */
 /* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
 static const canon_inkset_t canon_30_K2C3M3Y2k3_c_inkset[] = {
         {'K',1.0,&canon_1b_2l_ink},
@@ -2071,19 +2939,53 @@ static const canon_inkset_t canon_30_K2C3M3Y2k3_c_inkset[] = {
         {0,0.0,NULL},
 };
 
-/* fast */
-/* MP990, MG6100, MG800 */
-/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
-/*static const canon_inkset_t canon_30_C2M2K2m2_inkset[] = {*/
-static const canon_inkset_t canon_30_K2C2M2Y2_inkset[] = {
+/* K and k both */
+static const canon_inkset_t canon_30_K2C3M3Y2k3on_c_inkset[] = {
         {'K',1.0,&canon_1b_2l_ink},
-        {'C',1.0,&canon_1b_2l_ink},
+        {'C',1.0,&canon_2b_3l_c_ink},
         {0,0.0,NULL},
-        {'M',1.0,&canon_1b_2l_ink},
+        {'M',1.0,&canon_2b_3l_c_ink},
         {0,0.0,NULL},
         {'Y',1.0,&canon_1b_2l_ink},
         {0,0.0,NULL},
+        {'k',1.0,&canon_2b_3l_c_ink}, /* on */
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+/* high */
+/* MP990, MG6100, MG6200, MG800 */
+/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
+/*static const canon_inkset_t canon_30_C2M6K6m4k4_inkset[] = {*/
+static const canon_inkset_t canon_30_K2C6M6Y4k4_inkset[] = {
+        {'K',1.0,&canon_1b_2l_ink},
+        {'C',1.0,&canon_4b_6l_ink},
+        {0,0.0,NULL},
+        {'M',1.0,&canon_4b_6l_ink},
+        {0,0.0,NULL},
+        {'Y',1.0,&canon_2b_4l_ink},
         {0,0.0,NULL},
+        {'k',0.0,&canon_2b_4l_ink}, /* will not use it, but need to specify it */
         {0,0.0,NULL},
         {0,0.0,NULL},
         {0,0.0,NULL},
@@ -2144,5 +3046,71 @@ static const canon_inkset_t canon_30_C5M5Y4k4_inkset[] = {
         {0,0.0,NULL},
 };
 
+static const canon_inkset_t canon_30_M6K6m4k4_inkset[] = {
+        {0,0.0,NULL},
+        {'C',1.0,&canon_4b_6l_ink},
+        {0,0.0,NULL},
+        {'M',1.0,&canon_4b_6l_ink},
+        {0,0.0,NULL},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_30_M8K8m4k4_inkset[] = {
+        {0,0.0,NULL},
+        {'C',1.0,&canon_4b_8l_ink},
+        {0,0.0,NULL},
+        {'M',1.0,&canon_4b_8l_ink},
+        {0,0.0,NULL},
+        {'Y',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {'k',1.0,&canon_2b_4l_ink},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+        {0,0.0,NULL},
+};
+
 #endif
 
diff --git a/src/main/canon-media-mode.h b/src/main/canon-media-mode.h
new file mode 100644
index 0000000..3052f8e
--- /dev/null
+++ b/src/main/canon-media-mode.h
@@ -0,0 +1,10663 @@
+/*

+ *   Print plug-in CANON BJL driver for the GIMP.

+ *

+ *   Copyright 1997-2000 Michael Sweet (mike@easysw.com),

+ *	Robert Krawitz (rlk@alum.mit.edu) and

+ *      Andy Thaller (thaller@ph.tum.de)

+ *   Copyright (c) 2006 - 2007 Sascha Sommer (saschasommer@freenet.de)

+ *

+ *   This program is free software; you can redistribute it and/or modify it

+ *   under the terms of the GNU General Public License as published by the Free

+ *   Software Foundation; either version 2 of the License, or (at your option)

+ *   any later version.

+ *

+ *   This program is distributed in the hope that it will be useful, but

+ *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

+ *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

+ *   for more details.

+ *

+ *   You should have received a copy of the GNU General Public License

+ *   along with this program; if not, write to the Free Software

+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+ */

+

+/* This file contains the usage matrix matching media with modes

+*/

+

+#ifndef GUTENPRINT_INTERNAL_CANON_MEDIA_MODE_H

+#define GUTENPRINT_INTERNAL_CANON_MEDIA_MODE_H

+

+/* create matrix of which media are used with which mode */

+

+typedef struct {

+  const char *name; /* unstranslated media name */

+  const char** mode_name_list; /* untranslated mode names */

+  const unsigned int use_flags;

+  /* flags to indicate support in the media */

+#define INKSET_BLACK_SUPPORT 0x1

+#define INKSET_COLOR_SUPPORT 0x2

+  /*#define INKSET_BOTH_SUPPORT  0x4*/

+#define INKSET_PHOTO_SUPPORT 0x8

+  /* duplex support for media --- this is currently not implemented: so duplex can be specified for all media types */

+#define DUPLEX_SUPPORT       0x10

+  /* flags to indicate existence of special replacement modes to search for */

+#define INKSET_BLACK_MODEREPL 0x100

+#define INKSET_COLOR_MODEREPL 0x200

+  /*#define INKSET_BOTH_MODEREPL  0x400*/

+#define INKSET_PHOTO_MODEREPL 0x800

+#define DUPLEX_MODEREPL       0x1000

+

+} canon_modeuse_t;

+

+typedef struct {

+  const char *name;

+  const short count;

+  const canon_modeuse_t *modeuses;

+} canon_modeuselist_t;

+

+#define DECLARE_MODEUSES(name)                              \

+  static const canon_modeuselist_t name##_modeuselist = {   \

+  #name,                                                    \

+  sizeof(name##_modeuses) / sizeof(canon_modeuse_t),        \

+  name##_modeuses                                           \

+}

+

+/* Ordering of data: 

+   BJC

+   DS

+   mini

+   S

+   i --- *i is Japanese model, with Hagaki/inkjetHagaki support. 

+         i* is US model without such support. Not sure about European models.

+   iP

+   iX

+   MP

+   MX

+   MG

+   Pro

+*/

+

+/* ----------------------------------- Canon BJC 30 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_30_modeuses_plain[] = {

+  "720x360dpi",

+  "360x360dpi",

+  "180x180dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_30_modeuses[] = {

+  { "Plain",		canon_BJC_30_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_30_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_30_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_30_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_30_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_30_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_30_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_30_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_30_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_30_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_30_modeuses_plain, 0 },

+  { "Other",		canon_BJC_30_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_30);

+

+/* ----------------------------------- Canon BJC 85 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_85_modeuses_plain[] = {

+  "720x360dpi",

+  "360x360dmt",

+  "360x360dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_85_modeuses[] = {

+  { "Plain",		canon_BJC_85_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_85_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_85_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_85_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_85_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_85_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_85_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_85_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_85_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_85_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_85_modeuses_plain, 0 },

+  { "Other",		canon_BJC_85_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_85);

+

+/* ----------------------------------- Canon BJC 210 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_210_modeuses_plain[] = {

+  "720x360dpi",

+  "360x360dpi",

+  "180x180dpi",

+  "90x90dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_210_modeuses[] = {

+  { "Plain",		canon_BJC_210_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_210_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_210_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_210_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_210_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_210_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_210_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_210_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_210_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_210_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_210_modeuses_plain, 0 },

+  { "Other",		canon_BJC_210_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_210);

+

+/* ----------------------------------- Canon BJC 240 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_240_modeuses_plain[] = {

+  "720x360dpi",

+  "360x360dmt",

+  "360x360dpi",

+  "180x180dpi",

+  "90x90dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_240_modeuses[] = {

+  { "Plain",		canon_BJC_240_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_240_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_240_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_240_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_240_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_240_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_240_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_240_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_240_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_240_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_240_modeuses_plain, 0 },

+  { "Other",		canon_BJC_240_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_240);

+

+/* ----------------------------------- Canon BJC 2000 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_2000_modeuses_plain[] = {

+  "360x360dpi",

+  "180x180dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_2000_modeuses[] = {

+  { "Plain",		canon_BJC_2000_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_2000_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_2000_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_2000_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_2000_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_2000_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_2000_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_2000_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_2000_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_2000_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_2000_modeuses_plain, 0 },

+  { "Other",		canon_BJC_2000_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_2000);

+

+/* ----------------------------------- Canon BJC 3000 ----------------------------------- */

+

+static const char* canon_BJC_3000_modeuses_plain[] = {

+  "1440x720dpi",/*untested*/

+  "720x720dpi",

+  "360x360dpi",

+  "360x360dmt",

+  "360x360dpi_draft",

+  "180x180dpi",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_PPgloss[] = {

+  "1440x720dpi",

+  "720x720dpi",

+  "360x360dpi",

+  "360x360dmt",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_coated[] = {

+  "1440x720dpi",

+  "720x720dpi",

+  "360x360dpi",

+  "360x360dmt",

+  "360x360dpi_draft",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_glossFilm[] = {

+  "720x720dpi",

+  "360x360dpi",

+  "360x360dmt",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_Tshirt[] = {

+  "360x360dpi",

+  "360x360dmt",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_Transparency[] = {

+  "360x360dpi",

+  "360x360dmt",

+  "360x360dpi_draft",

+  NULL

+};

+

+static const char* canon_BJC_3000_modeuses_Envelope[] = {

+  "720x720dpi",

+  "360x360dpi",

+  "360x360dmt",

+  "360x360dpi_draft",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_3000_modeuses[] = {

+  { "Plain",		canon_BJC_3000_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "Transparency",	canon_BJC_3000_modeuses_Transparency, INKSET_BLACK_SUPPORT },

+  { "BackPrint",	canon_BJC_3000_modeuses_Tshirt, 0 },

+  { "Fabric",		canon_BJC_3000_modeuses_Tshirt, 0 },/*untested*/

+  { "Envelope",		canon_BJC_3000_modeuses_Envelope, INKSET_BLACK_SUPPORT },

+  { "Coated",		canon_BJC_3000_modeuses_coated, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "TShirt",		canon_BJC_3000_modeuses_Tshirt, 0 },

+  { "GlossyFilm",	canon_BJC_3000_modeuses_glossFilm, 0 },

+  { "GlossyPaper",	canon_BJC_3000_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "GlossyCard",	canon_BJC_3000_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "GlossyPro",	canon_BJC_3000_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },/*untested*/

+  { "Other",		canon_BJC_3000_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_3000);

+

+/* ----------------------------------- Canon BJC 4300 ----------------------------------- */

+

+static const char* canon_BJC_4300_modeuses_plain[] = {

+  "360x360dpi_high",

+  "360x360dpi",

+  "360x360dmt",

+  "720x360dpi",

+  "360x360dpi_draft",

+  "180x180dpi",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_4300_modeuses_PPgloss[] = {

+  "360x360dpi_high",

+  "360x360dpi",

+  "360x360dmt",

+  "720x360dpi",/*mono*/

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_4300_modeuses_coated[] = {

+  "360x360dpi_high",

+  "360x360dpi",

+  "360x360dmt",

+  "720x360dpi",

+  "360x360dpi_draft",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_4300_modeuses_glossFilm[] = {

+  "360x360dpi_high",

+  "360x360dpi",

+  "360x360dmt",

+  "720x360dpi",/*mono*/

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_4300_modeuses[] = {

+  { "Plain",		canon_BJC_4300_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "Transparency",	canon_BJC_4300_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "BackPrint",	canon_BJC_4300_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "Fabric",		canon_BJC_4300_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "Envelope",		canon_BJC_4300_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "Coated",		canon_BJC_4300_modeuses_coated, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "TShirt",		canon_BJC_4300_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "GlossyFilm",	canon_BJC_4300_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "GlossyPaper",	canon_BJC_4300_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "GlossyCard",	canon_BJC_4300_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "GlossyPro",	canon_BJC_4300_modeuses_PPgloss, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },/*untested*/

+  { "Other",		canon_BJC_4300_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+};

+

+DECLARE_MODEUSES(canon_BJC_4300);

+

+/* ----------------------------------- Canon BJC 4400 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_4400_modeuses_plain[] = {

+  "720x360dpi",

+  "360x360dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_4400_modeuses[] = {

+  { "Plain",		canon_BJC_4400_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_4400_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_4400_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_4400_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_4400_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_4400_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_4400_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_4400_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_4400_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_4400_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_4400_modeuses_plain, 0 },

+  { "Other",		canon_BJC_4400_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_4400);

+

+/* ----------------------------------- Canon BJC 4550 ----------------------------------- */

+

+static const char* canon_BJC_4550_modeuses_plain[] = {

+  "720x360dpi_high",

+  "360x360dpi_high",

+  "720x360dpi",

+  "360x360dpi",

+  "180x180dpi",

+  /* Photo */

+  "360x360dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_4550_modeuses_glossFilm[] = {

+  "720x360dpi_high",

+  "360x360dpi_high",

+  "360x360dpi",/*untested*/

+  "180x180dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_4550_modeuses[] = {

+  { "Plain",		canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "Transparency",	canon_BJC_4550_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "BackPrint",	canon_BJC_4550_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "Fabric",		canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT },

+  { "Envelope",		canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "Coated",		canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "TShirt",		canon_BJC_4550_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "GlossyFilm",	canon_BJC_4550_modeuses_glossFilm, INKSET_BLACK_SUPPORT },

+  { "GlossyPaper",	canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+  { "GlossyCard",	canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },/*untested*/

+  { "GlossyPro",	canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },/*untested*/

+  { "Other",		canon_BJC_4550_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_PHOTO_SUPPORT | INKSET_PHOTO_MODEREPL },

+};

+

+DECLARE_MODEUSES(canon_BJC_4550);

+

+/* ----------------------------------- Canon BJC 5500 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_5500_modeuses_plain[] = {

+  "360x360dpi",

+  "180x180dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_5500_modeuses[] = {

+  { "Plain",		canon_BJC_5500_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_5500_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_5500_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_5500_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_5500_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_5500_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_5500_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_5500_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_5500_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_5500_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_5500_modeuses_plain, 0 },

+  { "Other",		canon_BJC_5500_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_5500);

+

+/* ----------------------------------- Canon BJC 6000 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_6000_modeuses_plain[] = {

+  "1440x720dpi",

+  "720x720dpi",

+  "360x360dmt",

+  "360x360dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_6000_modeuses[] = {

+  { "Plain",		canon_BJC_6000_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_6000_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_6000_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_6000_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_6000_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_6000_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_6000_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_6000_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_6000_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_6000_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_6000_modeuses_plain, 0 },

+  { "Other",		canon_BJC_6000_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_6000);

+

+/* ----------------------------------- Canon BJC 7000 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_7000_modeuses_plain[] = {

+  "1200x1200dpi",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_7000_modeuses[] = {

+  { "Plain",		canon_BJC_7000_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_7000_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_7000_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_7000_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_7000_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_7000_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_7000_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_7000_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_7000_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_7000_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_7000_modeuses_plain, 0 },

+  { "Other",		canon_BJC_7000_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_7000);

+

+/* ----------------------------------- Canon BJC 7100 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_7100_modeuses_plain[] = {

+  "1200x1200dpi",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_7100_modeuses[] = {

+  { "Plain",		canon_BJC_7100_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_7100_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_7100_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_7100_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_7100_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_7100_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_7100_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_7100_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_7100_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_7100_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_7100_modeuses_plain, 0 },

+  { "Other",		canon_BJC_7100_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_7100);

+

+/* ----------------------------------- Canon BJC 8200 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_8200_modeuses_plain[] = {

+  "1200x1200dpi",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_8200_modeuses[] = {

+  { "Plain",		canon_BJC_8200_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_8200_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_8200_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_8200_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_8200_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_8200_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_8200_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_8200_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_8200_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_8200_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_8200_modeuses_plain, 0 },

+  { "Other",		canon_BJC_8200_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_8200);

+

+/* ----------------------------------- Canon BJC 8500 ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_8500_modeuses_plain[] = {

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_8500_modeuses[] = {

+  { "Plain",		canon_BJC_8500_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_8500_modeuses_plain, 0 }, 

+  { "BackPrint",	canon_BJC_8500_modeuses_plain, 0 },

+  { "Fabric",		canon_BJC_8500_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_8500_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_8500_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_8500_modeuses_plain, 0 },

+  { "GlossyFilm",	canon_BJC_8500_modeuses_plain, 0 },

+  { "GlossyPaper",	canon_BJC_8500_modeuses_plain, 0 },

+  { "GlossyCard",	canon_BJC_8500_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_8500_modeuses_plain, 0 },

+  { "Other",		canon_BJC_8500_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_8500);

+

+/* ----------------------------------- Canon DS700  ----------------------------------- */

+static const char* canon_SELPHY_DS700_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS700_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_SELPHY_DS700_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS700_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS700_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS700_modeuses_Hagaki[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const canon_modeuse_t canon_SELPHY_DS700_modeuses[] = {

+  { "GlossyPro",	canon_SELPHY_DS700_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_SELPHY_DS700_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_SELPHY_DS700_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_SELPHY_DS700_modeuses_PPgloss, 0 },

+  { "InkJetHagaki", 	canon_SELPHY_DS700_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_SELPHY_DS700_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_SELPHY_DS700);

+

+/* ----------------------------------- Canon DS810  ----------------------------------- */

+static const char* canon_SELPHY_DS810_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS810_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_SELPHY_DS810_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS810_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS810_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_SELPHY_DS810_modeuses_Hagaki[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const canon_modeuse_t canon_SELPHY_DS810_modeuses[] = {

+  { "GlossyPro",	canon_SELPHY_DS810_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_SELPHY_DS810_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_SELPHY_DS810_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_SELPHY_DS810_modeuses_PPgloss, 0 },

+  { "InkJetHagaki", 	canon_SELPHY_DS810_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_SELPHY_DS810_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_SELPHY_DS810);

+

+/* ----------------------------------- Canon mini220  ----------------------------------- */

+static const char* canon_PIXMA_mini220_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_mini220_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_mini220_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_mini220_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_mini220_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_mini220_modeuses_Hagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_mini220_modeuses[] = {

+  { "GlossyPro",	canon_PIXMA_mini220_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_mini220_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_mini220_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_mini220_modeuses_PPgloss, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_mini220_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_mini220_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_mini220);

+

+/* ----------------------------------- Canon mini320  ----------------------------------- */

+/*most nodes not supported*/

+static const char* canon_PIXMA_mini320_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+/*most nodes not supported*/

+static const char* canon_PIXMA_mini320_modeuses_PPplus[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_PIXMA_mini320_modeuses_PPmatte[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+/*most nodes not supported*/

+static const char* canon_PIXMA_mini320_modeuses_PPgloss[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_PIXMA_mini320_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_PIXMA_mini320_modeuses_Hagaki[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_mini320_modeuses[] = {

+  { "GlossyPro",	canon_PIXMA_mini320_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_mini320_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_mini320_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_mini320_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_mini320_modeuses_PPgloss, 0 },

+  { "PhotoPlusGloss2",	canon_PIXMA_mini320_modeuses_PPplus, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_mini320_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_mini320_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_mini320);

+

+/* ----------------------------------- Canon S200  ----------------------------------- */

+/* TODO: mode-media correlation */

+static const char* canon_BJC_S200_modeuses_plain[] = {

+  "1440x1440dpi",

+  "1440x720dpi",

+  "720x720dpi",

+  "360x360dpi",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_S200_modeuses[] = {

+  { "Plain",            canon_BJC_S200_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S200_modeuses_plain, 0 },

+  { "PhotopaperPlus",	canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+  { "PhotopaperPlusDouble",canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+  { "GlossyPaper",	canon_BJC_S200_modeuses_plain, 0 },

+  { "Coated",		canon_BJC_S200_modeuses_plain, 0 },

+  { "InkJetHagaki", 	canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S200_modeuses_plain, 0 },

+  { "TShirt",		canon_BJC_S200_modeuses_plain, 0 },

+  { "Transparency",	canon_BJC_S200_modeuses_plain, 0 },

+  { "Envelope",		canon_BJC_S200_modeuses_plain, 0 },

+  { "PhotopaperOther",	canon_BJC_S200_modeuses_plain, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S200);

+

+/* ----------------------------------- Canon BJC S300 ----------------------------------- */

+static const char* canon_BJC_S300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_std2",

+  "600x600dpi",/*untested*/

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_BJC_S300_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S300_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S300_modeuses_coated[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S300_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_S300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S300_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S300_modeuses[] = {

+  { "Plain",            canon_BJC_S300_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S300_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S300_modeuses_PPgloss, 0 },/*untested*/

+  { "PhotopaperPlusDouble", canon_BJC_S300_modeuses_PPgloss, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S300_modeuses_PPgloss, 0 },/*untested*/

+  { "GlossyPaper",	canon_BJC_S300_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S300_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S300_modeuses_PPgloss, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S300_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S300_modeuses_coated, 0 },

+  { "GlossyCard", 	canon_BJC_S300_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S300_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S300_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S300_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S300_modeuses_PPgloss, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S300);

+

+/* ----------------------------------- Canon BJC S330 ----------------------------------- */

+static const char* canon_BJC_S330_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_std2",

+  "600x600dpi",/*untested*/

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_BJC_S330_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S330_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S330_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S330_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_S330_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S330_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S330_modeuses[] = {

+  { "Plain",            canon_BJC_S330_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S330_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S330_modeuses_PPpro, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S330_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S330_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_S330_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S330_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_BJC_S330_modeuses_PPpro, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S330_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S330_modeuses_PPmatte, 0 },

+  { "Transparency", 	canon_BJC_S330_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S330_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S330_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S330_modeuses_PPpro, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S330);

+

+/* ----------------------------------- Canon BJC S500 ----------------------------------- */

+static const char* canon_BJC_S500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",/*untested*/

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_S500_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S500_modeuses_coated[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_S500_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S500_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_BJC_S500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S500_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S500_modeuses[] = {

+  { "Plain",            canon_BJC_S500_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S500_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S500_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperPlusDouble", canon_BJC_S500_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S500_modeuses_coated, 0 },/*untested*/

+  { "GlossyPaper",	canon_BJC_S500_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S500_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S500_modeuses_PPpro, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S500_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S500_modeuses_PPpro, 0 },

+  { "GlossyCard", 	canon_BJC_S500_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S500_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S500_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S500_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S500_modeuses_PPpro, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S500);

+

+/* ----------------------------------- Canon BJC S520 ----------------------------------- */

+static const char* canon_BJC_S520_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_highmono",/* mono */

+  "600x600dpi",/*untested*/

+  "600x600dpi_draft",

+  "300x300dpi",/*untested*/

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_S520_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_highmono3",/* mono */

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S520_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S520_modeuses[] = {

+  { "Plain",            canon_BJC_S520_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S520_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S520_modeuses_PPpro, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S520_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S520_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_S520_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S520_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S520_modeuses_PPpro, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S520_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S520_modeuses_PPpro, 0 },

+  { "Transparency", 	canon_BJC_S520_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S520_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S520_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S520_modeuses_PPpro, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S520);

+

+/* ----------------------------------- Canon BJC S600 ----------------------------------- */

+static const char* canon_BJC_S600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_S600_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_coated[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S600_modeuses_Transparency[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S600_modeuses[] = {

+  { "Plain",            canon_BJC_S600_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S600_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S600_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperPlusDouble", canon_BJC_S600_modeuses_PPpro, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S600_modeuses_PPgloss, 0 },/*untested*/

+  { "GlossyPaper",	canon_BJC_S600_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S600_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S600_modeuses_inkjetHagaki, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S600_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S600_modeuses_PPpro, 0 },

+  { "GlossyCard", 	canon_BJC_S600_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S600_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S600_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S600_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S600_modeuses_PPpro, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S600);

+

+/* ----------------------------------- Canon BJC S750 ----------------------------------- */

+static const char* canon_BJC_S750_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",/*untested*/

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_S750_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_Envelope[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S750_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S750_modeuses[] = {

+  { "Plain",            canon_BJC_S750_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S750_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S750_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S750_modeuses_PPplus, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S750_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_BJC_S750_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S750_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S750_modeuses_PPplus, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S750_modeuses_Envelope, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S750_modeuses_PPpro, 0 },

+  { "Transparency", 	canon_BJC_S750_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S750_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S750_modeuses_Envelope, 0 },

+  { "PhotopaperOther",	canon_BJC_S750_modeuses_PPpro, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S750);

+

+/* ----------------------------------- Canon BJC S800 ----------------------------------- */

+static const char* canon_BJC_S800_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+static const char* canon_BJC_S800_modeuses_PPpro[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_glossFilm[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_PPother[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  /* Mono */

+  "600x600dpi_photomonohigh2",

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  "600x600dpi_photomonodraft",

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S800_modeuses_Transparency[] = {

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S800_modeuses[] = {

+  { "Plain",            canon_BJC_S800_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S800_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S800_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S800_modeuses_PPplus, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S800_modeuses_PPgloss, 0 },

+  { "GlossyPaper",	canon_BJC_S800_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S800_modeuses_PPgloss, 0 },

+  { "InkJetHagaki", 	canon_BJC_S800_modeuses_PPgloss, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S800_modeuses_plain, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S800_modeuses_glossFilm, 0 },

+  { "GlossyCard", 	canon_BJC_S800_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S800_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S800_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S800_modeuses_plain, 0 },

+  { "PhotopaperOther",	canon_BJC_S800_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_S800);

+

+/* ----------------------------------- Canon BJC S820 ----------------------------------- */

+static const char* canon_BJC_S820_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/*untested*/

+  "600x600dpi",

+  "600x600dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono2",/*untested*/

+  "600x600dpi_highmono",/*untested*/

+  "600x600dpi_mono",/*untested*/

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+static const char* canon_BJC_S820_modeuses_PPpro[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_BJC_S820_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S820_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S820_modeuses_glossFilm[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S820_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S820_modeuses_Transparency[] = {

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S820_modeuses[] = {

+  { "Plain",            canon_BJC_S820_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S820_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S820_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S820_modeuses_PPplus, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S820_modeuses_PPgloss, 0 },

+  { "GlossyPaper",	canon_BJC_S820_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S820_modeuses_PPgloss, 0 },

+  { "InkJetHagaki", 	canon_BJC_S820_modeuses_PPgloss, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S820_modeuses_plain, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S820_modeuses_glossFilm, 0 },

+  { "GlossyCard", 	canon_BJC_S820_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S820_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S820_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S820_modeuses_plain, 0 },

+  { "PhotopaperOther",	canon_BJC_S820_modeuses_plain, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_S820);

+

+/* ----------------------------------- Canon BJC S900 ----------------------------------- */

+static const char* canon_BJC_S900_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono2",/*untested*/

+  "600x600dpi_highmono",/*untested*/

+  "600x600dpi_mono",/*untested*/

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+static const char* canon_BJC_S900_modeuses_PPpro[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_PPplus[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_coated[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_glossFilm[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_S900_modeuses_Transparency[] = {

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_S900_modeuses[] = {

+  { "Plain",            canon_BJC_S900_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_S900_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_S900_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_BJC_S900_modeuses_PPplus, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_S900_modeuses_PPgloss, 0 },

+  { "GlossyPaper",	canon_BJC_S900_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_S900_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_S900_modeuses_PPgloss, 0 },/*untested*/

+  { "Hagaki", 	        canon_BJC_S900_modeuses_plain, 0 },/*untested*/

+  { "GlossyFilm", 	canon_BJC_S900_modeuses_glossFilm, 0 },

+  { "GlossyCard", 	canon_BJC_S900_modeuses_PPgloss, 0 },

+  { "Transparency", 	canon_BJC_S900_modeuses_Transparency, 0 },

+  { "TShirt",		canon_BJC_S900_modeuses_TShirt, 0 },

+  { "Envelope",		canon_BJC_S900_modeuses_plain, 0 },

+  { "PhotopaperOther",	canon_BJC_S900_modeuses_plain, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_S900);

+

+/* ----------------------------------- Canon i50  ----------------------------------- */

+static const char* canon_BJC_i50_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_i50_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photomed",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",/*color*/

+  "600x600dpi_std4",/*mono*/

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_BJC_i50_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i50_modeuses[] = {

+  { "Plain",            canon_BJC_i50_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i50_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i50_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i50_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_BJC_i50_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i50_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i50_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_BJC_i50_modeuses_PPplus, 0 },

+  { "Hagaki", 	        canon_BJC_i50_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i50_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i50_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i50_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i50_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_i50);

+

+/* ----------------------------------- Canon i80  ----------------------------------- */

+static const char* canon_BJC_i80_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/*mono*/

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_high4",/*mono*/

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  "600x600dpi_ohpdraft",

+  NULL

+};

+

+static const char* canon_BJC_i80_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_i80_modeuses[] = {

+  { "Plain",            canon_BJC_i80_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i80_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i80_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i80_modeuses_PPmatte, 0 },

+  { "PhotopaperMatte",	canon_BJC_i80_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i80_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i80_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_BJC_i80_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i80_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i80_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i80_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i80_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i80_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_i80);

+

+/* ----------------------------------- Canon i450  ----------------------------------- */

+static const char* canon_BJC_i450_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_highmono",/* mono mode */

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_i450_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_highmono2",/* mono */

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_BJC_i450_modeuses_PPother[] = {

+  "600x600dpi_photohigh2",/*untested*/

+  "600x600dpi_photo2",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i450_modeuses[] = {

+  { "Plain",            canon_BJC_i450_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i450_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i450_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i450_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_BJC_i450_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_BJC_i450_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i450_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_BJC_i450_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i450_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i450_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i450_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i450_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i450_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i450);

+

+/* ----------------------------------- Canon i455  ----------------------------------- */

+static const char* canon_BJC_i455_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_highmono",/* mono mode */

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_i455_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_highmono2",/* mono */

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_BJC_i455_modeuses_PPother[] = {

+  "600x600dpi_photohigh2",/*untested*/

+  "600x600dpi_photo2",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i455_modeuses[] = {

+  { "Plain",            canon_BJC_i455_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i455_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i455_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i455_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_BJC_i455_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_BJC_i455_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i455_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_BJC_i455_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i455_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i455_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i455_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i455_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i455_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i455);

+

+/* ----------------------------------- Canon i550  ----------------------------------- */

+static const char* canon_BJC_i550_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_highmono",/* mono mode */

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_i550_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photomed",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_highmono3",/* mono */

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i550_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+/*untested*/

+static const char* canon_BJC_i550_modeuses_PPother[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i550_modeuses[] = {

+  { "Plain",            canon_BJC_i550_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i550_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i550_modeuses_PPpro, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i550_modeuses_PPpro, 0 },

+  { "PhotopaperMatte",	canon_BJC_i550_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i550_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i550_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i550_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i550_modeuses_Hagaki, 0 },

+  { "GlossyFilm", 	canon_BJC_i550_modeuses_PPpro, 0 },

+  { "TShirt",		canon_BJC_i550_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i550_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i550_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i550_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i550);

+

+/* ----------------------------------- Canon i560  ----------------------------------- */

+static const char* canon_BJC_i560_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_BJC_i560_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft2",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_BJC_i560_modeuses_PPother[] = {

+  "600x600dpi_photo",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i560_modeuses[] = {

+  { "Plain",            canon_BJC_i560_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i560_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i560_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i560_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_BJC_i560_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_BJC_i560_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_BJC_i560_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i560_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i560_modeuses_Hagaki, 0 },

+  { "DiscCompat", 	canon_BJC_i560_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i560_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i560_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i560_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i560_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i560_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i560);

+

+/* ----------------------------------- Canon i850  ----------------------------------- */

+static const char* canon_BJC_i850_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highset mode not supported yet */

+static const char* canon_BJC_i850_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highset mode not supported yet */

+static const char* canon_BJC_i850_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i850_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+/*untested*/

+static const char* canon_BJC_i850_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i850_modeuses[] = {

+  { "Plain",            canon_BJC_i850_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i850_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i850_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i850_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_BJC_i850_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_BJC_i850_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i850_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i850_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i850_modeuses_Hagaki, 0 },

+  { "DiscCompat", 	canon_BJC_i850_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i850_modeuses_disc, 0 },

+  { "GlossyFilm", 	canon_BJC_i850_modeuses_PPplus, 0 },

+  { "TShirt",		canon_BJC_i850_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i850_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i850_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i850_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i850);

+

+/* ----------------------------------- Canon i860  ----------------------------------- */

+static const char* canon_BJC_i860_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+/* highest mode not supported yet */

+static const char* canon_BJC_i860_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_BJC_i860_modeuses_PPother[] = {

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_i860_modeuses[] = {

+  { "Plain",            canon_BJC_i860_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_BJC_i860_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i860_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i860_modeuses_PPmatte, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_i860_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i860_modeuses_PPmatte, 0 },

+  { "Coated",		canon_BJC_i860_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_BJC_i860_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i860_modeuses_Hagaki, DUPLEX_SUPPORT }, /* not sure */

+  { "DiscCompat", 	canon_BJC_i860_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i860_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i860_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i860_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i860_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i860_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i860);

+

+/* ----------------------------------- Canon i900  ----------------------------------- */

+static const char* canon_BJC_i900_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_disc[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo5",

+  "600x600dpi_photodraft5",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_BJC_i900_modeuses_PPother[] = {

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_BJC_i900_modeuses[] = {

+  { "Plain",            canon_BJC_i900_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i900_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i900_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i900_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_BJC_i900_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i900_modeuses_PPplus, 0 },

+  { "Coated",		canon_BJC_i900_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_BJC_i900_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i900_modeuses_Hagaki, 0 },

+  { "DiscCompat", 	canon_BJC_i900_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i900_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i900_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i900_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i900_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i900_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i900);

+

+/* ----------------------------------- Canon i950  ----------------------------------- */

+static const char* canon_BJC_i950_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high"/*untested*/,

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "600x600dpi_draft2",

+  "600x600dpi_draftmono",/* mono --- untested*/

+  "600x600dpi_draftmono2",/* mono */

+  NULL

+  };

+

+static const char* canon_BJC_i950_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_GlossyFilm[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_disc[] = {

+  "600x600dpi_photo5",

+  "600x600dpi_photodraft5",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_high5",/*untested*/

+  "600x600dpi_std4",/*untested*/

+  "600x600dpi_std5",

+  "600x600dpi_draftmono4",/* mono---untested*/

+  "600x600dpi_draftmono5",/* mono */

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_Transparency[] = {

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  "600x600dpi_draft4",

+  NULL

+};

+

+static const char* canon_BJC_i950_modeuses_PPother[] = {

+  "600x600dpi_photo2",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i950_modeuses[] = {

+  { "Plain",            canon_BJC_i950_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i950_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i950_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i950_modeuses_PPgloss, 0 },

+  { "PhotopaperMatte",	canon_BJC_i950_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i950_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i950_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i950_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i950_modeuses_Hagaki, 0 },

+  { "DiscCompat", 	canon_BJC_i950_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i950_modeuses_disc, 0 },

+  { "GlossyFilm", 	canon_BJC_i950_modeuses_GlossyFilm, 0 },

+  { "TShirt",		canon_BJC_i950_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i950_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i950_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i950_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i950);

+

+/* ----------------------------------- Canon i960  ----------------------------------- */

+static const char* canon_BJC_i960_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high3",/* duplex */

+  "600x600dpi_high",

+  "600x600dpi",/*untested*/

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  "600x600dpi_draftmono",/* mono */

+  "600x600dpi_draftmono2",/* mono */

+  NULL

+  };

+

+static const char* canon_BJC_i960_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo5",/*untested*/

+  NULL

+};

+

+

+static const char* canon_BJC_i960_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_coated[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photo5",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_disc[] = {

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_high5",

+  "600x600dpi_std4",/*untested*/

+  "600x600dpi_std5",

+  "600x600dpi_draft5",

+  "600x600dpi_draftmono4",

+  "600x600dpi_draftmono5",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_Transparency[] = {

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_i960_modeuses_PPother[] = {

+  "600x600dpi_photo2",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i960_modeuses[] = {

+  { "Plain",            canon_BJC_i960_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "GlossyPro",	canon_BJC_i960_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i960_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i960_modeuses_PPgloss, 0 },

+  { "PhotopaperMatte",	canon_BJC_i960_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i960_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i960_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i960_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i960_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat", 	canon_BJC_i960_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i960_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i960_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i960_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i960_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i960_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i960);

+

+/* ----------------------------------- Canon i990 ----------------------------------- */

+static const char* canon_BJC_i990_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high3", /*duplex*/

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  "600x600dpi_draftmono",/*mono*/

+  "600x600dpi_draftmono2",/*mono*/

+  NULL

+  };

+

+/* most photo modes use R ink and therefore unsupported */

+/* unsupported */

+static const char* canon_BJC_i990_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_BJC_i990_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* unsupported */

+static const char* canon_BJC_i990_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_BJC_i990_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_BJC_i990_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photomed",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* high mode not yet supported */

+static const char* canon_BJC_i990_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i990_modeuses_disc[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i990_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft5",

+  "600x600dpi_draft4",

+  "600x600dpi_draftmono4",/*mono*/

+  "600x600dpi_draftmono5",/*mono*/

+  NULL

+};

+

+static const char* canon_BJC_i990_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i990_modeuses_Transparency[] = {

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+/* untested */

+static const char* canon_BJC_i990_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i990_modeuses[] = {

+  { "Plain",            canon_BJC_i990_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "GlossyPro",	canon_BJC_i990_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i990_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i990_modeuses_PPplus, 0 },/*untested*/

+  { "PhotopaperMatte",	canon_BJC_i990_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i990_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i990_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i990_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i990_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat", 	canon_BJC_i990_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i990_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i990_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i990_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i990_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i990_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i990);

+

+/* ----------------------------------- Canon i6100  ----------------------------------- */

+static const char* canon_BJC_i6100_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",/*untested*/

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_BJC_i6100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_Transparency[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_BJC_i6100_modeuses_PPother[] = {

+  "600x600dpi_photo2",/*untested*/

+  "600x600dpi_photo",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i6100_modeuses[] = {

+  { "Plain",            canon_BJC_i6100_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i6100_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i6100_modeuses_PPpro, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i6100_modeuses_PPpro, 0 },

+  { "PhotopaperMatte",	canon_BJC_i6100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i6100_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i6100_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i6100_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i6100_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i6100_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i6100_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i6100_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i6100_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i6100);

+

+/* ----------------------------------- Canon i9100  ----------------------------------- */

+static const char* canon_BJC_i9100_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "600x600dpi_mono",/*untested*/

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+static const char* canon_BJC_i9100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  "600x600dpi_draftmono2",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_Transparency[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",/*untested*/

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i9100_modeuses_PPother[] = {

+  "600x600dpi_photo2",/*untested*/

+  "600x600dpi_photo",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i9100_modeuses[] = {

+  { "Plain",            canon_BJC_i9100_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i9100_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i9100_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i9100_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_BJC_i9100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i9100_modeuses_PPmatte, 0 },

+  { "Coated",		canon_BJC_i9100_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i9100_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i9100_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_BJC_i9100_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i9100_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i9100_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i9100_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_BJC_i9100);

+

+/* ----------------------------------- Canon i9900  ----------------------------------- */

+static const char* canon_BJC_i9900_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  "600x600dpi_draftmono",/*mono*/

+  "600x600dpi_draftmono2",/*mono*/

+  NULL

+  };

+

+/* most photo modes use R,G inks and therefore unsupported */

+/* unsupported */

+static const char* canon_BJC_i9900_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_BJC_i9900_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* unsupported */

+static const char* canon_BJC_i9900_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_BJC_i9900_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photomed",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* high mode not yet supported */

+static const char* canon_BJC_i9900_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_disc[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft5",

+  "600x600dpi_draft4",

+  "600x600dpi_draftmono4",/*mono*/

+  "600x600dpi_draftmono5",/*mono*/

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_Transparency[] = {

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_BJC_i9900_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_BJC_i9900_modeuses[] = {

+  { "Plain",            canon_BJC_i9900_modeuses_plain, 0 },

+  { "GlossyPro",	canon_BJC_i9900_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_BJC_i9900_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_BJC_i9900_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_BJC_i9900_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_BJC_i9900_modeuses_PPgloss, 0 },

+  { "Coated",		canon_BJC_i9900_modeuses_coated, 0 },

+  { "InkJetHagaki", 	canon_BJC_i9900_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_BJC_i9900_modeuses_Hagaki, 0 },

+  { "DiscCompat", 	canon_BJC_i9900_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_BJC_i9900_modeuses_disc, 0 },

+  { "TShirt",		canon_BJC_i9900_modeuses_TShirt, 0 },

+  { "Transparency",	canon_BJC_i9900_modeuses_Transparency, 0 },

+  { "Envelope",		canon_BJC_i9900_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_BJC_i9900_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_BJC_i9900);

+

+/* ----------------------------------- Canon iP90 ----------------------------------- */

+static const char* canon_PIXMA_iP90_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high", /* mono */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2", /* no ESC (S */

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_high3", /* mono */

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_TShirt[] = {

+  "600x600dpi_tshirt", /* no ESC (S */

+  NULL

+};

+

+static const char* canon_PIXMA_iP90_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP90_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP90_modeuses_plain, 0 },/*INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL*/

+  { "GlossyPro",	canon_PIXMA_iP90_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_PIXMA_iP90_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP90_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_PIXMA_iP90_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_PIXMA_iP90_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_PIXMA_iP90_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_iP90_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_iP90_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/

+  { "TShirt",		canon_PIXMA_iP90_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_PIXMA_iP90_modeuses_Hagaki, 0 },/* INKSET_COLOR_SUPPORT*/

+  { "PhotopaperOther",	canon_PIXMA_iP90_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP90);

+

+/* ----------------------------------- Canon iP100 ----------------------------------- */

+static const char* canon_PIXMA_iP100_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high", /* mono */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_high3", /* mono */

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP100_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP100_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP100_modeuses_plain, 0 },/*INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL*/

+  { "GlossyPro",	canon_PIXMA_iP100_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_PIXMA_iP100_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_PIXMA_iP100_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_iP100_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_iP100_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/

+  { "TShirt",		canon_PIXMA_iP100_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_PIXMA_iP100_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/

+  { "PhotopaperOther",	canon_PIXMA_iP100_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP100);

+

+/* ----------------------------------- Canon iP2000  ----------------------------------- */

+static const char* canon_PIXMA_iP2000_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/* mono */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP2000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_high3",/* mono */

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_Transparency[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2000_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP2000_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP2000_modeuses_plain, 0 },

+  { "GlossyPro",	canon_PIXMA_iP2000_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP2000_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble",canon_PIXMA_iP2000_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP2000_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP2000_modeuses_PPgloss, 0 },

+  { "Coated",		canon_PIXMA_iP2000_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP2000_modeuses_PPplusDS, 0 },/*untested*/

+  { "Hagaki", 	        canon_PIXMA_iP2000_modeuses_Hagaki, 0 },/*untested*/

+  { "TShirt",		canon_PIXMA_iP2000_modeuses_TShirt, 0 },

+  { "Transparency",	canon_PIXMA_iP2000_modeuses_Transparency, 0 },

+  { "Envelope",		canon_PIXMA_iP2000_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP2000_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP2000);

+

+/* ----------------------------------- Canon iP2700  ----------------------------------- */

+static const char* canon_PIXMA_iP2700_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "300x300dpi_mono",

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "300x300dpi_std3",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP2700_modeuses_PPpro[] = {

+  "1200x1200dpi_high",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2700_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2700_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2700_modeuses_TShirt[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_PIXMA_iP2700_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP2700_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP2700_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoPro2",	canon_PIXMA_iP2700_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",	canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_PIXMA_iP2700_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_PIXMA_iP2700_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_iP2700_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_PIXMA_iP2700_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_PIXMA_iP2700_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_PIXMA_iP2700_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP2700);

+

+/* ----------------------------------- Canon iP3000  ----------------------------------- */

+static const char* canon_PIXMA_iP3000_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iP3000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* Note: iP3000 US driver does not have inkjetHagaki or Hagaki media */

+/* untested */

+static const char* canon_PIXMA_iP3000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3000_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP3000_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP3000_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP3000_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP3000_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP3000_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP3000_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP3000_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP3000_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP3000_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP3000_modeuses_inkjetHagaki, 0 },/*untested*/

+  { "Hagaki", 	        canon_PIXMA_iP3000_modeuses_Hagaki, DUPLEX_SUPPORT },/*untested*/

+  { "DiscCompat",	canon_PIXMA_iP3000_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP3000_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP3000_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP3000_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP3000_modeuses_PPother, 0 },

+  { "Transparency",     canon_PIXMA_iP3000_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP3000);

+

+/* ----------------------------------- Canon iP3100  ----------------------------------- */

+static const char* canon_PIXMA_iP3100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iP3100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* Note: iP3100 US driver does not have this media */

+/*untested*/

+static const char* canon_PIXMA_iP3100_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP3100_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP3100_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP3100_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP3100_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP3100_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP3100_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP3100_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP3100_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP3100_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP3100_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP3100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP3100_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP3100_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP3100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP3100_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP3100_modeuses_PPother, 0 },/*untested*/

+  { "Transparency",     canon_PIXMA_iP3100_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP3100);

+

+/* ----------------------------------- Canon iP3300 ----------------------------------- */

+static const char* canon_PIXMA_iP3300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP3300_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3300_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP3300_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP3300_modeuses_plain, 0 },

+  { "GlossyPro",	canon_PIXMA_iP3300_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP3300_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP3300_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP3300_modeuses_PPplusDS, 0 },/*check*/

+  { "PhotopaperMatte",	canon_PIXMA_iP3300_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP3300_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP3300_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP3300_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_PIXMA_iP3300_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP3300_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP3300_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP3300);

+

+/* ----------------------------------- Canon iP3600 ----------------------------------- */

+static const char* canon_PIXMA_iP3600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP3600_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP3600_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP3600_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP3600_modeuses_plain, 0 },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP3600_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_PIXMA_iP3600_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_PIXMA_iP3600_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss", canon_PIXMA_iP3600_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP3600_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP3600_modeuses_PPmatte, 0 },

+  { "Coated",		canon_PIXMA_iP3600_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP3600_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP3600_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_PIXMA_iP3600_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP3600_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP3600_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP3600);

+

+/* ----------------------------------- Canon iP4000  ----------------------------------- */

+static const char* canon_PIXMA_iP4000_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  "600x600dpi_high2",/*legacy*/

+  "600x600dpi_std2",/*legacy*/

+  "600x600dpi_draft2",/*legacy*/

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iP4000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* Note: iP4000 US driver does not have inkjetHagaki or Hagaki media */

+/* untested */

+static const char* canon_PIXMA_iP4000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4000_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4000_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP4000_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4000_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP4000_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP4000_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP4000_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4000_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4000_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP4000_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP4000_modeuses_inkjetHagaki, 0 },/*untested*/

+  { "Hagaki", 	        canon_PIXMA_iP4000_modeuses_Hagaki, DUPLEX_SUPPORT },/*untested*/

+  { "CD",   	        canon_PIXMA_iP4000_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+  { "DiscCompat",	canon_PIXMA_iP4000_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4000_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP4000_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4000_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4000_modeuses_PPother, 0 },

+  { "Transparency",     canon_PIXMA_iP4000_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4000);

+

+/* ----------------------------------- Canon iP4100  ----------------------------------- */

+static const char* canon_PIXMA_iP4100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iP4100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4100_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4100_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP4100_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4100_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP4100_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP4100_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP4100_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4100_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4100_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP4100_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP4100_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP4100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP4100_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4100_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP4100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4100_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4100_modeuses_PPother, 0 },/*untested*/

+  { "Transparency",     canon_PIXMA_iP4100_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4100);

+

+/* ----------------------------------- Canon iP4200  ----------------------------------- */

+static const char* canon_PIXMA_iP4200_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* most photo modes not supported yet --- used photodraft as stand-in everywhere */

+static const char* canon_PIXMA_iP4200_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* high mode not yet supported */

+static const char* canon_PIXMA_iP4200_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4200_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4200_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP4200_modeuses_transparency[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP4200_modeuses[] = {

+  { "Plain",             canon_PIXMA_iP4200_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	        canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "PhotopaperPlus",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* mostly not yet supported */

+  { "PhotopaperPlusDouble", canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "PhotopaperMatte",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "GlossyPaper",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "Coated",		canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "InkJetHagaki", 	canon_PIXMA_iP4200_modeuses_inkjetHagaki, 0 },/* partially not yet supported */

+  { "Hagaki", 	        canon_PIXMA_iP4200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "CD",   	        canon_PIXMA_iP4200_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+  { "DiscCompat",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "DiscOthers",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "TShirt",		canon_PIXMA_iP4200_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4200_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4200_modeuses_PPplus, 0 },/* not yet supported */

+  { "Transparency",      canon_PIXMA_iP4200_modeuses_transparency, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4200);

+

+/* ----------------------------------- Canon iP4300  ----------------------------------- */

+static const char* canon_PIXMA_iP4300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* most photo modes not supported yet --- used photodraft as stand-in everywhere */

+static const char* canon_PIXMA_iP4300_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* high mode not yet supported */

+static const char* canon_PIXMA_iP4300_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4300_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP4300_modeuses_transparency[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP4300_modeuses[] = {

+  { "Plain",             canon_PIXMA_iP4300_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	        canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "PhotopaperPlus",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* mostly not yet supported */

+  { "PhotopaperPlusDouble", canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "PhotopaperMatte",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "GlossyPaper",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "Coated",		canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "InkJetHagaki", 	canon_PIXMA_iP4300_modeuses_inkjetHagaki, 0 },/* partially not yet supported */

+  { "Hagaki", 	        canon_PIXMA_iP4300_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "CD",   	        canon_PIXMA_iP4300_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+  { "DiscCompat",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "DiscOthers",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "TShirt",		canon_PIXMA_iP4300_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4300_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4300_modeuses_PPplus, 0 },/* not yet supported */

+  { "Transparency",      canon_PIXMA_iP4300_modeuses_transparency, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4300);

+

+/* ----------------------------------- Canon iP4500  ----------------------------------- */

+static const char* canon_PIXMA_iP4500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4500_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP4500_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4500_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP4500_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4500_modeuses_plain, DUPLEX_SUPPORT },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP4500_modeuses_PPplus, 0 },

+  { "GlossyPro",	canon_PIXMA_iP4500_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP4500_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP4500_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4500_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4500_modeuses_PPmatte, 0 },

+  { "Coated",	        canon_PIXMA_iP4500_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP4500_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP4500_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP4500_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4500_modeuses_disc, 0 },

+  { "TShirt",	        canon_PIXMA_iP4500_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4500_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4500_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4500);

+

+/* ----------------------------------- Canon iP4600  ----------------------------------- */

+static const char* canon_PIXMA_iP4600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4600_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",/*untested*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP4600_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_disc[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4600_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP4600_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4600_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP4600_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_PIXMA_iP4600_modeuses_PPpro, 0 },

+  { "PhotoProPlat",	canon_PIXMA_iP4600_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_iP4600_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4600_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4600_modeuses_PPmatte, 0 },

+  { "Coated",	        canon_PIXMA_iP4600_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP4600_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP4600_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP4600_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4600_modeuses_disc, 0 },

+  { "TShirt",	        canon_PIXMA_iP4600_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4600_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4600_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP4600);

+

+/* ----------------------------------- Canon iP4700  ----------------------------------- */

+static const char* canon_PIXMA_iP4700_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4700_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP4700_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4700_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP4700_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4700_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP4700_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_PIXMA_iP4700_modeuses_PPpro, 0 },

+  { "PhotoProPlat",	canon_PIXMA_iP4700_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_iP4700_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4700_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4700_modeuses_PPmatte, 0 },

+  { "Coated",	        canon_PIXMA_iP4700_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_iP4700_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_iP4700_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_iP4700_modeuses_PPpro, 0 },

+  { "OtherPhotoHagakiO",canon_PIXMA_iP4700_modeuses_PPpro, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP4700_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP4700_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4700_modeuses_disc, 0 },

+  { "TShirt",	        canon_PIXMA_iP4700_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4700_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4700_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4700);

+

+/* ----------------------------------- Canon iP4900  ----------------------------------- */

+static const char* canon_PIXMA_iP4900_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2",

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP4900_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP4900_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP4900_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP4900_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP4900_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_PIXMA_iP4900_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",	canon_PIXMA_iP4900_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_iP4900_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP4900_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP4900_modeuses_PPmatte, 0 },

+  { "Coated",	        canon_PIXMA_iP4900_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_iP4900_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_iP4900_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_iP4900_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP4900_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_iP4900_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP4900_modeuses_disc, 0 },

+  { "TShirt",	        canon_PIXMA_iP4900_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP4900_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP4900_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP4900);

+

+/* ----------------------------------- Canon iP5000  ----------------------------------- */

+/* high mode not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_plain[] = {

+  "600x600dpi",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* high modes not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_PPpro[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+/* high modes not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* high modes not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_PPplusDS[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+/* US driver does not supply this media: untested */

+static const char* canon_PIXMA_iP5000_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+/* high modes not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_disc[] = {

+  /* plain mode temporarily added here */

+  "600x600dpi",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* photo modes temporarily added */

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP5000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* high modes not supported yet */

+static const char* canon_PIXMA_iP5000_modeuses_PPother[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+  };

+

+static const char* canon_PIXMA_iP5000_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP5000_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP5000_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP5000_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP5000_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP5000_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP5000_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP5000_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP5000_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP5000_modeuses_PPplusDS, 0 },/*untested*/

+  { "Hagaki", 	        canon_PIXMA_iP5000_modeuses_Hagaki, DUPLEX_SUPPORT },/*untested*/

+  { "DiscCompat",	canon_PIXMA_iP5000_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP5000_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP5000_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP5000_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP5000_modeuses_PPother, 0 },

+  { "Transparency",     canon_PIXMA_iP5000_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP5000);

+

+/* ----------------------------------- Canon iP5300  ----------------------------------- */

+static const char* canon_PIXMA_iP5300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP5300_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP5300_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP5300_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP5300_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_PIXMA_iP5300_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP5300_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP5300_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP5300_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP5300_modeuses_PPmatte, 0 },

+  { "Coated",		canon_PIXMA_iP5300_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP5300_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP5300_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "CD",   	        canon_PIXMA_iP5300_modeuses_plain, 0 },/*optional using plain*/

+  { "DiscCompat",	canon_PIXMA_iP5300_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP5300_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP5300_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP5300_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP5300_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP5300);

+

+/* ----------------------------------- Canon iP6000  ----------------------------------- */

+static const char* canon_PIXMA_iP6000_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP6000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6000_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+/*Note: US printer driver does not support inkjetHagaki */

+static const char* canon_PIXMA_iP6000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/*Note: US printer driver does not support Hagaki */

+static const char* canon_PIXMA_iP6000_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6000_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6000_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP6000_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP6000_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP6000_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_PIXMA_iP6000_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP6000_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP6000_modeuses_PPplus, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP6000_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP6000_modeuses_PPplus, 0 },

+ { "Coated",		canon_PIXMA_iP6000_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP6000_modeuses_inkjetHagaki, 0 },/*untested*/

+ { "Hagaki", 	        canon_PIXMA_iP6000_modeuses_Hagaki, DUPLEX_SUPPORT },/* untested */

+ { "CD",   	        canon_PIXMA_iP6000_modeuses_disc, 0 },/*NOTE:temporary*/

+ { "DiscCompat",	canon_PIXMA_iP6000_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP6000_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP6000_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP6000_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP6000_modeuses_PPother, 0 },

+ { "Transparency",      canon_PIXMA_iP6000_modeuses_transparency, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP6000);

+

+/* ----------------------------------- Canon iP6100  ----------------------------------- */

+static const char* canon_PIXMA_iP6100_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP6100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",/*untested*/

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6100_modeuses_PPother[] = {

+  "600x600dpi_photohigh",/*untested*/

+  NULL

+  };

+

+static const char* canon_PIXMA_iP6100_modeuses_transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP6100_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP6100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "GlossyPro",	canon_PIXMA_iP6100_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_PIXMA_iP6100_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP6100_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP6100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_iP6100_modeuses_PPplus, 0 },

+  { "Coated",		canon_PIXMA_iP6100_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP6100_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iP6100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "CD",   	        canon_PIXMA_iP6100_modeuses_disc, 0 },/*NOTE:identical, so combined*/

+  { "TShirt",		canon_PIXMA_iP6100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP6100_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP6100_modeuses_PPother, 0 },

+  { "Transparency",     canon_PIXMA_iP6100_modeuses_transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP6100);

+

+/* ----------------------------------- Canon iP6210  ----------------------------------- */

+static const char* canon_PIXMA_iP6210_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP6210_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Color */

+  "1200x1200dpi_photohigh4",

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6210_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Color */

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6210_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Color */

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6210_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6210_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  /* Color */

+  "600x600dpi_std5",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6210_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  /* Color */

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP6210_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP6210_modeuses_plain, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "GlossyPro",	canon_PIXMA_iP6210_modeuses_PPpro, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "PhotopaperPlus",	canon_PIXMA_iP6210_modeuses_PPplus, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP6210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "PhotopaperMatte",	canon_PIXMA_iP6210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "GlossyPaper",	canon_PIXMA_iP6210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "Coated",		canon_PIXMA_iP6210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_PIXMA_iP6210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "Hagaki", 	        canon_PIXMA_iP6210_modeuses_Hagaki, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_PIXMA_iP6210_modeuses_TShirt, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "Envelope",		canon_PIXMA_iP6210_modeuses_Hagaki, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_PIXMA_iP6210_modeuses_PPother, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP6210);

+

+/* ----------------------------------- Canon iP6600  ----------------------------------- */

+static const char* canon_PIXMA_iP6600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP6600_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_disc[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo5",

+  "600x600dpi_photodraft5",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6600_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP6600_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP6600_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_PIXMA_iP6600_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP6600_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP6600_modeuses_PPplus, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP6600_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP6600_modeuses_PPplus, 0 },

+ { "Coated",		canon_PIXMA_iP6600_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP6600_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP6600_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "DiscCompat",	canon_PIXMA_iP6600_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP6600_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP6600_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP6600_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP6600_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP6600);

+

+/* ----------------------------------- Canon iP6700  ----------------------------------- */

+static const char* canon_PIXMA_iP6700_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_PIXMA_iP6700_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_FA[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_disc[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo5",

+  "600x600dpi_photodraft5",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP6700_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP6700_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP6700_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_PIXMA_iP6700_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP6700_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP6700_modeuses_PPplus, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP6700_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP6700_modeuses_PPplus, 0 },

+ { "Coated",		canon_PIXMA_iP6700_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP6700_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP6700_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "FineArtPhotoRag",   canon_PIXMA_iP6700_modeuses_FA, 0 },

+ { "FineArtOther",      canon_PIXMA_iP6700_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP6700_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP6700_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP6700_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP6700_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP6700_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP6700);

+

+/* ----------------------------------- Canon iP7100  ----------------------------------- */

+static const char* canon_PIXMA_iP7100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+static const char* canon_PIXMA_iP7100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+

+static const char* canon_PIXMA_iP7100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Mono */

+  "600x600dpi_mono",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_FA[] = {

+  "600x600dpi_photohigh3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_disc[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_TShirt[] = {

+  "600x600dpi",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7100_modeuses_Transparency[] = {

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP7100_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP7100_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP7100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_PIXMA_iP7100_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP7100_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP7100_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP7100_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP7100_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_PIXMA_iP7100_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP7100_modeuses_PPplus, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP7100_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "FineArtPhotoRag", 	canon_PIXMA_iP7100_modeuses_FA, 0 },

+ { "FineArtOther", 	canon_PIXMA_iP7100_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP7100_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP7100_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP7100_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP7100_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_PIXMA_iP7100_modeuses_Transparency, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP7100_modeuses_PPother, 0 },/*untested*/

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP7100);

+

+/* ----------------------------------- Canon iP7500  ----------------------------------- */

+static const char* canon_PIXMA_iP7500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest modes not yet supported */

+static const char* canon_PIXMA_iP7500_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+

+static const char* canon_PIXMA_iP7500_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_FA[] = {

+  "600x600dpi_photohigh3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP7500_modeuses_Transparency[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP7500_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP7500_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP7500_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_PIXMA_iP7500_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP7500_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP7500_modeuses_PPplus, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP7500_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP7500_modeuses_PPplus, 0 },

+ { "Coated",		canon_PIXMA_iP7500_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP7500_modeuses_PPplus, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP7500_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "FineArtPhotoRag", 	canon_PIXMA_iP7500_modeuses_FA, 0 },

+ { "FineArtOther", 	canon_PIXMA_iP7500_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP7500_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP7500_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP7500_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP7500_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_PIXMA_iP7500_modeuses_Transparency, 0 },/*untested*/

+ { "PhotopaperOther",	canon_PIXMA_iP7500_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP7500);

+

+/* ----------------------------------- Canon iP8100  ----------------------------------- */

+static const char* canon_PIXMA_iP8100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+/* no support for modes using R yet */

+static const char* canon_PIXMA_iP8100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*untested*/

+  "600x600dpi_photo",

+  NULL

+};

+

+

+static const char* canon_PIXMA_iP8100_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Mono */

+  "600x600dpi_mono",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_FA[] = {

+  "600x600dpi_photohigh3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_disc[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_TShirt[] = {

+  "600x600dpi",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8100_modeuses_Transparency[] = {

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP8100_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP8100_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP8100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_PIXMA_iP8100_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP8100_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP8100_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP8100_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP8100_modeuses_PPgloss, 0 },

+ { "Coated",		canon_PIXMA_iP8100_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP8100_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP8100_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "FineArtPhotoRag", 	canon_PIXMA_iP8100_modeuses_FA, 0 },

+ { "FineArtOther", 	canon_PIXMA_iP8100_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP8100_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP8100_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP8100_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP8100_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_PIXMA_iP8100_modeuses_Transparency, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP8100_modeuses_PPother, 0 },/*untested*/

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP8100);

+

+/* ----------------------------------- Canon iP8500  ----------------------------------- */

+static const char* canon_PIXMA_iP8500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* modes not yet supported */

+static const char* canon_PIXMA_iP8500_modeuses_PPpro[] = {

+  "600x600dpi_photodraft",/*temporary stand-in: untested*/

+  NULL

+};

+

+/* most modes unsupported */

+static const char* canon_PIXMA_iP8500_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* most modes unsupported */

+static const char* canon_PIXMA_iP8500_modeuses_PPplusDS[] = {

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8500_modeuses_PPhires[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* US driver does not support this media: untested */

+static const char* canon_PIXMA_iP8500_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* US driver does not support this media */

+static const char* canon_PIXMA_iP8500_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8500_modeuses_disc[] = {

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8500_modeuses_Transparency[] = {

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8500_modeuses_PPother[] = {

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iP8500_modeuses[] = {

+  { "Plain",            canon_PIXMA_iP8500_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "GlossyPro",	canon_PIXMA_iP8500_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotopaperPlus",	canon_PIXMA_iP8500_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_PIXMA_iP8500_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iP8500_modeuses_PPpro, 0 },/*unsupported*/

+  { "GlossyPaper",	canon_PIXMA_iP8500_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_PIXMA_iP8500_modeuses_PPhires, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iP8500_modeuses_inkjetHagaki, 0 },/*untested*/

+  { "Hagaki", 	        canon_PIXMA_iP8500_modeuses_Hagaki, DUPLEX_SUPPORT },/*untested*/

+  { "DiscCompat",	canon_PIXMA_iP8500_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_iP8500_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_iP8500_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iP8500_modeuses_Hagaki, 0 },

+  { "Transparency",	canon_PIXMA_iP8500_modeuses_Transparency, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iP8500_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iP8500);

+

+/* ----------------------------------- Canon iP8600  ----------------------------------- */

+static const char* canon_PIXMA_iP8600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+/* modes using R not yet supported */

+static const char* canon_PIXMA_iP8600_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",/*untested*/

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode using R not supported yet */

+static const char* canon_PIXMA_iP8600_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",/*untested*/

+  "600x600dpi_photo",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Mono */

+  "600x600dpi_mono",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_FA[] = {

+  "600x600dpi_photohigh4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_disc[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_TShirt[] = {

+  "600x600dpi",

+  NULL

+};

+

+static const char* canon_PIXMA_iP8600_modeuses_Transparency[] = {

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP8600_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP8600_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP8600_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_PIXMA_iP8600_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP8600_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP8600_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP8600_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP8600_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_PIXMA_iP8600_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP8600_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP8600_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "FineArtPhotoRag", 	canon_PIXMA_iP8600_modeuses_FA, 0 },

+ { "FineArtOther", 	canon_PIXMA_iP8600_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP8600_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP8600_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP8600_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP8600_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_PIXMA_iP8600_modeuses_Transparency, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP8600_modeuses_PPother, 0 },/*untested*/

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP8600);

+

+/* ----------------------------------- Canon iP9910  ----------------------------------- */

+static const char* canon_PIXMA_iP9910_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  NULL

+  };

+

+/* highest mode using R not yet supported */

+static const char* canon_PIXMA_iP9910_modeuses_PPpro[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photo2",

+  NULL

+};

+

+/* highest mode using R not supported yet */

+static const char* canon_PIXMA_iP9910_modeuses_PPplus[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Mono */

+  "600x600dpi_mono",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_FA[] = {

+  "600x600dpi_photohigh4",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_disc[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_TShirt[] = {

+  "600x600dpi",

+  NULL

+};

+

+static const char* canon_PIXMA_iP9910_modeuses_Transparency[] = {

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iP9910_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iP9910_modeuses[] = {

+ { "Plain",             canon_PIXMA_iP9910_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_PIXMA_iP9910_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iP9910_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iP9910_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iP9910_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_PIXMA_iP9910_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_PIXMA_iP9910_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iP9910_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iP9910_modeuses_Hagaki, 0 },

+ { "FineArtPhotoRag", 	canon_PIXMA_iP9910_modeuses_FA, 0 },

+ { "FineArtOther", 	canon_PIXMA_iP9910_modeuses_FA, 0 },

+ { "DiscCompat",	canon_PIXMA_iP9910_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_iP9910_modeuses_disc, 0 },

+ { "TShirt",		canon_PIXMA_iP9910_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iP9910_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_PIXMA_iP9910_modeuses_Transparency, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iP9910_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iP9910);

+

+/* ----------------------------------- Canon iX4000  ----------------------------------- */

+static const char* canon_PIXMA_iX4000_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iX4000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iX4000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iX4000_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iX4000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX4000_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX4000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* US driver does not have this media */

+static const char* canon_PIXMA_iX4000_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+/* US driver does not have this media */

+static const char* canon_PIXMA_iX4000_modeuses_Transparency[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iX4000_modeuses[] = {

+ { "Plain",             canon_PIXMA_iX4000_modeuses_plain, 0 },

+ { "GlossyPro",	        canon_PIXMA_iX4000_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iX4000_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iX4000_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iX4000_modeuses_PPplusDS, 0 },

+ { "GlossyPaper",	canon_PIXMA_iX4000_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_PIXMA_iX4000_modeuses_PPplusDS, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iX4000_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iX4000_modeuses_Hagaki, 0 },

+ { "TShirt",		canon_PIXMA_iX4000_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iX4000_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iX4000_modeuses_PPother, 0 },/*Note: US driver does not have this media*/

+ { "Transparency",	canon_PIXMA_iX4000_modeuses_Transparency, 0 },/*Note: US driver does not have this media */

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iX4000);

+

+/* ----------------------------------- Canon iX5000  ----------------------------------- */

+static const char* canon_PIXMA_iX5000_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iX5000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iX5000_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iX5000_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iX5000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX5000_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX5000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* US driver does not have this media */

+static const char* canon_PIXMA_iX5000_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_iX5000_modeuses[] = {

+ { "Plain",             canon_PIXMA_iX5000_modeuses_plain, 0 },

+ { "GlossyPro",	        canon_PIXMA_iX5000_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_PIXMA_iX5000_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_PIXMA_iX5000_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_iX5000_modeuses_PPplusDS, 0 },

+ { "GlossyPaper",	canon_PIXMA_iX5000_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_PIXMA_iX5000_modeuses_PPplusDS, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_iX5000_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_iX5000_modeuses_Hagaki, 0 },

+ { "TShirt",		canon_PIXMA_iX5000_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_iX5000_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_iX5000_modeuses_PPother, 0 },/*Note: US driver does not have this media*/

+ { "Transparency",	canon_PIXMA_iX5000_modeuses_inkjetHagaki, 0 },/*Note: US driver does not have this media */

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_iX5000);

+

+/* ----------------------------------- Canon iX6500  ----------------------------------- */

+static const char* canon_PIXMA_iX6500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+

+static const char* canon_PIXMA_iX6500_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iX6500_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_iX6500_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX6500_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iX6500_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX6500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/*untested*/

+static const char* canon_PIXMA_iX6500_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iX6500_modeuses[] = {

+  { "Plain",            canon_PIXMA_iX6500_modeuses_plain, 0 },

+  { "PhotoPlusGloss2",	canon_PIXMA_iX6500_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",	canon_PIXMA_iX6500_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_iX6500_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_PIXMA_iX6500_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iX6500_modeuses_PPmatte, 0 },

+  { "Coated",		canon_PIXMA_iX6500_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iX6500_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_iX6500_modeuses_PPplusG2, 0 },

+  { "HagakiA", 	        canon_PIXMA_iX6500_modeuses_Hagaki, 0 },

+  { "Hagaki", 	        canon_PIXMA_iX6500_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_PIXMA_iX6500_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_iX6500_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_PIXMA_iX6500_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iX6500);

+

+/* ----------------------------------- Canon iX7000  ----------------------------------- */

+static const char* canon_PIXMA_iX7000_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+

+static const char* canon_PIXMA_iX7000_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iX7000_modeuses_PPproPlat[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/* highest mode not supported yet */

+static const char* canon_PIXMA_iX7000_modeuses_PPsemigloss[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_iX7000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_iX7000_modeuses_Hagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_PIXMA_iX7000_modeuses_FA[] = {

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_iX7000_modeuses[] = {

+  { "Plain",            canon_PIXMA_iX7000_modeuses_plain, DUPLEX_SUPPORT },

+  { "PhotoPlusGloss2",	canon_PIXMA_iX7000_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",	canon_PIXMA_iX7000_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_iX7000_modeuses_PPsemigloss, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_iX7000_modeuses_PPproPlat, 0 },

+  { "InkJetHagaki", 	canon_PIXMA_iX7000_modeuses_inkjetHagaki, 0 },

+  { "HagakiA", 	        canon_PIXMA_iX7000_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_iX7000_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "FineArtPhotoRag", 	canon_PIXMA_iX7000_modeuses_FA, 0 },

+  { "FineArtOther", 	canon_PIXMA_iX7000_modeuses_FA, 0 },

+  { "Envelope",		canon_PIXMA_iX7000_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_iX7000);

+

+/* ----------------------------------- Canon MP150  ----------------------------------- */

+static const char* canon_MULTIPASS_MP150_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* color-only */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP150_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh3",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  /* mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",

+  /* color-only */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP150_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP150_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP150_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "GlossyPro",	canon_MULTIPASS_MP150_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP150_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP150_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP150_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MP150_modeuses_PPgloss, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MP150_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP150_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MP150_modeuses_Hagaki, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MP150_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MP150_modeuses_Hagaki, INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MP150_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP150);

+

+/* ----------------------------------- Canon MP190  ----------------------------------- */

+static const char* canon_MULTIPASS_MP190_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP190_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP190_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP190_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP190_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP190_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP190_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP190_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP190_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP190_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoPro2",	canon_MULTIPASS_MP190_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "GlossyPro",	canon_MULTIPASS_MP190_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP190_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP190_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MP190_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP190_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MP190_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP190_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MP190_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MP190_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MP190_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MP190_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP190);

+

+/* ----------------------------------- Canon MP210  ----------------------------------- */

+static const char* canon_MULTIPASS_MP210_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP210_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested here*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested here*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested here*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP210_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP210_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP210_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "GlossyPro",	canon_MULTIPASS_MP210_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP210_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP210_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MP210_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MP210_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP210_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MP210_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MP210_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MP210_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MP210_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP210);

+

+/* ----------------------------------- Canon MP240  ----------------------------------- */

+static const char* canon_MULTIPASS_MP240_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP240_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP240_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP240_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP240_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP240_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP240_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP240_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+ { "PhotoPlusGloss2",	canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoPro2",	        canon_MULTIPASS_MP240_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP240_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MP240_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MP240_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MP240_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MP240_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP240);

+

+/* ----------------------------------- Canon MP250  ----------------------------------- */

+static const char* canon_MULTIPASS_MP250_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  /* mono */

+  "600x600dpi_highmono",

+  "600x600dpi_highmono2",/* duplex */

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",/*untested*/

+  /* color-only --- no special duplex */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",/*untested*/

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP250_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP250_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP250_modeuses_Hagaki[] = {

+  "600x600dpi_high5",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* mono */

+  "600x600dpi_highmono5",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* color-only */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP250_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP250_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP250_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP250_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotoPro2",	canon_MULTIPASS_MP250_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",	canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_MULTIPASS_MP250_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MP250_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "ProPhotoHagakiP",  canon_MULTIPASS_MP250_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MP250_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT},

+  { "TShirt",		canon_MULTIPASS_MP250_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MP250_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MP250_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP250);

+

+/* ----------------------------------- Canon MP280  ----------------------------------- */

+static const char* canon_MULTIPASS_MP280_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",/*untested*/

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",/*untested*/

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP280_modeuses_PPproPlat[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP280_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP280_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP280_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP280_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP280_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP280_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+ { "PhotoPlusGloss2",	canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MP280_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "HagakiA", 	        canon_MULTIPASS_MP280_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "CanonPhotoHagakiK", canon_MULTIPASS_MP280_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MP280_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MP280_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MP280_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MP280_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP280);

+

+/* ----------------------------------- Canon MP360  ----------------------------------- */

+static const char* canon_MULTIPASS_MP360_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_highmono",/* mono */

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP360_modeuses_PPpro[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_PPplus[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_highmono2",/* mono */

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP360_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP360_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP360_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP360_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP360_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP360_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP360_modeuses_PPgloss, 0 },

+  { "Coated",		canon_MULTIPASS_MP360_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP360_modeuses_PPmatte, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP360_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MP360_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP360_modeuses_Hagaki, 0 },

+  { "Transparency",	canon_MULTIPASS_MP360_modeuses_Transparency, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP360);

+

+/* ----------------------------------- Canon MP470  ----------------------------------- */

+static const char* canon_MULTIPASS_MP470_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+/* high mode not supported yet */

+static const char* canon_MULTIPASS_MP470_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  /* Mono */

+  "600x600dpi_highmono3",

+  "600x600dpi_mono3",

+  "600x600dpi_draftmono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP470_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP470_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP470_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+  { "GlossyPro",	canon_MULTIPASS_MP470_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP470_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP470_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP470_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP470_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MP470_modeuses_PPplusDS, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MP470_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP470_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MP470_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MP470_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MP470_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MP470_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP470);

+

+/* ----------------------------------- Canon MP480  ----------------------------------- */

+static const char* canon_MULTIPASS_MP480_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP480_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP480_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP480_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* Mono */

+  "600x600dpi_highmono3",

+  "600x600dpi_mono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP480_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP480_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP480_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP480_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+ { "PhotoPlusGloss2",	canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoPro2",	        canon_MULTIPASS_MP480_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP480_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MP480_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MP480_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MP480_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MP480_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP480);

+

+/* ----------------------------------- Canon MP490  ----------------------------------- */

+static const char* canon_MULTIPASS_MP490_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",/*untested*/

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  "300x300dpi_std3",

+  "300x300dpi_draft3",/*untested*/

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP490_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP490_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP490_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_mono2",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP490_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP490_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP490_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP490_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+ { "PhotoPro2",	        canon_MULTIPASS_MP490_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoPlusGloss2",	canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "ProPhotoHagakiP", 	canon_MULTIPASS_MP490_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "CanonPhotoHagakiK", canon_MULTIPASS_MP490_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "HagakiA", 	        canon_MULTIPASS_MP490_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "Hagaki", 	        canon_MULTIPASS_MP490_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MP490_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MP490_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MP490_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP490);

+

+/* ----------------------------------- Canon MP493  ----------------------------------- */

+static const char* canon_MULTIPASS_MP493_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP493_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP493_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP493_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* Mono */

+  "600x600dpi_highmono3",

+  "600x600dpi_mono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP493_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP493_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP493_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP493_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL},

+ { "PhotoPlusGloss2",	canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoPro2",	        canon_MULTIPASS_MP493_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "HagakiA", 	        canon_MULTIPASS_MP493_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "CanonPhotoHagakiK", canon_MULTIPASS_MP493_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+ { "ProPhotoHagakiP",   canon_MULTIPASS_MP493_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MP493_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MP493_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MP493_modeuses_Hagaki,INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MP493_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP493);

+

+/* ----------------------------------- Canon MP520  ----------------------------------- */

+static const char* canon_MULTIPASS_MP520_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP520_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP520_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP520_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP520_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP520_modeuses_PPpro, 0 },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP520_modeuses_PPplus, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP520_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP520_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP520_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP520_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_MULTIPASS_MP520_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP520_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP520_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MP520_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP520_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP520_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP520);

+

+/* ----------------------------------- Canon MP530  ----------------------------------- */

+static const char* canon_MULTIPASS_MP530_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP530_modeuses_PPpro[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* only draft available */

+static const char* canon_MULTIPASS_MP530_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/*most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP530_modeuses_PPplusDS[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP530_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP530_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP530_modeuses_disc[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP530_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP530_modeuses_PPother[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP530_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP530_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP530_modeuses_PPpro, 0 },/*not supported yet*/

+  { "PhotopaperPlus",	canon_MULTIPASS_MP530_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP530_modeuses_PPplusDS, 0 },/*not supported yet*/

+  { "GlossyPaper",	canon_MULTIPASS_MP530_modeuses_PPplusDS, 0 },/*not supported yet*/

+  { "PhotopaperMatte",	canon_MULTIPASS_MP530_modeuses_PPplusDS, 0 },/*not supported yet*/

+  { "Coated",		canon_MULTIPASS_MP530_modeuses_PPplusDS, 0 },/*not supported yet*/

+  { "InkJetHagaki", 	canon_MULTIPASS_MP530_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP530_modeuses_Hagaki, 0 },

+  { "CD",   	        canon_MULTIPASS_MP530_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+  { "DiscCompat",	canon_MULTIPASS_MP530_modeuses_disc, 0 },/*not supported yet*/

+  { "DiscOthers",	canon_MULTIPASS_MP530_modeuses_disc, 0 },/*not supported yet*/

+  { "TShirt",		canon_MULTIPASS_MP530_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP530_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP530_modeuses_PPother, 0 },/*not supported yet*/

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP530);

+

+/* ----------------------------------- Canon MP540  ----------------------------------- */

+static const char* canon_MULTIPASS_MP540_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP540_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP540_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP540_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP540_modeuses_plain, 0 },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP540_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP540_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MP540_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP540_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP540_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss", canon_MULTIPASS_MP540_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_MULTIPASS_MP540_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP540_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP540_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MP540_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP540_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP540_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP540);

+

+/* ----------------------------------- Canon MP550  ----------------------------------- */

+static const char* canon_MULTIPASS_MP550_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+/*highest mode not supported yet*/

+static const char* canon_MULTIPASS_MP550_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP550_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP550_modeuses[] = {

+  { "Plain",		canon_MULTIPASS_MP550_modeuses_plain, 0 },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP550_modeuses_PPpro, 0 },

+  { "PhotoProPlat",	canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP550_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP550_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MP550_modeuses_Hagaki, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP550_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "ProPhotoHagakiP",  canon_MULTIPASS_MP550_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP550_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MP550_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP550_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP550_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP550);

+

+/* ----------------------------------- Canon MP560  ----------------------------------- */

+static const char* canon_MULTIPASS_MP560_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/* duplex */

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+/*highest mode not supported yet*/

+static const char* canon_MULTIPASS_MP560_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP560_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP560_modeuses[] = {

+  { "Plain",		canon_MULTIPASS_MP560_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP560_modeuses_PPpro, 0 },

+  { "PhotoProPlat",	canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP560_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP560_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MP560_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP560_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "ProPhotoHagakiP",  canon_MULTIPASS_MP560_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP560_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MP560_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP560_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP560_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP560);

+

+/* ----------------------------------- Canon MP600  ----------------------------------- */

+static const char* canon_MULTIPASS_MP600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_PPpro[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+/*most modes unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_PPplusDS[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_PPmatte[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+/*highest mode unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP600_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_disc[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP600_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP600_modeuses_PPother[] = {

+  "600x600dpi_photodraft",/*stand-in*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP600_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP600_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_MULTIPASS_MP600_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_MULTIPASS_MP600_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP600_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP600_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_MULTIPASS_MP600_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_MULTIPASS_MP600_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP600_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP600_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "CD",	        canon_MULTIPASS_MP600_modeuses_plain, 0 },/*temporary for plain modes*/

+ { "DiscCompat",	canon_MULTIPASS_MP600_modeuses_disc, 0 },

+ { "DiscOthers",	canon_MULTIPASS_MP600_modeuses_disc, 0 },

+ { "TShirt",		canon_MULTIPASS_MP600_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP600_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP600_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP600);

+

+/* ----------------------------------- Canon MP610  ----------------------------------- */

+static const char* canon_MULTIPASS_MP610_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* missing highest resolution mode as not yet implemented */

+static const char* canon_MULTIPASS_MP610_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP610_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP610_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP610_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_MULTIPASS_MP610_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_MULTIPASS_MP610_modeuses_PPplus, 0 },

+ { "PhotoPlusGloss2",   canon_MULTIPASS_MP610_modeuses_PPplusG2, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP610_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP610_modeuses_PPmatte, 0 },

+ { "GlossyPaper",	canon_MULTIPASS_MP610_modeuses_PPplusDS, 0 },

+ { "Coated",		canon_MULTIPASS_MP610_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP610_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP610_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "DiscCompat",	canon_MULTIPASS_MP610_modeuses_disc, 0 },

+ { "DiscOthers",	canon_MULTIPASS_MP610_modeuses_disc, 0 },

+ { "TShirt",		canon_MULTIPASS_MP610_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP610_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP610_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP610);

+

+/* ----------------------------------- Canon MP620  ----------------------------------- */

+static const char* canon_MULTIPASS_MP620_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP620_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP620_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP620_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP620_modeuses_plain, 0 },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP620_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP620_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MP620_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP620_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP620_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss", canon_MULTIPASS_MP620_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_MULTIPASS_MP620_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP620_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP620_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MP620_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP620_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP620_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP620);

+

+/* ----------------------------------- Canon MP630  ----------------------------------- */

+static const char* canon_MULTIPASS_MP630_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP630_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP630_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP630_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP630_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP630_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP630_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MP630_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss", canon_MULTIPASS_MP630_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP630_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP630_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP630_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP630_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP630_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat", 	canon_MULTIPASS_MP630_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_MULTIPASS_MP630_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP630_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP630_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP630_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP630);

+

+/* ----------------------------------- Canon MP640  ----------------------------------- */

+static const char* canon_MULTIPASS_MP640_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP640_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP640_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP640_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP640_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP640_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP640_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MP640_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss", canon_MULTIPASS_MP640_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP640_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP640_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP640_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MP640_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP640_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MP640_modeuses_PPplusG2, 0 },

+  { "ProPhotoHagakiP",  canon_MULTIPASS_MP640_modeuses_PPpro, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP640_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat", 	canon_MULTIPASS_MP640_modeuses_disc, 0 },

+  { "DiscOthers", 	canon_MULTIPASS_MP640_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP640_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP640_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP640_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP640);

+

+/* ----------------------------------- Canon MP700  ----------------------------------- */

+static const char* canon_MULTIPASS_MP700_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",/*untested*/

+  "600x600dpi_draft",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP700_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",/*untested*/

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_Hagaki[] = {

+  "600x600dpi_high3",/*untested*/

+  "600x600dpi_high2",

+  "600x600dpi_std2",/*untested*/

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP700_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+/*untested*/

+static const char* canon_MULTIPASS_MP700_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP700_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP700_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP700_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP700_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP700_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP700_modeuses_PPpro, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP700_modeuses_PPplus, 0 },

+  { "Coated",		canon_MULTIPASS_MP700_modeuses_coated, 0 },

+  { "GlossyFilm",	canon_MULTIPASS_MP700_modeuses_PPplus, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP700_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP700_modeuses_Hagaki, 0 },

+  { "DiscCompat",	canon_MULTIPASS_MP700_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP700_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP700_modeuses_TShirt, 0 },

+  { "Transparency",	canon_MULTIPASS_MP700_modeuses_Transparency, 0 },

+  { "Envelope",		canon_MULTIPASS_MP700_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP700_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP700);

+

+/* ----------------------------------- Canon MP710  ----------------------------------- */

+static const char* canon_MULTIPASS_MP710_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",/*untested*/

+  "600x600dpi_draft",

+  "300x300dpi_high",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP710_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_coated[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",/*untested*/

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_Hagaki[] = {

+  "600x600dpi_high3",/*untested*/

+  "600x600dpi_high2",

+  "600x600dpi_std2",/*untested*/

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP710_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+/*untested*/

+static const char* canon_MULTIPASS_MP710_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP710_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP710_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP710_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP710_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP710_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP710_modeuses_PPpro, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP710_modeuses_PPplus, 0 },

+  { "Coated",		canon_MULTIPASS_MP710_modeuses_coated, 0 },

+  { "GlossyFilm",	canon_MULTIPASS_MP710_modeuses_PPplus, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP710_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP710_modeuses_Hagaki, 0 },

+  { "DiscCompat",	canon_MULTIPASS_MP710_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP710_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP710_modeuses_TShirt, 0 },

+  { "Transparency",	canon_MULTIPASS_MP710_modeuses_Transparency, 0 },

+  { "Envelope",		canon_MULTIPASS_MP710_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP710_modeuses_PPother, 0 },/*untested*/

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP710);

+

+/* ----------------------------------- Canon MP750  ----------------------------------- */

+static const char* canon_MULTIPASS_MP750_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP750_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_Transparency[] = {

+  "600x600dpi_ohphigh",

+  "600x600dpi_ohp",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP750_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP750_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP750_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MP750_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP750_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP750_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP750_modeuses_PPpro, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP750_modeuses_PPplus, 0 },

+  { "Coated",		canon_MULTIPASS_MP750_modeuses_PPplus, 0 },

+  { "GlossyFilm",	canon_MULTIPASS_MP750_modeuses_PPplus, 0 },/*untested*/

+  { "InkJetHagaki", 	canon_MULTIPASS_MP750_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP750_modeuses_Hagaki, 0 },

+  { "DiscCompat",	canon_MULTIPASS_MP750_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP750_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP750_modeuses_TShirt, 0 },

+  { "Transparency",	canon_MULTIPASS_MP750_modeuses_Transparency, 0 },

+  { "Envelope",		canon_MULTIPASS_MP750_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP750_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP750);

+

+/* ----------------------------------- Canon MP800  ----------------------------------- */

+static const char* canon_MULTIPASS_MP800_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP800_modeuses_PPpro[] = {

+  "600x600dpi_photo",/*temporary stand-in*/

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* only draft available */

+static const char* canon_MULTIPASS_MP800_modeuses_PPplus[] = {

+  "600x600dpi_photo",/*temporary stand-in*/

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/*most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP800_modeuses_PPplusDS[] = {

+  "600x600dpi_photo",/*temporary stand-in*/

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP800_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP800_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP800_modeuses_disc[] = {

+  "600x600dpi_photo",/*temporary stand-in*/

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP800_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP800_modeuses_PPother[] = {

+  "600x600dpi_photo",/*temporary stand-in*/

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP800_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP800_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_MULTIPASS_MP800_modeuses_PPpro, 0 },/*not supported yet*/

+ { "PhotopaperPlus",	canon_MULTIPASS_MP800_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP800_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "GlossyPaper",	canon_MULTIPASS_MP800_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "PhotopaperMatte",	canon_MULTIPASS_MP800_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "Coated",		canon_MULTIPASS_MP800_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "InkJetHagaki", 	canon_MULTIPASS_MP800_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP800_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "CD",   	        canon_MULTIPASS_MP800_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+ { "DiscCompat",	canon_MULTIPASS_MP800_modeuses_disc, 0 },/*not supported yet*/

+ { "DiscOthers",	canon_MULTIPASS_MP800_modeuses_disc, 0 },/*not supported yet*/

+ { "TShirt",		canon_MULTIPASS_MP800_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP800_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP800_modeuses_PPother, 0 },/*not supported yet*/

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP800);

+

+/* ----------------------------------- Canon MP810  ----------------------------------- */

+static const char* canon_MULTIPASS_MP810_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP810_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP810_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP810_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP810_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_MULTIPASS_MP810_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_MULTIPASS_MP810_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP810_modeuses_PPplusDS, 0 },

+ { "GlossyPaper",	canon_MULTIPASS_MP810_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP810_modeuses_PPmatte, 0 },

+ { "Coated",		canon_MULTIPASS_MP810_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP810_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP810_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "CD",   	        canon_MULTIPASS_MP810_modeuses_plain,  },/*NOTE:option*/

+ { "DiscCompat",	canon_MULTIPASS_MP810_modeuses_disc, 0 },

+ { "DiscOthers",	canon_MULTIPASS_MP810_modeuses_disc, 0 },

+ { "TShirt",		canon_MULTIPASS_MP810_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP810_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP810_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP810);

+

+/* ----------------------------------- Canon MP830  ----------------------------------- */

+static const char* canon_MULTIPASS_MP830_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP830_modeuses_PPpro[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* only draft available */

+static const char* canon_MULTIPASS_MP830_modeuses_PPplus[] = {

+  "600x600dpi_photodraft",

+  NULL

+};

+

+/*most photo modes not yet supported */

+static const char* canon_MULTIPASS_MP830_modeuses_PPplusDS[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MP830_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP830_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP830_modeuses_disc[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP830_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP830_modeuses_PPother[] = {

+  "600x600dpi_photodraft",/*temporary stand-in*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP830_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP830_modeuses_plain, DUPLEX_SUPPORT },

+ { "GlossyPro",	        canon_MULTIPASS_MP830_modeuses_PPpro, 0 },/*not supported yet*/

+ { "PhotopaperPlus",	canon_MULTIPASS_MP830_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP830_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "GlossyPaper",	canon_MULTIPASS_MP830_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "PhotopaperMatte",	canon_MULTIPASS_MP830_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "Coated",		canon_MULTIPASS_MP830_modeuses_PPplusDS, 0 },/*not supported yet*/

+ { "InkJetHagaki", 	canon_MULTIPASS_MP830_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP830_modeuses_Hagaki, DUPLEX_SUPPORT },

+ { "CD",   	        canon_MULTIPASS_MP830_modeuses_plain, 0 },/*NOTE:temporary replacement*/

+ { "DiscCompat",	canon_MULTIPASS_MP830_modeuses_disc, 0 },/*not supported yet*/

+ { "DiscOthers",	canon_MULTIPASS_MP830_modeuses_disc, 0 },/*not supported yet*/

+ { "TShirt",		canon_MULTIPASS_MP830_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP830_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP830_modeuses_PPother, 0 },/*not supported yet*/

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP830);

+

+/* ----------------------------------- Canon MP900  ----------------------------------- */

+static const char* canon_MULTIPASS_MP900_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_draftmono",

+  "600x600dpi_draftmono2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MP900_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_coated[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_Hagaki[] = {

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",

+  "600x600dpi_draftmono4",/* Mono */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_disc[] = {

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP900_modeuses_Transparency[] = {

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+/*untested*/

+static const char* canon_MULTIPASS_MP900_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP900_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP900_modeuses_plain, 0 },

+ { "GlossyPro",	        canon_MULTIPASS_MP900_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_MULTIPASS_MP900_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 },

+ { "GlossyPaper",	canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP900_modeuses_PPmatte, 0 },

+ { "Coated",		canon_MULTIPASS_MP900_modeuses_coated, 0 },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP900_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP900_modeuses_Hagaki, 0 },

+ { "DiscCompat",	canon_MULTIPASS_MP900_modeuses_disc, 0 },

+ { "DiscOthers",	canon_MULTIPASS_MP900_modeuses_disc, 0 },

+ { "TShirt",		canon_MULTIPASS_MP900_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP900_modeuses_Hagaki, 0 },

+ { "Transparency",	canon_MULTIPASS_MP900_modeuses_Transparency, 0 },

+ { "PhotopaperOther",	canon_MULTIPASS_MP900_modeuses_PPother, 0 },/*untested*/

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP900);

+

+/* ----------------------------------- Canon MP950  ----------------------------------- */

+static const char* canon_MULTIPASS_MP950_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*highest mode not yet supported */

+static const char* canon_MULTIPASS_MP950_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  "600x600dpi_photodraft",/*untested*/

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_FA[] = {

+  "600x600dpi_photohigh4",

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_disc[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo5",

+  "600x600dpi_photodraft5",

+  NULL

+  /* No mono modes for this media */

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_Transparency[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP950_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  "600x600dpi_photodraft",/*untested*/

+  /* No mono modes for this media */

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MP950_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP950_modeuses_plain, DUPLEX_SUPPORT },

+  { "GlossyPro",	canon_MULTIPASS_MP950_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP950_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP950_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP950_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP950_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP950_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP950_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP950_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_MULTIPASS_MP950_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP950_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP950_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP950_modeuses_Hagaki, 0 },

+  { "FineArtPhotoRag",	canon_MULTIPASS_MP950_modeuses_FA, 0 },

+  { "FineArtOther",	canon_MULTIPASS_MP950_modeuses_FA, 0 },

+  { "Transparency",	canon_MULTIPASS_MP950_modeuses_Transparency, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP950_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP950);

+

+/* ----------------------------------- Canon MP960  ----------------------------------- */

+static const char* canon_MULTIPASS_MP960_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/*duplex*/

+  "600x600dpi",

+  "600x600dpi_draft",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*highest mode not yet supported */

+static const char* canon_MULTIPASS_MP960_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_FA[] = {

+  "600x600dpi_photohigh5",

+  /* Mono not yet supported */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+  /* No mono modes for this media */

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* Note: this media is not supported in Windows driver: taken from MP950 */

+static const char* canon_MULTIPASS_MP960_modeuses_Transparency[] = {

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  /* No mono modes for this media */

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP960_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  /* No mono modes for this media */

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP960_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MP960_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+ { "GlossyPro",	        canon_MULTIPASS_MP960_modeuses_PPpro, 0 },

+ { "PhotopaperPlus",	canon_MULTIPASS_MP960_modeuses_PPplus, 0 },

+ { "PhotopaperPlusDouble", canon_MULTIPASS_MP960_modeuses_PPplusDS, 0 },

+ { "GlossyPaper",	canon_MULTIPASS_MP960_modeuses_PPplusDS, 0 },

+ { "PhotopaperMatte",	canon_MULTIPASS_MP960_modeuses_PPmatte, 0 },

+ { "Coated",		canon_MULTIPASS_MP960_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_MULTIPASS_MP960_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_MULTIPASS_MP960_modeuses_Hagaki, DUPLEX_SUPPORT }, /* not sure */

+ { "DiscCompat",	canon_MULTIPASS_MP960_modeuses_disc, 0 },

+ { "DiscOthers",	canon_MULTIPASS_MP960_modeuses_disc, 0 },

+ { "TShirt",		canon_MULTIPASS_MP960_modeuses_TShirt, 0 },

+ { "Envelope",		canon_MULTIPASS_MP960_modeuses_Hagaki, 0 },

+ { "FineArtPhotoRag",	canon_MULTIPASS_MP960_modeuses_FA, 0 },

+ { "FineArtOther",	canon_MULTIPASS_MP960_modeuses_FA, 0 },

+ { "Transparency",	canon_MULTIPASS_MP960_modeuses_Transparency, 0 },/*untested*/

+ { "PhotopaperOther",	canon_MULTIPASS_MP960_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP960);

+

+/* ----------------------------------- Canon MP970  ----------------------------------- */

+/* TODO: mono modes for photo media*/

+

+static const char* canon_MULTIPASS_MP970_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/*duplex*/

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*highest mode not yet supported */

+static const char* canon_MULTIPASS_MP970_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_FA[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP970_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP970_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP970_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "GlossyPro",	canon_MULTIPASS_MP970_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MP970_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MP970_modeuses_PPplus, 0 },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MP970_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP970_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP970_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP970_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP970_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP970_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_MULTIPASS_MP970_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP970_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP970_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP970_modeuses_Hagaki, 0 },

+  { "FineArtPhotoRag",	canon_MULTIPASS_MP970_modeuses_FA, 0 },

+  { "FineArtOther",	canon_MULTIPASS_MP970_modeuses_FA, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP970_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP970);

+

+/* ----------------------------------- Canon MP980  ----------------------------------- */

+/* TODO: mono modes for photo media*/

+

+static const char* canon_MULTIPASS_MP980_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/*duplex*/

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/*photo modes not yet supported */

+static const char* canon_MULTIPASS_MP980_modeuses_PPpro[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+/*photo modes not yet supported */

+static const char* canon_MULTIPASS_MP980_modeuses_PPplus[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+/*photo modes not yet supported */

+static const char* canon_MULTIPASS_MP980_modeuses_FA[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_disc[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP980_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP980_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP980_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MP980_modeuses_PPplus, 0 },/*unsupported*/

+  { "PhotoPro2",	canon_MULTIPASS_MP980_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotoProPlat",	canon_MULTIPASS_MP980_modeuses_PPplus, 0 },/*unsupported*/

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP980_modeuses_PPplus, 0 },/*unsupported*/

+  { "GlossyPaper",	canon_MULTIPASS_MP980_modeuses_PPplus, 0 },/*unsupported*/

+  { "PhotopaperMatte",	canon_MULTIPASS_MP980_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP980_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP980_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MP980_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_MULTIPASS_MP980_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP980_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP980_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP980_modeuses_Hagaki, 0 },

+  { "FineArtPhotoRag",	canon_MULTIPASS_MP980_modeuses_FA, 0 },/*unsupported*/

+  { "FineArtOther",	canon_MULTIPASS_MP980_modeuses_FA, 0 },/*unsupported*/

+  { "PhotopaperOther",	canon_MULTIPASS_MP980_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP980);

+

+/* ----------------------------------- Canon MP990  ----------------------------------- */

+/* Most photo modes not supported */

+static const char* canon_MULTIPASS_MP990_modeuses_plain[] = {

+  "600x600dpi_high2",

+  "600x600dpi_high",/*duplex*/

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+/* unsupported */

+static const char* canon_MULTIPASS_MP990_modeuses_PPpro[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+/* unsupported */

+static const char* canon_MULTIPASS_MP990_modeuses_PPproPlat[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+/* unsupported */

+static const char* canon_MULTIPASS_MP990_modeuses_PPplus[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+/*unsupported*/

+static const char* canon_MULTIPASS_MP990_modeuses_FA[] = {

+  "600x600dpi_photo",/*stand-in*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MP990_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MP990_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MP990_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MP990_modeuses_PPplus, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MP990_modeuses_PPpro, 0 },

+  { "PhotoProPlat",	canon_MULTIPASS_MP990_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MP990_modeuses_PPplus, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MP990_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MP990_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MP990_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MP990_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MP990_modeuses_PPplus, 0 },

+  { "ProPhotoHagakiP",  canon_MULTIPASS_MP990_modeuses_PPproPlat, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MP990_modeuses_Hagaki, DUPLEX_SUPPORT },/* not sure */

+  { "Hagaki", 	        canon_MULTIPASS_MP990_modeuses_Hagaki, DUPLEX_SUPPORT },/* not sure */

+  { "DiscCompat",	canon_MULTIPASS_MP990_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MP990_modeuses_disc, 0 },

+  { "TShirt",		canon_MULTIPASS_MP990_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MP990_modeuses_Hagaki, 0 },

+  { "FineArtPhotoRag",	canon_MULTIPASS_MP990_modeuses_FA, 0 },

+  { "FineArtOther",	canon_MULTIPASS_MP990_modeuses_FA, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MP990_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MP990);

+

+/* ----------------------------------- Canon MX300  ----------------------------------- */

+static const char* canon_MULTIPASS_MX300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Black */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX300_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  /* Black */

+  "600x600dpi_highmono3",

+  "600x600dpi_stdmono3",

+  "600x600dpi_draftmono3",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX300_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX300_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX300_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX300_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPro",	canon_MULTIPASS_MX300_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlus",   canon_MULTIPASS_MX300_modeuses_PPplus, INKSET_COLOR_SUPPORT },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MX300_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX300_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MX300_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MX300_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX300_modeuses_PPmatte, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MX300_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MX300_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX300_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MX300_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX300);

+

+/* ----------------------------------- Canon MX330  ----------------------------------- */

+static const char* canon_MULTIPASS_MX330_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Black */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX330_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX330_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX330_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  /* Black */

+  "600x600dpi_highmono3",

+  "600x600dpi_stdmono3",

+  "600x600dpi_draftmono3",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX330_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX330_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX330_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX330_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoPro2",	canon_MULTIPASS_MX330_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",     canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX330_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MX330_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MX330_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX330_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MX330_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX330);

+

+/* ----------------------------------- Canon MX340  ----------------------------------- */

+static const char* canon_MULTIPASS_MX340_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  /* Black */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",/*untested*/

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",/*untested*/

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX340_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX340_modeuses_PPpro[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX340_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  /* Black */

+  "600x600dpi_highmono3",

+  "600x600dpi_stdmono3",

+  "600x600dpi_draftmono3",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX340_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX340_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX340_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX340_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoPro2",	canon_MULTIPASS_MX340_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",     canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_MULTIPASS_MX340_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX340_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MX340_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MX340_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX340_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MX340_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX340);

+

+/* ----------------------------------- Canon MX360  ----------------------------------- */

+static const char* canon_MULTIPASS_MX360_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  /* Black */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",/*untested*/

+  /* Color */

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  "600x600dpi_draft3",/*untested*/

+  "300x300dpi_std3",

+  "300x300dpi_draft3",/*untested*/

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX360_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX360_modeuses_PPproPlat[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX360_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  /* Black */

+  "600x600dpi_highmono2",

+  "600x600dpi_stdmono2",

+  "600x600dpi_draftmono2",/*untested*/

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  "600x600dpi_draft4",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX360_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX360_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MX360_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MX360_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotoPlusGloss2",   canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MX360_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "HagakiA", 	        canon_MULTIPASS_MX360_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "InkJetHagaki", 	canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "CanonPhotoHagakiK", canon_MULTIPASS_MX360_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MX360_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MX360_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MX360_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MX360_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX360);

+

+/* ----------------------------------- Canon MX370  ----------------------------------- */

+static const char* canon_MULTIPASS_MX370_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX370_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX370_modeuses_PPproPlat[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX370_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX370_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX370_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX370_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX370_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",	canon_MULTIPASS_MX370_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_MULTIPASS_MX370_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX370_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MX370_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_MX370_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX370_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MX370_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX370);

+

+/* ----------------------------------- Canon MX420  ----------------------------------- */

+static const char* canon_MULTIPASS_MX420_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  /* Black */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",/*untested*/

+  "300x300dpi_mono",

+  "300x300dpi_draftmono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "600x600dpi_draft2",/*untested*/

+  "300x300dpi_std2",

+  "300x300dpi_draft2",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX420_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX420_modeuses_PPproPlat[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX420_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* Black */

+  "600x600dpi_highmono3",

+  "600x600dpi_stdmono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX420_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX420_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",/*untested*/

+  "600x600dpi_photodraft",/*untested*/

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MX420_modeuses[] = {

+ { "Plain",             canon_MULTIPASS_MX420_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotoPlusGloss2",   canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotoProPlat",	canon_MULTIPASS_MX420_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+ { "PhotoProSemiGloss", canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "PhotopaperMatte",	canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "GlossyPaper",	canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Coated",		canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "HagakiA", 	        canon_MULTIPASS_MX420_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "InkJetHagaki", 	canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "CanonPhotoHagakiK", canon_MULTIPASS_MX420_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+ { "Hagaki", 	        canon_MULTIPASS_MX420_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "TShirt",		canon_MULTIPASS_MX420_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+ { "Envelope",		canon_MULTIPASS_MX420_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+ { "PhotopaperOther",	canon_MULTIPASS_MX420_modeuses_PPother, INKSET_COLOR_SUPPORT },

+ };

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX420);

+

+/* ----------------------------------- Canon MX510  ----------------------------------- */

+static const char* canon_MULTIPASS_MX510_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high3",/* duplex */

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX510_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX510_modeuses_PPproPlat[] = {

+  "1200x1200dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX510_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX510_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX510_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX510_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX510_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",	canon_MULTIPASS_MX510_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_MULTIPASS_MX510_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX510_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_MX510_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MX510_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX510_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_MX510_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX510);

+

+/* ----------------------------------- Canon MX700  ----------------------------------- */

+static const char* canon_MULTIPASS_MX700_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX700_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_draft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX700_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MX700_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX700_modeuses_plain, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MX700_modeuses_PPpro, 0 },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MX700_modeuses_PPplus, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MX700_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MX700_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX700_modeuses_PPplus, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX700_modeuses_PPplusDS, 0 },

+  { "Coated",		canon_MULTIPASS_MX700_modeuses_PPplusDS, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX700_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX700_modeuses_Hagaki, 0 },

+  { "TShirt",		canon_MULTIPASS_MX700_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX700_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX700_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX700);

+

+/* ----------------------------------- Canon MX710  ----------------------------------- */

+static const char* canon_MULTIPASS_MX710_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2", /* duplex */

+  "300x300dpi",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode unsupported */

+static const char* canon_MULTIPASS_MX710_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX710_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX710_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX710_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX710_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",	canon_MULTIPASS_MX710_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX710_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX710_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX710_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_MULTIPASS_MX710_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MX710_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX710_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX710_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX710_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MX710_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX710_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX710_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX710);

+

+/* ----------------------------------- Canon MX850  ----------------------------------- */

+static const char* canon_MULTIPASS_MX850_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+  };

+

+static const char* canon_MULTIPASS_MX850_modeuses_PPplus[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  "600x600dpi_photodraft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_PPplusDS[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX850_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  "600x600dpi_photodraft3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  "600x600dpi_photodraft4",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX850_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+  };

+

+static const canon_modeuse_t canon_MULTIPASS_MX850_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX850_modeuses_plain, DUPLEX_SUPPORT },

+  { "PhotoPlusGloss2",	canon_MULTIPASS_MX850_modeuses_PPplus, 0 },

+  { "GlossyPro",	canon_MULTIPASS_MX850_modeuses_PPpro, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MX850_modeuses_PPplus, 0 },

+  { "PhotopaperPlusDouble", canon_MULTIPASS_MX850_modeuses_PPplusDS, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX850_modeuses_PPplusDS, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX850_modeuses_PPplusDS, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX850_modeuses_PPmatte, 0 },

+  { "Coated",	        canon_MULTIPASS_MX850_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX850_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX850_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_MULTIPASS_MX850_modeuses_disc, 0 },

+  { "DiscOthers",	canon_MULTIPASS_MX850_modeuses_disc, 0 },

+  { "TShirt",	        canon_MULTIPASS_MX850_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX850_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX850_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX850);

+

+/* ----------------------------------- Canon MX860  ----------------------------------- */

+static const char* canon_MULTIPASS_MX860_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX860_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX860_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX860_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX860_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX860_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MX860_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MX860_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX860_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX860_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX860_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_MULTIPASS_MX860_modeuses_PPmatte, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX860_modeuses_inkjetHagaki, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX860_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MX860_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX860_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX860_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX860);

+

+/* ----------------------------------- Canon MX870  ----------------------------------- */

+static const char* canon_MULTIPASS_MX870_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX870_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX870_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX870_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX870_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX870_modeuses_PPplusG2, 0 },

+  { "PhotoPro2",	canon_MULTIPASS_MX870_modeuses_PPpro, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MX870_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX870_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX870_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX870_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_MULTIPASS_MX870_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MX870_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX870_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX870_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX870_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MX870_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX870_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX870_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX870);

+

+/* ----------------------------------- Canon MX880  ----------------------------------- */

+static const char* canon_MULTIPASS_MX880_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX880_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX880_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX880_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX880_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX880_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",     canon_MULTIPASS_MX880_modeuses_PPproPlat, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX880_modeuses_PPplusG2, 0 },

+  { "GlossyPaper",	canon_MULTIPASS_MX880_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX880_modeuses_PPmatte, 0 },

+  { "Coated",		canon_MULTIPASS_MX880_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_MULTIPASS_MX880_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX880_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_MX880_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX880_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_MULTIPASS_MX880_modeuses_TShirt, 0 },

+  { "Envelope",		canon_MULTIPASS_MX880_modeuses_Hagaki, 0 },

+  { "PhotopaperOther",	canon_MULTIPASS_MX880_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX880);

+

+/* ----------------------------------- Canon MX7600  ----------------------------------- */

+static const char* canon_MULTIPASS_MX7600_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX7600_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode not yet supported */

+static const char* canon_MULTIPASS_MX7600_modeuses_PPsemiGloss[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX7600_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_MULTIPASS_MX7600_modeuses_FA[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_MX7600_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_MX7600_modeuses_plain, DUPLEX_SUPPORT },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_MX7600_modeuses_PPplusG2, 0 },

+  { "PhotopaperPlus",	canon_MULTIPASS_MX7600_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_MULTIPASS_MX7600_modeuses_PPplusG2, 0 },

+  { "PhotoProSemiGloss",canon_MULTIPASS_MX7600_modeuses_PPsemiGloss, 0 },

+  { "InkJetHagaki", 	canon_MULTIPASS_MX7600_modeuses_PPplusG2, 0 },

+  { "FineArtPhotoRag", 	canon_MULTIPASS_MX7600_modeuses_FA, 0 },

+  { "FineArtOther", 	canon_MULTIPASS_MX7600_modeuses_FA, 0 },

+  { "Hagaki", 	        canon_MULTIPASS_MX7600_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_MX7600_modeuses_Hagaki, 0 },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_MX7600);

+

+/* ----------------------------------- Canon E500  ----------------------------------- */

+static const char* canon_MULTIPASS_E500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* color-only */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",

+  NULL

+};

+

+static const char* canon_MULTIPASS_E500_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_E500_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_MULTIPASS_E500_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_MULTIPASS_E500_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_MULTIPASS_E500_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_MULTIPASS_E500_modeuses[] = {

+  { "Plain",            canon_MULTIPASS_E500_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",     canon_MULTIPASS_E500_modeuses_PPproPlat, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_MULTIPASS_E500_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_MULTIPASS_E500_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_MULTIPASS_E500_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_MULTIPASS_E500_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_MULTIPASS_E500_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotopaperOther",	canon_MULTIPASS_E500_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_MULTIPASS_E500);

+

+/* ----------------------------------- Canon MG2100  ----------------------------------- */

+static const char* canon_PIXMA_MG2100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "300x300dpi",

+  /* Mono */

+  "600x600dpi_monohigh",

+  "600x600dpi_mono",

+  "300x300dpi_mono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "300x300dpi_std2",

+  NULL

+  };

+

+static const char* canon_PIXMA_MG2100_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG2100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG2100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* Mono */

+  "600x600dpi_highmono3",

+  "600x600dpi_mono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG2100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_MG2100_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG2100_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG2100_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",     canon_PIXMA_MG2100_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_PIXMA_MG2100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "InkJetHagaki", 	canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG2100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_MG2100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL },

+  { "TShirt",		canon_PIXMA_MG2100_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_PIXMA_MG2100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, 

+  { "PhotopaperOther",	canon_PIXMA_MG2100_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG2100);

+

+/* ----------------------------------- Canon MG3100  ----------------------------------- */

+static const char* canon_PIXMA_MG3100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high5",/* duplex */

+  "600x600dpi",

+  "300x300dpi",

+  /* Mono */

+  "600x600dpi_monohigh",

+  "600x600dpi_mono",

+  "300x300dpi_mono",

+  /* Color */

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  "300x300dpi_std2",

+  NULL

+  };

+

+static const char* canon_PIXMA_MG3100_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG3100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG3100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  /* Mono */

+  "600x600dpi_highmono3",

+  "600x600dpi_mono3",

+  /* Color */

+  "600x600dpi_high4",

+  "600x600dpi_std4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG3100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_MG3100_modeuses_PPother[] = {

+  "600x600dpi_photohigh",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG3100_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG3100_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotoProPlat",     canon_PIXMA_MG3100_modeuses_PPpro, INKSET_COLOR_SUPPORT },

+  { "PhotoProSemiGloss",canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "PhotopaperMatte",	canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "GlossyPaper",	canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Coated",		canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "HagakiA", 	        canon_PIXMA_MG3100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG3100_modeuses_PPplusG2, INKSET_COLOR_SUPPORT },

+  { "Hagaki", 	        canon_PIXMA_MG3100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT },

+  { "TShirt",		canon_PIXMA_MG3100_modeuses_TShirt, INKSET_COLOR_SUPPORT },

+  { "Envelope",		canon_PIXMA_MG3100_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, 

+  { "PhotopaperOther",	canon_PIXMA_MG3100_modeuses_PPother, INKSET_COLOR_SUPPORT },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG3100);

+

+/* ----------------------------------- Canon MG5100  ----------------------------------- */

+static const char* canon_PIXMA_MG5100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_PIXMA_MG5100_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode still unsupported */

+static const char* canon_PIXMA_MG5100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5100_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG5100_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG5100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG5100_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",     canon_PIXMA_MG5100_modeuses_PPpro, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_MG5100_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_MG5100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG5100_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_PIXMA_MG5100_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG5100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG5100_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG5100_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_PIXMA_MG5100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "TShirt",		canon_PIXMA_MG5100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG5100_modeuses_Hagaki, 0 }, 

+  { "PhotopaperOther",	canon_PIXMA_MG5100_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG5100);

+

+/* ----------------------------------- Canon MG5200  ----------------------------------- */

+static const char* canon_PIXMA_MG5200_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_draft",/*untested*/

+  "300x300dpi",

+  "300x300dpi_draft",/*untested*/

+  NULL

+  };

+

+static const char* canon_PIXMA_MG5200_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode still unsupported */

+static const char* canon_PIXMA_MG5200_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5200_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG5200_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG5200_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG5200_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",     canon_PIXMA_MG5200_modeuses_PPpro, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_MG5200_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_MG5200_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG5200_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_PIXMA_MG5200_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG5200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG5200_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG5200_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_PIXMA_MG5200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG5200_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG5200_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG5200_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG5200_modeuses_Hagaki, 0 }, 

+  { "PhotopaperOther",	canon_PIXMA_MG5200_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG5200);

+

+/* ----------------------------------- Canon MG5300  ----------------------------------- */

+static const char* canon_PIXMA_MG5300_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2",/*duplex*/

+  "300x300dpi",

+  NULL

+  };

+

+static const char* canon_PIXMA_MG5300_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+/* highest mode still unsupported */

+static const char* canon_PIXMA_MG5300_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+static const char* canon_PIXMA_MG5300_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG5300_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG5300_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG5300_modeuses_PPplusG2, 0 },

+  { "PhotoProPlat",     canon_PIXMA_MG5300_modeuses_PPpro, 0 },

+  { "PhotoProSemiGloss",canon_PIXMA_MG5300_modeuses_PPplusG2, 0 },

+  { "PhotopaperMatte",	canon_PIXMA_MG5300_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG5300_modeuses_PPplusG2, 0 },

+  { "Coated",		canon_PIXMA_MG5300_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG5300_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG5300_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG5300_modeuses_PPplusG2, 0 },

+  { "Hagaki", 	        canon_PIXMA_MG5300_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG5300_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG5300_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG5300_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG5300_modeuses_Hagaki, 0 }, 

+  { "PhotopaperOther",	canon_PIXMA_MG5300_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG5300);

+

+/* ----------------------------------- Canon MG6100  ----------------------------------- */

+/* most photo modes use gray ink which is unsupported */

+/* TODO: mono modes for photo media */

+static const char* canon_PIXMA_MG6100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "300x300dpi",

+  NULL

+  };

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6100_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6100_modeuses_photorag[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG6100_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG6100_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG6100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG6100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotoProPlat",     canon_PIXMA_MG6100_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotoProSemiGloss",canon_PIXMA_MG6100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotopaperMatte",	canon_PIXMA_MG6100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG6100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Coated",		canon_PIXMA_MG6100_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG6100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG6100_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG6100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Hagaki", 	        canon_PIXMA_MG6100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG6100_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG6100_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG6100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG6100_modeuses_Hagaki, 0 }, 

+  { "FineArtPhotoRag",  canon_PIXMA_MG6100_modeuses_photorag, 0 },/*unsupported*/

+  { "FineArtOther",     canon_PIXMA_MG6100_modeuses_photorag, 0 },/*unsupported*/

+  { "PhotopaperOther",	canon_PIXMA_MG6100_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG6100);

+

+/* ----------------------------------- Canon MG6200  ----------------------------------- */

+/* most photo modes use gray ink which is unsupported */

+/* TODO: mono modes for photo media */

+static const char* canon_PIXMA_MG6200_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2",/* duplex */

+  "300x300dpi",

+  NULL

+  };

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6200_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6200_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG6200_modeuses_photorag[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG6200_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG6200_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG6200_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG6200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotoProPlat",     canon_PIXMA_MG6200_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotoProSemiGloss",canon_PIXMA_MG6200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotopaperMatte",	canon_PIXMA_MG6200_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG6200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Coated",		canon_PIXMA_MG6200_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG6200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG6200_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG6200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Hagaki", 	        canon_PIXMA_MG6200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG6200_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG6200_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG6200_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG6200_modeuses_Hagaki, 0 }, 

+  { "FineArtPhotoRag",  canon_PIXMA_MG6200_modeuses_photorag, 0 },/*unsupported*/

+  { "FineArtOther",     canon_PIXMA_MG6200_modeuses_photorag, 0 },/*unsupported*/

+  { "PhotopaperOther",	canon_PIXMA_MG6200_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG6200);

+

+/* ----------------------------------- Canon MG8100 ----------------------------------- */

+/* most photo modes use gray ink which is unsupported */

+/* TODO: mono modes for photo media */

+static const char* canon_PIXMA_MG8100_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2",/* duplex */

+  "300x300dpi",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8100_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8100_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8100_modeuses_photorag[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG8100_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG8100_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG8100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG8100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotoProPlat",     canon_PIXMA_MG8100_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotoProSemiGloss",canon_PIXMA_MG8100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotopaperMatte",	canon_PIXMA_MG8100_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG8100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Coated",		canon_PIXMA_MG8100_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG8100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG8100_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG8100_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Hagaki", 	        canon_PIXMA_MG8100_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG8100_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG8100_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG8100_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG8100_modeuses_Hagaki, 0 }, 

+  { "FineArtPhotoRag",  canon_PIXMA_MG8100_modeuses_photorag, 0 },/*unsupported*/

+  { "FineArtOther",     canon_PIXMA_MG8100_modeuses_photorag, 0 },/*unsupported*/

+  { "PhotopaperOther",	canon_PIXMA_MG8100_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG8100);

+

+/* ----------------------------------- Canon MG8200 ----------------------------------- */

+/* most photo modes use gray ink which is unsupported */

+/* TODO: mono modes for photo media */

+static const char* canon_PIXMA_MG8200_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi_high2",/* duplex */

+  "600x600dpi",

+  "600x600dpi_std2",/* duplex */

+  "300x300dpi",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8200_modeuses_PPplusG2[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8200_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_Hagaki[] = {

+  "600x600dpi_high2",

+  "600x600dpi_std2",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_disc[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",

+  NULL

+};

+

+/* unsupported*/

+static const char* canon_PIXMA_MG8200_modeuses_photorag[] = {

+  "600x600dpi_photohigh",/*stand-in*/

+  "600x600dpi_photo",/*stand-in*/

+  "600x600dpi_photo2",/*stand-in*/

+  NULL

+};

+

+static const char* canon_PIXMA_MG8200_modeuses_PPother[] = {

+  "600x600dpi_photo2",

+  NULL

+};

+

+static const canon_modeuse_t canon_PIXMA_MG8200_modeuses[] = {

+  { "Plain",            canon_PIXMA_MG8200_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL },

+  { "PhotoPlusGloss2",  canon_PIXMA_MG8200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotoProPlat",     canon_PIXMA_MG8200_modeuses_PPpro, 0 },/*unsupported*/

+  { "PhotoProSemiGloss",canon_PIXMA_MG8200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "PhotopaperMatte",	canon_PIXMA_MG8200_modeuses_PPmatte, 0 },

+  { "GlossyPaper",	canon_PIXMA_MG8200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Coated",		canon_PIXMA_MG8200_modeuses_PPmatte, 0 },

+  { "HagakiA", 	        canon_PIXMA_MG8200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "InkJetHagaki", 	canon_PIXMA_MG8200_modeuses_inkjetHagaki, 0 },

+  { "CanonPhotoHagakiK",canon_PIXMA_MG8200_modeuses_PPplusG2, 0 },/*unsupported*/

+  { "Hagaki", 	        canon_PIXMA_MG8200_modeuses_Hagaki, DUPLEX_SUPPORT },

+  { "DiscCompat",	canon_PIXMA_MG8200_modeuses_disc, 0 },

+  { "DiscOthers",	canon_PIXMA_MG8200_modeuses_disc, 0 },

+  { "TShirt",		canon_PIXMA_MG8200_modeuses_TShirt, 0 },

+  { "Envelope",		canon_PIXMA_MG8200_modeuses_Hagaki, 0 }, 

+  { "FineArtPhotoRag",  canon_PIXMA_MG8200_modeuses_photorag, 0 },/*unsupported*/

+  { "FineArtOther",     canon_PIXMA_MG8200_modeuses_photorag, 0 },/*unsupported*/

+  { "PhotopaperOther",	canon_PIXMA_MG8200_modeuses_PPother, 0 },

+};

+

+DECLARE_MODEUSES(canon_PIXMA_MG8200);

+

+/* ----------------------------------- Canon Pro9000 ----------------------------------- */

+

+static const char* canon_PIXMA_Pro9000_modeuses_plain[] = {

+  "600x600dpi_hig2",

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_std2",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  "600x600dpi_draftmono2",

+  NULL

+  };

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000_modeuses_PPplusG2[] = {

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000_modeuses_PPplus[] = {

+  "600x600dpi_photo",

+  "600x600dpi_photodraft2",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  "600x600dpi_photomonodraft",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photodraft",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonodraft",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000_modeuses_PPpro[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonomed",

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000_modeuses_PPproPlat[] = {

+  "600x600dpi_photohigh",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonomed",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photomed2",

+  "600x600dpi_photomed",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_Hagaki[] = {

+  "600x600dpi_high3",

+  "600x600dpi_std3",/*Mono High*/

+  "600x600dpi_std4",/* bw=2 for mono */

+  "600x600dpi_draft3",/* bw=2 for mono */

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo2",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_board[] = {

+  "600x600dpi_photohigh5",

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const char* canon_PIXMA_Pro9000_modeuses_photorag[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const char* canon_PIXMA_Pro9000_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",/* bw=2 for mono */

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_Pro9000_modeuses[] = {

+ { "Plain",             canon_PIXMA_Pro9000_modeuses_plain, 0 },

+ { "PhotopaperPlus",    canon_PIXMA_Pro9000_modeuses_PPplus, 0 },

+ { "PhotoPlusGloss2",   canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 },

+ { "GlossyPaper",	canon_PIXMA_Pro9000_modeuses_PPgloss, 0 },

+ { "PhotoProSemiGloss", canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 },

+ { "GlossyPro",         canon_PIXMA_Pro9000_modeuses_PPpro, 0 },

+ { "PhotoPro2",  	canon_PIXMA_Pro9000_modeuses_PPpro, 0 },

+ { "PhotoProPlat",	canon_PIXMA_Pro9000_modeuses_PPproPlat, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_Pro9000_modeuses_PPmatte, 0 },

+ { "Coated",		canon_PIXMA_Pro9000_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_Pro9000_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_Pro9000_modeuses_Hagaki, 0 },

+ { "DiscCompat",	canon_PIXMA_Pro9000_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_Pro9000_modeuses_disc, 0 },

+ { "Boardpaper",	canon_PIXMA_Pro9000_modeuses_board, 0 },

+ { "Canvas",	        canon_PIXMA_Pro9000_modeuses_board, 0 },

+ { "FineArtPhotoRag",   canon_PIXMA_Pro9000_modeuses_photorag, 0 },

+ { "FineArtOther",      canon_PIXMA_Pro9000_modeuses_board, 0 },

+ { "FineArtPremiumMatte",canon_PIXMA_Pro9000_modeuses_board, 0 },

+ { "FineArtMuseumEtching",canon_PIXMA_Pro9000_modeuses_photorag, 0 },

+ { "TShirt",		canon_PIXMA_Pro9000_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_Pro9000_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_Pro9000_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_Pro9000);

+

+/* ----------------------------------- Canon Pro9000mk2 ----------------------------------- */

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  "600x600dpi_draft2",

+  /* Mono */

+  "600x600dpi_highmono",

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  "600x600dpi_draftmono2",

+  NULL

+  };

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPplusG2[] = {

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPgloss[] = {

+  "600x600dpi_photohigh2",

+  "600x600dpi_photodraft",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonodraft",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPpro2[] = {

+  "600x600dpi_photomed",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonomed",/*untested: quality setting uncertain*/

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPproPlat[] = {

+  "600x600dpi_photomed",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomonomed",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPmatte[] = {

+  "600x600dpi_photohigh",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_inkjetHagaki[] = {

+  "600x600dpi_photohigh3",

+  "600x600dpi_photo3",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_Hagaki[] = {

+  "600x600dpi_high2",/* bw=2 for mono */

+  "600x600dpi_std2",/* bw=2 for mono */

+  "600x600dpi_draft2",/* bw=2 for mono */

+  /* Mono */

+  "600x600dpi_high3",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_disc[] = {

+  "600x600dpi_photohigh4",

+  "600x600dpi_photo4",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_board[] = {

+  "600x600dpi_photohigh5",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  NULL

+  };

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_photorag[] = {

+  "600x600dpi_photohigh5",

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomonohigh",

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_TShirt[] = {

+  "600x600dpi_tshirt",/* bw=2 for mono */

+  NULL

+};

+

+static const char* canon_PIXMA_Pro9000mk2_modeuses_PPother[] = {

+  "600x600dpi_photo",

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_Pro9000mk2_modeuses[] = {

+ { "Plain",             canon_PIXMA_Pro9000mk2_modeuses_plain, 0 },

+ { "PhotoPlusGloss2",   canon_PIXMA_Pro9000mk2_modeuses_PPplusG2, 0 },

+ { "GlossyPaper",	canon_PIXMA_Pro9000mk2_modeuses_PPgloss, 0 },

+ { "PhotoProSemiGloss", canon_PIXMA_Pro9000mk2_modeuses_PPplusG2, 0 },

+ { "PhotoPro2",  	canon_PIXMA_Pro9000mk2_modeuses_PPpro2, 0 },

+ { "PhotoProPlat",	canon_PIXMA_Pro9000mk2_modeuses_PPproPlat, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_Pro9000mk2_modeuses_PPmatte, 0 },

+ { "Coated",		canon_PIXMA_Pro9000mk2_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_Pro9000mk2_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_Pro9000mk2_modeuses_Hagaki, 0 },

+ { "DiscCompat",	canon_PIXMA_Pro9000mk2_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_Pro9000mk2_modeuses_disc, 0 },

+ { "Boardpaper",	canon_PIXMA_Pro9000mk2_modeuses_board, 0 },

+ { "Canvas",	        canon_PIXMA_Pro9000mk2_modeuses_board, 0 },

+ { "FineArtPhotoRag",   canon_PIXMA_Pro9000mk2_modeuses_photorag, 0 },

+ { "FineArtOther",      canon_PIXMA_Pro9000mk2_modeuses_board, 0 },

+ { "FineArtPremiumMatte",canon_PIXMA_Pro9000mk2_modeuses_board, 0 },

+ { "FineArtMuseumEtching",canon_PIXMA_Pro9000mk2_modeuses_photorag, 0 },

+ { "TShirt",		canon_PIXMA_Pro9000mk2_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_Pro9000mk2_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_Pro9000mk2_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_Pro9000mk2);

+

+/* ----------------------------------- Canon Pro9500 ----------------------------------- */

+

+static const char* canon_PIXMA_Pro9500_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_highmono",/*untested*/

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  "600x600dpi_draftmono2",/*untested*/

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPplusG2[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPgloss[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPpro2[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPproPlat[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPmatte[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_inkjetHagaki[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_Hagaki[] = {

+   /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_highmono",

+  "600x600dpi_mono",/*untested*/

+  "600x600dpi_draftmono",/*untested*/

+  "600x600dpi_draftmono2",/*untested*/

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_disc[] = {

+  /* Mono */

+   "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_board[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_photorag[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_TShirt[] = {

+  "600x600dpi_photomono",/* bw=2 for mono */

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500_modeuses_PPother[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_Pro9500_modeuses[] = {

+ { "Plain",             canon_PIXMA_Pro9500_modeuses_plain, 0 },

+ { "PhotoPlusGloss2",   canon_PIXMA_Pro9500_modeuses_PPplusG2, 0 },

+ { "GlossyPaper",	canon_PIXMA_Pro9500_modeuses_PPgloss, 0 },

+ { "PhotoProSemiGloss", canon_PIXMA_Pro9500_modeuses_PPplusG2, 0 },

+ { "PhotoPro2",  	canon_PIXMA_Pro9500_modeuses_PPpro2, 0 },

+ { "PhotoProPlat",	canon_PIXMA_Pro9500_modeuses_PPproPlat, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_Pro9500_modeuses_PPmatte, 0 },

+ { "Coated",		canon_PIXMA_Pro9500_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_Pro9500_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_Pro9500_modeuses_Hagaki, 0 },

+ { "DiscCompat",	canon_PIXMA_Pro9500_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_Pro9500_modeuses_disc, 0 },

+ { "Boardpaper",	canon_PIXMA_Pro9500_modeuses_board, 0 },

+ { "Canvas",	        canon_PIXMA_Pro9500_modeuses_board, 0 },

+ { "FineArtPhotoRag",   canon_PIXMA_Pro9500_modeuses_photorag, 0 },

+ { "FineArtOther",      canon_PIXMA_Pro9500_modeuses_board, 0 },

+ { "FineArtPremiumMatte",canon_PIXMA_Pro9500_modeuses_board, 0 },

+ { "FineArtMuseumEtching",canon_PIXMA_Pro9500_modeuses_photorag, 0 },

+ { "TShirt",		canon_PIXMA_Pro9500_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_Pro9500_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_Pro9500_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_Pro9500);

+

+/* ----------------------------------- Canon Pro9500mk2 ----------------------------------- */

+

+static const char* canon_PIXMA_Pro9500mk2_modeuses_plain[] = {

+  "600x600dpi_high",

+  "600x600dpi",

+  "600x600dpi_draft",

+  /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_highmono",/*untested*/

+  "600x600dpi_mono",

+  "600x600dpi_draftmono",

+  "600x600dpi_draftmono2",/*untested*/

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_PPplusG2[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_PPgloss[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* highest mode not yet supported (R,G inks) */

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_PPproPlat[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_PPmatte[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_inkjetHagaki[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_Hagaki[] = {

+   /* Mono */

+  "600x600dpi_highmono2",

+  "600x600dpi_highmono",

+  "600x600dpi_mono",/*untested*/

+  "600x600dpi_draftmono",/*untested*/

+  "600x600dpi_draftmono2",/*untested*/

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_disc[] = {

+  /* Mono */

+   "600x600dpi_photomono",

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_board[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_photorag[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_TShirt[] = {

+  "600x600dpi_photomono",/* bw=2 for mono */

+  NULL

+};

+

+/* modes not yet supported (R,G inks) */

+static const char* canon_PIXMA_Pro9500mk2_modeuses_PPother[] = {

+  /* Mono */

+  "600x600dpi_photomono",

+  NULL

+  };

+

+static const canon_modeuse_t canon_PIXMA_Pro9500mk2_modeuses[] = {

+ { "Plain",             canon_PIXMA_Pro9500mk2_modeuses_plain, 0 },

+ { "PhotoPlusGloss2",   canon_PIXMA_Pro9500mk2_modeuses_PPplusG2, 0 },

+ { "PhotoProPlat",      canon_PIXMA_Pro9500mk2_modeuses_PPproPlat, 0 },

+ { "GlossyPaper",	canon_PIXMA_Pro9500mk2_modeuses_PPgloss, 0 },

+ { "PhotoProSemiGloss", canon_PIXMA_Pro9500mk2_modeuses_PPplusG2, 0 },

+ { "PhotopaperMatte",	canon_PIXMA_Pro9500mk2_modeuses_PPmatte, 0 },

+ { "Coated",		canon_PIXMA_Pro9500mk2_modeuses_PPmatte, 0 },

+ { "InkJetHagaki", 	canon_PIXMA_Pro9500mk2_modeuses_inkjetHagaki, 0 },

+ { "Hagaki", 	        canon_PIXMA_Pro9500mk2_modeuses_Hagaki, 0 },

+ { "DiscCompat",	canon_PIXMA_Pro9500mk2_modeuses_disc, 0 },

+ { "DiscOthers",	canon_PIXMA_Pro9500mk2_modeuses_disc, 0 },

+ { "Boardpaper",	canon_PIXMA_Pro9500mk2_modeuses_board, 0 },

+ { "Canvas",	        canon_PIXMA_Pro9500mk2_modeuses_board, 0 },

+ { "FineArtPhotoRag",   canon_PIXMA_Pro9500mk2_modeuses_photorag, 0 },

+ { "FineArtOther",      canon_PIXMA_Pro9500mk2_modeuses_board, 0 },

+ { "FineArtPremiumMatte",canon_PIXMA_Pro9500mk2_modeuses_board, 0 },

+ { "FineArtMuseumEtching",canon_PIXMA_Pro9500mk2_modeuses_photorag, 0 },

+ { "TShirt",		canon_PIXMA_Pro9500mk2_modeuses_TShirt, 0 },

+ { "Envelope",		canon_PIXMA_Pro9500mk2_modeuses_Hagaki, 0 },

+ { "PhotopaperOther",	canon_PIXMA_Pro9500mk2_modeuses_PPother, 0 },

+ };

+

+DECLARE_MODEUSES(canon_PIXMA_Pro9500mk2);

+

+#endif

diff --git a/src/main/canon-media.h b/src/main/canon-media.h
index 2f354ef..4b47916 100644
--- a/src/main/canon-media.h
+++ b/src/main/canon-media.h
@@ -69,7 +69,7 @@ static const canon_slot_t canon_PIXMA_iP4000_slots[] = {
   { "Cassette",   N_ ("Cassette"), 0x8 },
   { "CD",         N_ ("CD tray"), 0xa },
   { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 0xf },
-  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },/*Paper allocation? no idea what this means compared to Continuous*/
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
 };
 DECLARE_SLOTS(canon_PIXMA_iP4000);
 
@@ -79,24 +79,71 @@ static const canon_slot_t canon_PIXMA_iP3100_slots[] = {
   { "Cassette",   N_ ("Cassette"), 0x8 },
   { "CD",         N_ ("CD tray"), 0xa },
   { "AutoSwitch", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
 };
 DECLARE_SLOTS(canon_PIXMA_iP3100);
 
-/* MP170, MP450, MP460, MX300 */
-static const canon_slot_t canon_MULTIPASS_MP170_slots[] = {
+static const canon_slot_t canon_PIXMA_iP2000_slots[] = {
+  { "SelectKey",  N_ ("Selected by Paper Select Key"), 0x3 },
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "Front",      N_ ("Front Feeder"), 0x8 },
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
+};
+DECLARE_SLOTS(canon_PIXMA_iP2000);
+
+static const canon_slot_t canon_MULTIPASS_MP530_slots[] = {
+  { "SelectKey",  N_ ("Selected by Paper Select Key"), 0x3 },
   { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "Cassette",   N_ ("Cassette"), 0x8 },
+  { "CD",         N_ ("CD tray"), 0xa },
+  { "AutoSwitch", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
 };
-DECLARE_SLOTS(canon_MULTIPASS_MP170);
+DECLARE_SLOTS(canon_MULTIPASS_MP530);
+
+static const canon_slot_t canon_MULTIPASS_MP150_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+};
+DECLARE_SLOTS(canon_MULTIPASS_MP150);
 
-/* MP250 */
-/* iP2700 */
-/* iP1900 */
 static const canon_slot_t canon_MULTIPASS_MP250_slots[] = {
   { "Rear",       N_ ("Rear tray"), 0x4 },
 };
 DECLARE_SLOTS(canon_MULTIPASS_MP250);
 
-/* MX7600 */
+static const canon_slot_t canon_PIXMA_MG2100_slots[] = {
+  { "Front",       N_ ("Front tray"), 0x8 },
+};
+DECLARE_SLOTS(canon_PIXMA_MG2100);
+
+/* MP710/740 have adjustment for thick media: gap=10 */
+static const canon_slot_t canon_MULTIPASS_MP710_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "AutoThick",  N_ ("Auto Sheet Feeder (thick media)"), 0x4 },
+  { "CD",         N_ ("CD tray"), 0xa },
+};
+DECLARE_SLOTS(canon_MULTIPASS_MP710);
+
+static const canon_slot_t canon_MULTIPASS_MP900_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "CD",         N_ ("CD tray"), 0xa },
+};
+DECLARE_SLOTS(canon_MULTIPASS_MP900);
+
+static const canon_slot_t canon_BJC_i860_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "Cassette",   N_ ("Cassette"), 0x8 },
+  { "CD",         N_ ("CD tray"), 0xa },
+};
+DECLARE_SLOTS(canon_BJC_i860);
+
+static const canon_slot_t canon_BJC_S800_slots[] = {
+  { "Auto",       N_ ("Auto Sheet Feeder"), 0x4 },
+  { "HandFeed",   N_ ("Hand Feeding"), 0x1 },
+};
+DECLARE_SLOTS(canon_BJC_S800);
+
 static const canon_slot_t canon_MULTIPASS_MX7600_slots[] = {
   { "Cassette",       N_ ("Cassette"), 0x8 },
 };
@@ -109,24 +156,22 @@ static const canon_slot_t canon_PIXMA_iX7000_slots[] = {
 };
 DECLARE_SLOTS(canon_PIXMA_iX7000);
 
-/* iP4500 */
 static const canon_slot_t canon_PIXMA_iP4500_slots[] = {
   { "SelectKey",  N_ ("Selected by Paper Select Key"), 0x3 },
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Cassette",   N_ ("Cassette"), 0x8 },
-  { "Continuous", N_ ("Continuous Autofeed (both)"), 0xf }, /* no paper automatic change source*/
-  { "CD",         N_ ("CD tray"), 0xa }, /* CD-R tray F */
-  { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 15 },/*Paper alloction? no idea what this means compared to Continuous*/
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf }, /* no paper automatic change source*/
+  { "CD",         N_ ("CD tray"), 0xa },
+  { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 15 },
 };
 DECLARE_SLOTS(canon_PIXMA_iP4500);
 
-/* MX850 */
 static const canon_slot_t canon_MULTIPASS_MX850_slots[] = {
   { "SelectKey",  N_ ("Selected by Paper Select Key"), 0x3 },
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Cassette",   N_ ("Cassette"), 0x8 },
   { "Continuous", N_ ("Continuous Autofeed (both)"), 0xf }, /* no paper automatic change source*/
-  { "CD",         N_ ("CD tray"), 0xa }, /* CD-R tray F */
+  { "CD",         N_ ("CD tray"), 0xa },
 };
 DECLARE_SLOTS(canon_MULTIPASS_MX850);
 
@@ -138,13 +183,28 @@ static const canon_slot_t canon_MULTIPASS_MP520_slots[] = {
 };
 DECLARE_SLOTS(canon_MULTIPASS_MP520);
 
-/* iP4600, iP4700 */
+static const canon_slot_t canon_PIXMA_iP3500_slots[] = {
+  { "Rear",       N_ ("Rear tray"), 0x4 },
+  { "Front",   N_ ("Front tray"), 0x8 },
+  /* There is also a "plain media only Front" option, but it seems to have same 0x8 when used, no idea whether it should take different values */
+};
+DECLARE_SLOTS(canon_PIXMA_iP3500);
+
+static const canon_slot_t canon_PIXMA_iP3600_slots[] = {
+  { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 0xe },
+  { "Rear",       N_ ("Rear tray"), 0x4 },
+  { "Cassette",   N_ ("Cassette"), 0x8 },
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf },
+};
+DECLARE_SLOTS(canon_PIXMA_iP3600);
+
 static const canon_slot_t canon_PIXMA_iP4600_slots[] = {
   { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 0xe },
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Cassette",   N_ ("Cassette"), 0x8 },
-  { "Continuous", N_ ("Continuous Autofeed (both)"), 0xf },
-  { "CD",         N_ ("CD tray"), 0xa }
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
+  { "CD",         N_ ("CD tray"), 0xa },
 };
 DECLARE_SLOTS(canon_PIXMA_iP4600);
 
@@ -152,31 +212,28 @@ DECLARE_SLOTS(canon_PIXMA_iP4600);
 static const canon_slot_t canon_PIXMA_Pro9000_slots[] = {
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Front",   N_ ("Front tray"), 0xb },
-  { "CD",         N_ ("CD tray"), 0xa }
+  { "CD",         N_ ("CD tray"), 0xa },
 };
 DECLARE_SLOTS(canon_PIXMA_Pro9000);
 
-
-/* Gernot --- added so check this*/
 static const canon_slot_t canon_PIXMA_MG5100_slots[] = {
   { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 0xe },
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Cassette",   N_ ("Cassette"), 0x8 },
-  { "Continuous", N_ ("Continuous Autofeed (both)"), 0xf },
-  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },/*Paper allocation? no idea what this means compared to Continuous*/
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
 };
 DECLARE_SLOTS(canon_PIXMA_MG5100);
 
-/* Gernot --- added so check this*/
 static const canon_slot_t canon_PIXMA_MG5200_slots[] = {
   { "AutoSwitch", N_ ("Automatic Paper Source Switching"), 0xe },
   { "Rear",       N_ ("Rear tray"), 0x4 },
   { "Cassette",   N_ ("Cassette"), 0x8 },
-  { "Continuous", N_ ("Continuous Autofeed (both)"), 0xf },
-  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },/*Paper allocation? no idea what this means compared to Continuous*/
-  { "CD",         N_ ("CD tray"), 0xa }
+  { "Continuous", N_ ("Continuous Autofeed"), 0xf },
+  { "AllocPaper", N_ ("PaperAllocation"), 0x15 },
+  { "CD",         N_ ("CD tray"), 0xa },
 };
-DECLARE_SLOTS(canon_PIXMA_MG5200); /* also MG6100 */
+DECLARE_SLOTS(canon_PIXMA_MG5200);
 
 
 /* media types */
@@ -234,22 +291,62 @@ static const canon_paper_t canon_PIXMA_iP4000_papers[] = {
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperMatte",	N_ ("Photo Paper Matte"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "CD",		N_ ("CD"),				0x00,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, 
+  { "CD",		N_ ("CD"),				0x00,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },  /* legacy */
   /* FIXME media code for c) should be 0x0c for CD but this will restrict CD printing to a single, not well supported, resolution */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* added 2011-11-26 */
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* added 2011-11-26 */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
   { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
 };
 DECLARE_PAPERS(canon_PIXMA_iP4000);
 
+static const canon_paper_t canon_PIXMA_iP2000_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP2000);
+
+static const canon_paper_t canon_PIXMA_iP3000_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP3000);
+
 static const canon_paper_t canon_PIXMA_iP3100_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperMatte",	N_ ("Photo Paper Matte"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -259,14 +356,431 @@ static const canon_paper_t canon_PIXMA_iP3100_papers[] = {
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  /* FIXME media code for c) should be 0x0c for CD but this will restrict CD printing to a single, not well supported, resolution */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* experiment */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
 };
 DECLARE_PAPERS(canon_PIXMA_iP3100);
 
+static const canon_paper_t canon_PIXMA_iP4100_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+};
+DECLARE_PAPERS(canon_PIXMA_iP4100);
+
+static const canon_paper_t canon_PIXMA_iP4200_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  /* FIXME media code for c) should be 0x0c for CD but this will restrict CD printing to an unsupported resolution */
+  { "CD",		N_ ("CD"),				0x00,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 }, /* added 2011-11-26 */
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 }, /* added 2011-11-26 */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,0.78, 0.25, 0.900, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP4200);
+
+static const canon_paper_t canon_BJC_S200_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_S200);
+
+static const canon_paper_t canon_BJC_S300_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		        0x00,0x00,0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested*/
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyCard",	N_ ("Glossy Photo Cards"),	        0x05,0x0c,0x00,1.00, 1.00, 0.999, 0, 0, 0 },/* different from expected 0xa 0xa */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_S300);
+
+static const canon_paper_t canon_BJC_S330_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		        0x00,0x00,0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0b 0x11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_S330);
+
+static const canon_paper_t canon_BJC_S520_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		        0x00,0x00,0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0b 0x11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0a 0x10 */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_S520);
+
+static const canon_paper_t canon_BJC_S750_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		        0x00,0x00,0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0b 0x11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0a 0x10 */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_S750);
+
+static const canon_paper_t canon_BJC_S800_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),		        0x00,0x00,0x00,0.50, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0b 0x11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0x0a 0x10 */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyCard",	N_ ("Glossy Photo Cards"),	        0x05,0x0a,0x00,1.00, 1.00, 0.999, 0, 0, 0 },/* different from expected 0xa 0xa */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x00,0x0f,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0xf 0x14 */
+};
+DECLARE_PAPERS(canon_BJC_S800);
+
+static const canon_paper_t canon_BJC_i50_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i50);
+
+static const canon_paper_t canon_BJC_i80_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_BJC_i80);
+
+static const canon_paper_t canon_BJC_i250_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* 250i,350i different from expected 08 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* 250i,350i */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i250);
+
+static const canon_paper_t canon_BJC_i320_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i320);
+
+static const canon_paper_t canon_BJC_i450_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i450);
+
+static const canon_paper_t canon_BJC_i455_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i455);
+
+static const canon_paper_t canon_BJC_i550_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x07,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected d */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i550);
+
+static const canon_paper_t canon_BJC_i560_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i560);
+
+static const canon_paper_t canon_BJC_i850_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x07,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected d 9 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i850);
+
+static const canon_paper_t canon_BJC_i950_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.999, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x09,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected d 9 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i950);
+
+static const canon_paper_t canon_BJC_i6100_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected b 11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected a 10 */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x07,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected d */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_BJC_i6100);
+
+static const canon_paper_t canon_BJC_i9100_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected b 11 */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected a 10 */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x09,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected d 09 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i9100);
+
+static const canon_paper_t canon_BJC_i9900_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_BJC_i9900);
+
+static const canon_paper_t canon_PIXMA_iP90_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP90);
+
+static const canon_paper_t canon_PIXMA_iP100_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP100);
+
 static const canon_paper_t canon_PIXMA_iP1000_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -282,7 +796,7 @@ DECLARE_PAPERS(canon_PIXMA_iP1000);
 
 static const canon_paper_t canon_PIXMA_iP1200_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -299,7 +813,7 @@ DECLARE_PAPERS(canon_PIXMA_iP1200);
 
 static const canon_paper_t canon_PIXMA_iP1500_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -316,7 +830,7 @@ DECLARE_PAPERS(canon_PIXMA_iP1500);
 
 static const canon_paper_t canon_PIXMA_iP2200_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -333,10 +847,10 @@ DECLARE_PAPERS(canon_PIXMA_iP2200);
 
 static const canon_paper_t canon_PIXMA_iP2600_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -348,16 +862,51 @@ static const canon_paper_t canon_PIXMA_iP2600_papers[] = {
 };
 DECLARE_PAPERS(canon_PIXMA_iP2600);
 
+static const canon_paper_t canon_PIXMA_iP3300_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },/* PPpro*/
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },/* PPsuper */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },/* PPsuperDS */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPgloss */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PPmatte */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PPother */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* HiRes */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjetHagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+};
+DECLARE_PAPERS(canon_PIXMA_iP3300);
+
+static const canon_paper_t canon_PIXMA_iP5000_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/*untested*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/*untested*/
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP5000);
+
 static const canon_paper_t canon_PIXMA_iP6100_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperMatte",	N_ ("Photo Paper Matte"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "CD",		N_ ("CD"),				0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 }, 
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -366,11 +915,10 @@ static const canon_paper_t canon_PIXMA_iP6100_papers[] = {
 };
 DECLARE_PAPERS(canon_PIXMA_iP6100);
 
-/* iP6600D, Tray C for CD media */
 static const canon_paper_t canon_PIXMA_iP6600_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -386,11 +934,10 @@ static const canon_paper_t canon_PIXMA_iP6600_papers[] = { /*               k_lo
 };
 DECLARE_PAPERS(canon_PIXMA_iP6600);
 
-/* iP6700D, Tray C for CD media */
 static const canon_paper_t canon_PIXMA_iP6700_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -399,7 +946,7 @@ static const canon_paper_t canon_PIXMA_iP6700_papers[] = { /*               k_lo
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different from usual 13,1b,29 */
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -408,14 +955,99 @@ static const canon_paper_t canon_PIXMA_iP6700_papers[] = { /*               k_lo
 };
 DECLARE_PAPERS(canon_PIXMA_iP6700);
 
+static const canon_paper_t canon_PIXMA_iP7100_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x02,0x0d,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x02,0x0d,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_PIXMA_iP7100);
+
+static const canon_paper_t canon_PIXMA_iP7500_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,1.00, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP7500);
+
+static const canon_paper_t canon_PIXMA_iP8500_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,0.78, 0.25, 0.900, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP8500);
+
+static const canon_paper_t canon_PIXMA_iP9910_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x09,0x11,0x25,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x09,0x0d,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x09,0x0d,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP9910);
+
 /* PIXMA Pro9000 */
 static const canon_paper_t canon_PIXMA_Pro9000_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },/*PPsuper*/
   { "PhotoPlusGloss2",	N_ ("Photo Paper Plus Glossy II"), 	0x0b,0x11,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/*PPgloss*/
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/*PPkinumecho*/
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },/*PPpro*/
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },/*PPpro*/
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x09,0x0d,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGpro*/
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x09,0x11,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGproPlat*/
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -426,12 +1058,12 @@ static const canon_paper_t canon_PIXMA_Pro9000_papers[] = {
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x20,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/*check l*/
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x20,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different c,l from usual */
   /* special papers */
   { "Boardpaper",	N_ ("Board Paper"),		        0x18,0x1d,0x2e,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Canvas",	        N_ ("Canvas"),		                0x19,0x1e,0x2d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different from usual 13,1b,29 */
   { "FineArtPremiumMatte",N_ ("Fine Art Premium Matte"),	0x15,0x1a,0x2c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtMuseumEtching",N_ ("Fine Art Museum Etching"),      0x14,0x19,0x31,0.78, 0.25, 0.500, 0, 0, 0 },
 };
@@ -440,7 +1072,7 @@ DECLARE_PAPERS(canon_PIXMA_Pro9000);
 /* PIXMA Pro9000 Mk.II */
 static const canon_paper_t canon_PIXMA_Pro9000mk2_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/*PPgloss*/
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/*PP kinumecho*/
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGpro*/
@@ -458,71 +1090,100 @@ static const canon_paper_t canon_PIXMA_Pro9000mk2_papers[] = {
   { "Boardpaper",	N_ ("Board Paper"),		        0x18,0x1d,0x2e,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Canvas",	        N_ ("Canvas"),		                0x19,0x1e,0x2d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different from usual 13,1b,29 */
   { "FineArtPremiumMatte",N_ ("Fine Art Premium Matte"),	0x15,0x1a,0x2c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtMuseumEtching",N_ ("Fine Art Museum Etching"),      0x14,0x19,0x31,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_Pro9000mk2);
 
 /* PIXMA Pro9500 */
-/* added Envelope, glossy photo paper, coated, T-shirt, PhotopaperOther---must check printjobs if I forgot these ones */
 static const canon_paper_t canon_PIXMA_Pro9500_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
-  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/*PP kinumecho*/
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGpro*/
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGproPlat*/
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   /* special papers */
   { "Boardpaper",	N_ ("Board Paper"),		        0x18,0x1d,0x2e,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Canvas",	        N_ ("Canvas"),		                0x19,0x1e,0x2d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different from usual 13,1b,29 */
   { "FineArtPremiumMatte",N_ ("Fine Art Premium Matte"),	0x15,0x1a,0x2c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtMuseumEtching",N_ ("Fine Art Museum Etching"),	0x14,0x19,0x31,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_Pro9500);
 
 /* PIXMA Pro9500 Mk.II */
-/* added Envelope, glossy photo paper, coated, T-shirt, PhotopaperOther---must check printjobs if I forgot these ones */
 static const canon_paper_t canon_PIXMA_Pro9500mk2_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
-  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/*PP kinumecho*/
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGgold*/
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/*PPGproPlat*/
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* check */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   /* special papers */
   { "Boardpaper",	N_ ("Board Paper"),		        0x18,0x1d,0x2e,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Canvas",	        N_ ("Canvas"),		                0x19,0x1e,0x2d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x1b,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/* note: different from usual 13,1b,29 */
   { "FineArtPremiumMatte",N_ ("Fine Art Premium Matte"),	0x15,0x1a,0x2c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "FineArtMuseumEtching",N_ ("Fine Art Museum Etching"),	0x14,0x19,0x31,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_Pro9500mk2);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP150 so far */
+static const canon_paper_t canon_SELPHY_DS700_papers[] = {
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	        0x09, 0x0d,0x00,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 0x0b, 0x11,0x00,1.00, 1.00, 0.999, 0, 0, 0 },/*PPsuper*/
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),	0x0a, 0x10,0x00,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),	0x05, 0x05,0x00,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),		0x0d, 0x09,0x00,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			0x08, 0x09,0x00,1.00, 1.00, 0.999, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_SELPHY_DS700);
+
+static const canon_paper_t canon_SELPHY_DS810_papers[] = {
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	        0x09, 0x0d,0x1a,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 0x0b, 0x11,0x1d,1.00, 1.00, 0.999, 0, 0, 0 },/*PPsuper*/
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),	0x0a, 0x10,0x1c,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),	0x05, 0x05,0x16,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),		0x0d, 0x09,0x1b,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			0x08, 0x09,0x07,1.00, 1.00, 0.999, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_SELPHY_DS810);
+
+static const canon_paper_t canon_PIXMA_mini320_papers[] = {
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09, 0x0d,0x1a,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"),         0x0b, 0x11,0x1d,1.00, 1.00, 0.999, 0, 0, 0 },/*PPsuper*/
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10, 0x15,0x25,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),	        0x0a, 0x10,0x1c,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),	        0x05, 0x05,0x16,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),      0x1d, 0x23,0x32,1.00, 1.00, 0.999, 0, 0, 0 },/*PPGgold*/
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),		        0x0d, 0x09,0x1b,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08, 0x09,0x07,1.00, 1.00, 0.999, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_mini320);
+
 static const canon_paper_t canon_MULTIPASS_MP150_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -536,15 +1197,15 @@ static const canon_paper_t canon_MULTIPASS_MP150_papers[] = {
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP150);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP170, MP450, MP460 */
-static const canon_paper_t canon_MULTIPASS_MP170_papers[] = {
+static const canon_paper_t canon_MULTIPASS_MP190_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },/* PPpro */
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -552,13 +1213,28 @@ static const canon_paper_t canon_MULTIPASS_MP170_papers[] = {
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
 };
-DECLARE_PAPERS(canon_MULTIPASS_MP170);
+DECLARE_PAPERS(canon_MULTIPASS_MP190);
+
+static const canon_paper_t canon_MULTIPASS_MP360_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x00,1.00, 1.00, 0.900, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP360);
 
 /* MX300, MX310, MX700 */
 static const canon_paper_t canon_MULTIPASS_MX300_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -572,15 +1248,14 @@ static const canon_paper_t canon_MULTIPASS_MX300_papers[] = {
 };
 DECLARE_PAPERS(canon_MULTIPASS_MX300);
 
-/* MX330 */
 static const canon_paper_t canon_MULTIPASS_MX330_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -593,16 +1268,16 @@ DECLARE_PAPERS(canon_MULTIPASS_MX330);
 /* MX340 --- MX350 is the same */
 static const canon_paper_t canon_MULTIPASS_MX340_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -613,15 +1288,15 @@ DECLARE_PAPERS(canon_MULTIPASS_MX340);
 /* MX360 --- MX410 is the same */
 static const canon_paper_t canon_MULTIPASS_MX360_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -629,17 +1304,17 @@ static const canon_paper_t canon_MULTIPASS_MX360_papers[] = {
 };
 DECLARE_PAPERS(canon_MULTIPASS_MX360);
 
-/* MX420 */
 static const canon_paper_t canon_MULTIPASS_MX420_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Semi-gloss"),	        0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki */
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -647,21 +1322,20 @@ static const canon_paper_t canon_MULTIPASS_MX420_papers[] = {
 };
 DECLARE_PAPERS(canon_MULTIPASS_MX420);
 
-/* MX850 */
 static const canon_paper_t canon_MULTIPASS_MX850_papers[] = {
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoSemiGloss",N_ ("Photo Paper Semi-gloss"),	        0x0b,0x11,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho new !! */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Semi-gloss"),	        0x0b,0x11,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho new !! */
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -669,47 +1343,45 @@ static const canon_paper_t canon_MULTIPASS_MX850_papers[] = {
 DECLARE_PAPERS(canon_MULTIPASS_MX850);
 
 static const canon_paper_t canon_MULTIPASS_MX880_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MX880);
 
-/* MX7600 */
 static const canon_paper_t canon_MULTIPASS_MX7600_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/*OK*/
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/*check variations*/
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_MULTIPASS_MX7600);
 
-/* iX7000 */
 static const canon_paper_t canon_PIXMA_iX7000_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -719,126 +1391,150 @@ static const canon_paper_t canon_PIXMA_iX7000_papers[] = { /*               k_lo
 };
 DECLARE_PAPERS(canon_PIXMA_iX7000);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP250 */
+static const canon_paper_t canon_MULTIPASS_MP240_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP240);
+
 static const canon_paper_t canon_MULTIPASS_MP250_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "ProPhotoHagakiP",  N_ ("Hagaki P (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 }, /* pro photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "ProPhotoHagakiP",  N_ ("Hagaki P (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 },/* pro photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP250);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP280 */
 static const canon_paper_t canon_MULTIPASS_MP280_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP280);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP480 */
+static const canon_paper_t canon_MULTIPASS_MP470_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP470);
+
 static const canon_paper_t canon_MULTIPASS_MP480_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP480);
 
 static const canon_paper_t canon_MULTIPASS_MP493_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "ProPhotoHagakiO",  N_ ("Hagaki Pro Photo"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 }, /* Pro photo hagaki*/
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "ProPhotoHagakiP",  N_ ("Hagaki P (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 },/* Pro photo hagaki*/
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP493);
 
-/* MP520 */
 static const canon_paper_t canon_MULTIPASS_MP520_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPpro*/
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPsuper */
-  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPsuperDS */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPgloss */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPmatte */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPother */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* HiRes */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjetHagaki */
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },/* PPpro*/
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },/* PPsuper */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },/* PPsuperDS */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPgloss */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PPmatte */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PPother */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* HiRes */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjetHagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP520);
 
-/* iP1900 series */
 static const canon_paper_t canon_PIXMA_iP1900_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_PIXMA_iP1900);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MP600 */
 static const canon_paper_t canon_MULTIPASS_MP600_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -846,6 +1542,7 @@ static const canon_paper_t canon_MULTIPASS_MP600_papers[] = {
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "CD",	        N_ ("CD"),	                        0x00,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },/*allow plain modes for now*/
   { "DiscCompat",	N_ ("Printable Disc (recommended)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (others)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
   { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -854,76 +1551,168 @@ static const canon_paper_t canon_MULTIPASS_MP600_papers[] = {
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP600);
 
-/* MP640 */
+static const canon_paper_t canon_MULTIPASS_MP610_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (recommended)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (others)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP610);
+
 static const canon_paper_t canon_MULTIPASS_MP630_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
   { "DiscCompat",	N_ ("Printable Disc (recommended)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (others)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP630);
 
-/* MP640 */
 static const canon_paper_t canon_MULTIPASS_MP640_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "ProPhotoHagakiP",  N_ ("Hagaki P (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 }, /* pro photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "ProPhotoHagakiP",  N_ ("Hagaki P (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 },/* pro photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
   { "DiscCompat",	N_ ("Printable Disc (recommended)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (others)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP640);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* iP2700 series */
+static const canon_paper_t canon_MULTIPASS_MP700_papers[] = {            /* no ESC (P for MP700/730 */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.999, 0, 0, 0 },
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x07,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 07 09 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP700);
+
+static const canon_paper_t canon_MULTIPASS_MP710_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.999, 0, 0, 0 },/* untested */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x07,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* different from expected 0d 09 */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* untested */
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP710);
+
+/* MP750/MP760/MP770/MP780/MP790 */
+static const canon_paper_t canon_MULTIPASS_MP750_papers[] = {
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Professional Photo Paper"),	0x09,0x0d,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Glossy Photo Paper Plus"), 	0x0b,0x11,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyFilm",	N_ ("High Gloss Film"),		        0x06,0x06,0x00,0.78, 0.25, 0.999, 0, 0, 0 },/* untested */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* from Japanese models */
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* from Japanese models */
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency", 	N_ ("Transparencies"),			0x02,0x02,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/* from US models */
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP750);
+
 static const canon_paper_t canon_PIXMA_iP2700_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGpro */
-  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGproPlat */
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPG */
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP matte */
-  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 }, /* hi res paper */
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },/* plain */
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),	        0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGpro */
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),	        0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGproPlat */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },/* PP kinumecho */
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/* PPG */
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/* PP matte */
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/* hi res paper */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_PIXMA_iP2700);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* iP4500 */
+static const canon_paper_t canon_PIXMA_iP3600_papers[] = {    /*                  k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2", 	N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPro2",	N_ ("Photo Paper Pro II"),		0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_PIXMA_iP3600);
+
 static const canon_paper_t canon_PIXMA_iP4500_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
-  { "PhotopaperPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -946,16 +1735,16 @@ static const canon_paper_t canon_PIXMA_iP4600_papers[] = {    /*
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),		0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HighResolution",	N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirtTransfer",	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Other",		N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_iP4600);
 
@@ -966,9 +1755,9 @@ static const canon_paper_t canon_PIXMA_iP4700_papers[] = {    /*
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),		0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HighResolution",	N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
@@ -976,33 +1765,78 @@ static const canon_paper_t canon_PIXMA_iP4700_papers[] = {    /*
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirtTransfer",	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",   	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Other",		N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_PIXMA_iP4700);
 
+static const canon_paper_t canon_MULTIPASS_MP950_papers[] = { /*               k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),	                0x09,0x0d,0x1a,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP950);
+
 static const canon_paper_t canon_MULTIPASS_MP960_papers[] = { /*                  k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },/*OK*/
-  { "GlossyPro",	N_ ("Photo Paper Pro"),		        0x09,0x0d,0x1a,1.00, 1.00, 0.999, 0, 0, 0 },/*check*/
-  { "PhotoSuper",       N_ ("Photo Paper Super"),	        0x1b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "HighResolution",	N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },/*OK*/
-  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "TShirtTransfer",	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/*check c*/
-  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/*check variations*/
-  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "Other",		N_ ("Other Coated Photo Paper"),	0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 } /*coated, OK*/
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),		        0x09,0x0d,0x1a,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble",N_ ("Photo Paper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Transparency",	N_ ("Transparencies"),		        0x02,0x02,0x01,1.00, 0.25, 0.500, 0, 0, 0 }, /* untested */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),	        0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP960);
 
+static const canon_paper_t canon_MULTIPASS_MP970_papers[] = { /*                  k_lower_scale   *hue_adjustment *sat_adjustment */
+  /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPro",	N_ ("Photo Paper Pro"),		        0x09,0x0d,0x1a,1.00, 1.00, 0.999, 0, 0, 0 },
+  { "PhotopaperPlus",	N_ ("Photo Paper Plus Glossy"), 	0x0b,0x11,0x1d,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperPlusDouble", N_ ("Photopaper Plus Double Sided"),0x10,0x15,0x25,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2", 	N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Coated Photo Paper"),	0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+};
+DECLARE_PAPERS(canon_MULTIPASS_MP970);
+
 static const canon_paper_t canon_MULTIPASS_MP980_papers[] = {    /*  k_lower_scale   *hue_adjustment *sat_adjustment */
   /* Name                    Text                               (c   (l   (P   Density    k_upper    *lum_adjustment */
   { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -1010,8 +1844,8 @@ static const canon_paper_t canon_MULTIPASS_MP980_papers[] = {    /*  k_lower_sca
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),		0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
@@ -1019,9 +1853,9 @@ static const canon_paper_t canon_MULTIPASS_MP980_papers[] = {    /*  k_lower_sca
   { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirtTransfer",	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Other",		N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP980);
 
@@ -1032,98 +1866,94 @@ static const canon_paper_t canon_MULTIPASS_MP990_papers[] = {    /*  k_lower_sca
   { "PhotoPro2",	N_ ("Photo Paper Pro II"),		0x1f,0x25,0x34,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "GlossyPhoto",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "MattePhoto",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "Other",		N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "TShirtTransfer",	N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
+  { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",	        N_ ("T-Shirt Transfer"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
   { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HighResolution",	N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "Coated",	        N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
   { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
   { "InkJetHagaki",	N_ ("Ink Jet Hagaki"), 			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },
   { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
-  { "OtherPhotoHagakiO",N_ ("Hagaki O (Other Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 },/* Other photo hagaki*/
+  { "ProPhotoHagakiP",  N_ ("Hagaki K (Pro Photo)"),		0x1f,0x25,0x37,0.78, 0.25, 0.500, 0, 0, 0 },/* Pro photo hagaki*/
   { "Hagaki",		N_ ("Hagaki"),				0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Envelope", 	N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },
 };
 DECLARE_PAPERS(canon_MULTIPASS_MP990);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MG5100 series */
 static const canon_paper_t canon_PIXMA_MG5100_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_PIXMA_MG5100);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MG5200 series */
 static const canon_paper_t canon_PIXMA_MG5200_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_PIXMA_MG5200);
 
-/* Gernot: added ---- note: ESC ( P code not used at all yet, check print-canon.c */
-/* MG6100 series */
 static const canon_paper_t canon_PIXMA_MG6100_papers[] = {
-  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 }, /* plain */
-  { "PhotoPlusGLoss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 }, /* PPGgold */
+  { "Plain",		N_ ("Plain Paper"),			0x00,0x00,0x00,1.00, 0.25, 0.500, 0, 0, 0 },
+  { "PhotoPlusGloss2",  N_ ("Photo Paper Plus Glossy II"),	0x1d,0x23,0x32,0.78, 0.25, 0.500, 0, 0, 0 },/* PPGgold */
   { "PhotoProPlat",	N_ ("Photo Paper Platinum"),		0x1e,0x24,0x33,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP kinumecho */
+  { "PhotoProSemiGloss",N_ ("Photo Paper Plus Semi-gloss"),	0x1a,0x1f,0x2a,0.78, 0.25, 0.500, 0, 0, 0 },
   { "GlossyPaper",	N_ ("Glossy Photo Paper"),		0x05,0x05,0x16,0.78, 0.25, 0.500, 0, 0, 0 },
   { "PhotopaperMatte",	N_ ("Matte Photo Paper"),		0x0a,0x10,0x1c,0.78, 0.25, 0.500, 0, 0, 0 },
   { "Coated",		N_ ("High Resolution Paper"),		0x07,0x07,0x10,0.78, 0.25, 0.500, 0, 0, 0 },
-  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 }, /* all hagaki */
-  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 }, /* inkjet hagaki */
-  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 }, /* Canon photo hagaki*/
-  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 }, /* hagaki*/
-  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },/*check c,l*/
-  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 }, /* T-shirt */
-  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 }, /* env */
-  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "FineArtOther",     N_ ("Fine Art Other"),	                0x16,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },/*check*/
-  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 }, /* PP other */
+  { "HagakiA", 	        N_ ("Hagaki A (address side)"),	        0x08,0x09,0x38,0.78, 0.25, 0.500, 0, 0, 0 },/* all hagaki */
+  { "InkJetHagaki", 	N_ ("Ink Jet Hagaki"),			0x0d,0x09,0x1b,0.78, 0.25, 0.500, 0, 0, 0 },/* inkjet hagaki */
+  { "CanonPhotoHagakiK",N_ ("Hagaki K (Canon Photo)"),		0x05,0x05,0x36,0.78, 0.25, 0.500, 0, 0, 0 },/* Canon photo hagaki*/
+  { "Hagaki", 	        N_ ("Hagaki"),			        0x08,0x09,0x07,0.78, 0.25, 0.500, 0, 0, 0 },/* hagaki*/
+  { "DiscCompat",	N_ ("Printable Disc (Compatible)"),	0x0c,0x12,0x1f,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "DiscOthers",	N_ ("Printable Disc (Other)"),		0x0c,0x12,0x20,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "TShirt",		N_ ("T-Shirt Transfers"),		0x03,0x03,0x12,0.78, 0.25, 0.500, 0, 0, 0 },/* T-shirt */
+  { "Envelope",		N_ ("Envelope"),			0x08,0x08,0x08,0.78, 0.25, 0.500, 0, 0, 0 },/* env */
+  { "FineArtPhotoRag",  N_ ("Fine Art Photo Rag"),	        0x13,0x18,0x28,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "FineArtOther",     N_ ("Fine Art Other"),	                0x13,0x18,0x29,0.78, 0.25, 0.500, 0, 0, 0 },
+  { "PhotopaperOther",	N_ ("Other Photo Paper"),		0x0f,0x14,0x24,0.78, 0.25, 0.500, 0, 0, 0 },/* PP other */
 };
 DECLARE_PAPERS(canon_PIXMA_MG6100);
 
 #endif
 
 /*
-Plain:            Plain Paper, Canon High Resolution Paper;
-Super High Gloss: Photo Paper Pro Platinum;
-Glossy:           Photo Paper Plus Glossy II, Photo Paper Glossy;
-Semi-Gloss:       Photo Paper Plus Semi-Gloss;
-Matte:            Canon Matte Photo Paper;
-Fine Art:         Canon Fine Art Paper "Photo Rag";
-Envelope:         U.S.# 10 Envelope
+Plain:              Plain Paper, Canon High Resolution Paper;
+Super:              Photo Paper Plus Glossy;
+Super Double-Sided: Photo Paper Plus Double-Sided;
+Super High Gloss:   Photo Paper Pro Platinum;
+Glossy:             Photo Paper Plus Glossy II, Photo Paper Glossy;
+Semi-Gloss:         Photo Paper Plus Semi-Gloss;
+Matte:              Canon Matte Photo Paper;
+Fine Art:           Canon Fine Art Paper "Photo Rag";
+Envelope:           U.S.# 10 Envelope
 */
diff --git a/src/main/canon-modes.h b/src/main/canon-modes.h
index b5d8e25..a21d324 100644
--- a/src/main/canon-modes.h
+++ b/src/main/canon-modes.h
@@ -81,9 +81,7 @@ typedef struct {
 /* delay settings for the different printmodes  last entry has to be {0,0} */
 static const canon_delay_t delay_1440[] = {{'C',112},{'M',224},{'Y',336},{'c',112},{'m',224},{'y',336},{0,0}};
 static const canon_delay_t delay_S200[] = {{'C',0x30},{'M',0x50},{'Y',0x70},{0,0}};
-
-
-
+ 
 /*
  * A printmode is defined by its resolution (xdpi x ydpi), the inkset
  * and the installed printhead.
@@ -100,12 +98,21 @@ typedef struct {
   const char* text;                    /* description */
   const int num_inks;
   const canon_inkset_t *inks;          /* ink definition        */
+  const int raster_lines_per_block;    /* number of raster lines in every F) command */
   const unsigned int flags;
 #define MODE_FLAG_WEAVE 0x1            /* this mode requires weaving */
 #define MODE_FLAG_EXTENDED_T 0x2       /* this mode requires extended color settings in the esc t) command */
 #define MODE_FLAG_CD 0x4               /* this mode can be used to print to cds */
 #define MODE_FLAG_PRO 0x8              /* special ink settings for the PIXMA Pro9500 not sure of this... maybe 0x4 */
 #define MODE_FLAG_IP8500 0x10          /* special ink settings for the PIXMA iP8500 */
+#define MODE_FLAG_MP360 0x20           /* special ink settings for the PIXMA MP360 */
+#define MODE_FLAG_MP130 0x40           /* special ink settings for early devices */
+#define MODE_FLAG_S 0x80               /* mode-related setup command on iP90/iP9v and iP100 */
+  /* cartridge/InkSet-specific modes for replacement */
+#define MODE_FLAG_BLACK 0x100          /* selection of black cartridge: replacement modes */
+#define MODE_FLAG_COLOR 0x200          /* selection of color cartridge: replacement modes */
+#define MODE_FLAG_PHOTO 0x400          /* selection of photo color cartridge in BJC series printers (in lieu of color and black, or combined color/black) */
+#define MODE_FLAG_NODUPLEX 0x800       /* selection of mode for duplex: list modes that do not work for duplex---skip these in mode searches  */
   const canon_delay_t* delay;          /* delay settings for this printmode */
   const double density;                /* density multiplier    */
   const double gamma;                  /* gamma multiplier      */
@@ -136,1246 +143,3499 @@ static const canon_modelist_t name##_modelist = {      \
 
 /* modelist for every printer,modes ordered by ascending resolution ink_type and quality */
 static const canon_mode_t canon_BJC_30_modes[] = {
-  {  180, 180,CANON_INK_K,"180x180dpi",N_("180x180 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_K,"360x360dpi",N_("360x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 360,CANON_INK_K,"720x360dpi",N_("720x360 DPI"),INKSET(1_K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K,"720x360dpi",N_("720x360 DPI"),INKSET(1_K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K,"360x360dpi",N_("360x360 DPI"),INKSET(1_K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_K,"180x180dpi",N_("180x180 DPI"),INKSET(1_K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_30,0);
+DECLARE_MODES(canon_BJC_30,2);
 
 
 static const canon_mode_t canon_BJC_85_modes[] = {
+  {  720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+     "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+     "360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-              "360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+     "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_85,0);
+DECLARE_MODES(canon_BJC_85,2);
 
 
 /* we treat the printers that can either print in K or CMY as CMYK printers here by assigning a CMYK inkset */
 static const canon_mode_t canon_BJC_210_modes[] = {
-  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_210,0);
+DECLARE_MODES(canon_BJC_210,3);
 
 
 static const canon_mode_t canon_BJC_240_modes[] = {
-  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 360,CANON_INK_K | CANON_INK_CMY,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_K | CANON_INK_CMY,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {   90,  90,CANON_INK_K | CANON_INK_CMY,"90x90dpi",N_("90x90 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_240,0);
+DECLARE_MODES(canon_BJC_240,4);
 
 
 static const canon_mode_t canon_BJC_2000_modes[] = {
-  {  180, 180,CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_2000,0);
-
+DECLARE_MODES(canon_BJC_2000,1);
 
+/* these printers only have CMYK, so CcMmYK is not required I think */
+/* using color (CMYK) cartridge, some media use CMYK, others only use CMY --- need to check this as my test image lacked Y apparently */
+/* some modes use ESC (t 0x2 0x80 0x9 which implies bits per ink > 1, but how to know how many? */
+/* added MODE_FLAG_PHOTO as a means to set ESC (t */
 static const canon_mode_t canon_BJC_3000_modes[] = {
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_BJC_3000,0);
-
-
+  { 1440, 720,CANON_INK_K | CANON_INK_CMY | CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,delay_1440,1.0,1.0,NULL,NULL,NULL,2},
+  {  720, 720,CANON_INK_K | CANON_INK_CMY | CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY | CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMY | CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DMT"),INKSET(6_C4M4Y4K4c4m4),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi_draft",N_("360x360 DPI DRAFT"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  180, 180,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,"180x180dpi",N_("180x180 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  360, 360,CANON_INK_CMY | CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi_photo",N_("360x360 DPI PHOTO CARTRIDGE"),INKSET(6_C4M4Y4K4c4m4),8,MODE_FLAG_PHOTO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_3000,4);
+
+/* these printers only have K and CMYK, so CcMmYK is not required */
+/* using color (CMYK) cartridge, all media use CMYK */
+/* some modes use ESC (t 0x2 0x80 0x9 which implies bits per ink > 1, but how to know how many? */
+/* added MODE_FLAG_PHOTO as a means to set ESC (t */
 static const canon_mode_t canon_BJC_4300_modes[] = {
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,1.0,1.0,NULL,NULL,NULL,2},
+  {  760, 360,CANON_INK_K | CANON_INK_CMYK,"720x360dpi",N_("720x360 DPI"),INKSET(4_C4M4Y4K4),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK,"360x360dpi_high",N_("360x360 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* different code */
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK,"360x360dmt",N_("360x360 DMT"),INKSET(4_C4M4Y4K4),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK,"360x360dpi_draft",N_("360x360 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  180, 180,CANON_INK_K | CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK,"360x360dpi_photo",N_("360x360 DPI PHOTO CARTRIDGE"),INKSET(4_C4M4Y4K4),8,MODE_FLAG_PHOTO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* there is another 720x360 mono mode */
 };
-DECLARE_MODES(canon_BJC_4300,0);
-
-
+DECLARE_MODES(canon_BJC_4300,5);
 
 static const canon_mode_t canon_BJC_4400_modes[] = {
-  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-              "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
   {  720, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
-              "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+     "720x360dpi",N_("720x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_K | CANON_INK_CMYK | CANON_INK_CcMmYK,
+     "360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_4400,0);
+DECLARE_MODES(canon_BJC_4400,1);
 
+/* this seems to use different ESC (c bit for quality than pixma devices. */
+/* these printers only have K, or (subset of) CMYK, so CcMmYK is not required. */
+/* using color (CMYK) cartridge, get CMYK */
+/* added MODE_FLAG_PHOTO as a means to set ESC (t */
+static const canon_mode_t canon_BJC_4550_modes[] = {
+  {  720, 360,CANON_INK_K|CANON_INK_CMYK,"720x360dpi_high",N_("720x360 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  720, 360,CANON_INK_K|CANON_INK_CMYK,"720x360dpi",N_("720x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  360, 360,CANON_INK_K|CANON_INK_CMYK,"360x360dpi_high",N_("360x360 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  360, 360,CANON_INK_K|CANON_INK_CMYK,"360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  180, 180,CANON_INK_K|CANON_INK_CMYK,"180x180dpi",N_("180x180 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK,"360x360dpi_photo",N_("360x360 DPI PHOTO CARTRIDGE"),INKSET(4_C4M4Y4K4),8,MODE_FLAG_PHOTO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_4550,4);
 
 static const canon_mode_t canon_BJC_5500_modes[] = {
-  {  180, 180,CANON_INK_CMYK | CANON_INK_CcMmYK,"180x180dpi",N_("180x180 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  180, 180,CANON_INK_CMYK | CANON_INK_CcMmYK,"180x180dpi",N_("180x180 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_5500,0);
+DECLARE_MODES(canon_BJC_5500,1);
 
 
 static const canon_mode_t canon_BJC_6000_modes[] = {
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
-  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),0,delay_1440,0.5,1.0,NULL,NULL,NULL,2},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"1440x720dpi",N_("1440x720 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,delay_1440,0.5,1.0,NULL,NULL,NULL,2},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CcMmYK,"720x720dpi",N_("720x720 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dpi",N_("360x360 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CcMmYK,"360x360dmt",N_("360x360 DPI DMT"),INKSET(6_C4M4Y4K4c4m4),8,0,NULL,1.8,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_6000,0);
+DECLARE_MODES(canon_BJC_6000,3);
 
 
 static const canon_mode_t canon_BJC_7000_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,3.5,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
-  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_BJC_7000,0);
-
-static const canon_mode_t canon_BJC_i560_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,3.5,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.8,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,3.5,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_i560,0);
+DECLARE_MODES(canon_BJC_7000,2);
 
 static const canon_mode_t canon_BJC_7100_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 1200, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"1200x600dpi",N_("1200x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_7100,0);
+DECLARE_MODES(canon_BJC_7100,2);
 
+/* 50i sold as i70 outside of Japan */
+static const canon_mode_t canon_BJC_i50_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM gloss"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* color only */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI MONO Env/Hagaki"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},/* mono only */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i50,1);
+
+/* inkjetHagaki and Hagaki from 80i */
 static const canon_mode_t canon_BJC_i80_modes[] = {
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* original modes */
+  /* {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2}, */
+  /* {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2}, */
+  /* plain modes --- Env/Hagaki same */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYKcmy */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* mono only---color untested*/
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO other"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI DRAFT plusGlossy"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjetHagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohpdraft",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYKcmy */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high4",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* mono only---color untested*/
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i80,2);
+
+/* not known what is format of sending of logical color data, just sequence of (z commands like some iP devices */
+/* all modes use MP360 flag */
+static const canon_mode_t canon_BJC_i250_modes[] = {
+  /* plain modes --- Env/Hagaki same (except no draft mode) */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"300x300dpi_highmono",N_("300x300 DPI HIGH MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,0},/* untested */
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C7M7Y7K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM gloss"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i250,1);
+
+/* not known what is format of sending of logical color data, just sequence of (z commands like some iP devices */
+/* all modes use MP360 flag */
+static const canon_mode_t canon_BJC_i320_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MEDIUM"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"300x300dpi_highmono",N_("300x300 DPI HIGH MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT"),INKSET(9_K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C7M7Y7K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,4},/* untested */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM gloss"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO HiRes/glossFilm"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- different quality settings to plain */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i320,2);
+
+/* inkjetHagaki and Hagaki from 450i */
+static const canon_mode_t canon_BJC_i450_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color only */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Other"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT (plusGlossy)"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH Env/Hagaki MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
 };
-DECLARE_MODES(canon_BJC_i80,0);
+DECLARE_MODES(canon_BJC_i450,2);
 
+/* inkjetHagaki and Hagaki from 455i */
+static const canon_mode_t canon_BJC_i455_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH (gloss)"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* CMYcmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Other"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT (plusGlossy)"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* CMYcmy */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH Env/Hagaki MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i455,2);
+
+/* inkjetHagaki and Hagaki from 550i */
+static const canon_mode_t canon_BJC_i550_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C7M7Y7K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM gloss"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/plusGlossy/glossFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH Env/Hagaki MONO"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i550,2);
+
+/* inkjetHagaki, Hagaki and CD from 560i */
+static const canon_mode_t canon_BJC_i560_modes[] = {
+  /* original modes (2) */
+  /* {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYyK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,3.5,1.0,NULL,NULL,NULL,2}, */
+  /* {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYyK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.8,1.0,NULL,NULL,NULL,2}, */
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/*untested*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i560,1);
+
+/* inkjetHagaki, Hagaki and CD from 850i */
+static const canon_mode_t canon_BJC_i850_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/*untested*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i850,1);
+
+/* inkjetHagaki, Hagaki and CD from 860i */
+static const canon_mode_t canon_BJC_i860_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4p),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt: CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i860,1);
+
+/* inkjetHagaki, Hagaki and CD from 900PD */
+static const canon_mode_t canon_BJC_i900_modes[] = {
+  /* plain modes --- no mono modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST pro"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* CD CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI HIGH CD"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI CD"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft5",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- no mono modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y3K3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_i900,1);
+
+/* inkjetHagaki, Hagaki and CD from 950i */
+static const canon_mode_t canon_BJC_i950_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MEDIUM"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO LOW"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes/PhotoFilm"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO pro/HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft5",N_("600x600 DPI CD DRAFT"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI LOW Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* T-Shirt --- same as plain std */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high5",N_("600x600 DPI STD Env/Hagaki"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI LOW Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std5",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono4",N_("600x600 DPI MONO LOW Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono5",N_("600x600 DPI MONO DRAFT Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+};
+DECLARE_MODES(canon_BJC_i950,2);
+
+/* inkjetHagaki, Hagaki and CD from 960i */
+static const canon_mode_t canon_BJC_i960_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH (duplex)"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MEDIUM"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO LOW"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO pro/HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI LOW Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* T-Shirt --- same as plain std */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high5",N_("600x600 DPI MEDIUM Env/Hagaki"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI STD Env/Hagaki"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std5",N_("600x600 DPI LOW Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft5",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono4",N_("600x600 DPI MONO LOW Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono5",N_("600x600 DPI MONO DRAFT Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+};
+DECLARE_MODES(canon_BJC_i960,2);
+
+/* inkjetHagaki and Hagaki from 990i */
+static const canon_mode_t canon_BJC_i990_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH (duplex)"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI MEDIUM"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO LOW"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes --- many use R ink which is not yet supported */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO HiRes/other"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT gloss"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki --- high mode uses unsupported R ink */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt --- same as plain std */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes: but no special duplex modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft5",N_("600x600 DPI LOW Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono4",N_("600x600 DPI MONO LOW Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono5",N_("600x600 DPI MONO DRAFT Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+};
+DECLARE_MODES(canon_BJC_i990,2);
+
+/* inkjetHagaki and Hagaki from 6100i */
+static const canon_mode_t canon_BJC_i6100_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI MEDIUM"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST gloss"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/plusGlossy"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/gloss/HiRes"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/plusGlossy"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/gloss/HiRes"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH Transparency"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_i6100,2);
+
+/* inkjetHagaki and Hagaki from 9100i */
+static const canon_mode_t canon_BJC_i9100_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C5M5Y5K9c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI LOW"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/plusGlossy"),INKSET(9_C5M5Y5K5c9m9_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/gloss/HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/gloss/HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C5M5Y5K5c9m9_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C5M5Y5K9c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+};
+DECLARE_MODES(canon_BJC_i9100,1);
+
+static const canon_mode_t canon_BJC_i9900_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI MEDIUM"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO LOW"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes --- many use R, G inks which are not yet supported */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH HiRes"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM HiRes"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO HiRes/other"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT gloss/plusGlossy"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki --- high mode uses unsupported R,G inks */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt --- same as plain std */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft5",N_("600x600 DPI LOW Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono4",N_("600x600 DPI MONO LOW Env/Hagaki"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono5",N_("600x600 DPI MONO DRAFT Env/Hagaki"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+};
+DECLARE_MODES(canon_BJC_i9900,1);
 
 static const canon_mode_t canon_BJC_8200_modes[] = {
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  { 1200,1200,CANON_INK_CMYK,"1200x1200dpi",N_("1200x1200 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  { 1200,1200,CANON_INK_CMYK,"1200x1200dpi",N_("1200x1200 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+
 };
-DECLARE_MODES(canon_BJC_8200,0);
+DECLARE_MODES(canon_BJC_8200,2);
 
 
 static const canon_mode_t canon_BJC_8500_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_BJC_8500,0);
+DECLARE_MODES(canon_BJC_8500,1);
 
 
 static const canon_mode_t canon_S200_modes[] = {
-  {  360, 360,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
-              "360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),0,delay_S200,2.0,1.0,NULL,NULL,NULL,2},
-  {  720, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
-              "720x720dpi",N_("720x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,1.0,1.0,NULL,NULL,NULL,2},
-  { 1440, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
-              "1440x720dpi",N_("1440x720 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.5,1.0,NULL,NULL,NULL,2},
   { 1440,1440,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
-              "1440x1440dpi",N_("1440x1440 DPI"),INKSET(4_C2M2Y2K2),MODE_FLAG_WEAVE,delay_S200,0.3,1.0,NULL,NULL,NULL,2},
+    "1440x1440dpi",N_("1440x1440 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_WEAVE,delay_S200,0.3,1.0,NULL,NULL,NULL,2},
+  { 1440, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+    "1440x720dpi",N_("1440x720 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_WEAVE,delay_S200,0.5,1.0,NULL,NULL,NULL,2},
+  {  720, 720,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+     "720x720dpi",N_("720x720 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_WEAVE,delay_S200,1.0,1.0,NULL,NULL,NULL,2},
+  {  360, 360,CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+     "360x360dpi",N_("360x360 DPI"),INKSET(4_C2M2Y2K2),8,0,delay_S200,2.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_S200,3);
+
+static const canon_mode_t canon_BJC_S300_modes[] = {
+  /* original two modes */
+  /*{  300, 300,CANON_INK_CMYK | CANON_INK_CcMmYK,"300x300dpi",N_("300x300 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
+  /*{  600, 600,CANON_INK_CMYK | CANON_INK_CcMmYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI MEDIUM"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST gloss/PhotoCard"),INKSET(9_C7M7Y7K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss/PhotoCards"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO HiRes/PhotoFilm/PhotoCard"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_S300,2);
+
+static const canon_mode_t canon_BJC_S330_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI MEDIUM"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST gloss"),INKSET(9_C7M7Y7K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO HiRes/matte/PhotoFilm"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_S330,2);
+
+static const canon_mode_t canon_BJC_S500_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST gloss/HiRes/PhotoCard"),INKSET(9_C7M7Y7K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss/HiRes/PhotoCard"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO gloss/HiRes/PhotoCard"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
 };
-DECLARE_MODES(canon_S200,0);
+DECLARE_MODES(canon_BJC_S500,1);
 
-static const canon_mode_t canon_S500_modes[] = {
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(6_C2M2Y2K2c2m2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/*  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */
+static const canon_mode_t canon_BJC_S520_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST gloss"),INKSET(9_C7M7Y7K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/plusGlossy/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/gloss/HiRes"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/plusGlossy/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/gloss/HiRes"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
 };
-DECLARE_MODES(canon_S500,2);
+DECLARE_MODES(canon_BJC_S520,2);
+
+static const canon_mode_t canon_BJC_S600_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST gloss/HiRes/PhotoCard"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/PhotoFilm"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH gloss/HiRes/PhotoCard"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/PhotoFilm"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO gloss/HiRes/PhotoCard"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki --- untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh5",N_("600x600 DPI HIGHEST Transparency"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH Transparency"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C2M2Y2K2c2m2y2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_S600,1);
+
+static const canon_mode_t canon_BJC_S750_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST gloss"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH pro/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/gloss/HiRes/plusGlossy"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/PhotoFilm"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/gloss/HiRes/plusGlossy"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_BJC_S750,1);
+
+static const canon_mode_t canon_BJC_S800_modes[] = {
+  /* plain modes --- also for Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(9_K9),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(1_K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI PHOTO HIGHEST pro/other"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST matte/gloss/HiRes/PhotoCard/"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH plusGlossy/PhotoFilm"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH pro/matte/gloss/HiRes/PhotoCard/other"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/gloss/HiRes/PhotoCard"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO other"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT other"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* mono photo modes for PPother only --- manual feed preferred in Windows driver */
+  {  600, 600,CANON_INK_K,"600x600dpi_photomonohigh2",N_("600x600 DPI PHOTO HIGHEST MONO other"),INKSET(9_K9),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_K,"600x600dpi_photomonohigh",N_("600x600 DPI PHOTO HIGH MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_photomono",N_("600x600 DPI PHOTO MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_photomonodraft",N_("600x600 DPI PHOTO MONO DRAFT"),INKSET(1_K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_S800,2);
+
+/* Windows driver shows fewer modes than S800, but it could be they exist */
+/* modes present in S800 but not accessible in Windows driver for S820 are marked as untested */
+static const canon_mode_t canon_BJC_S820_modes[] = {
+  /* plain modes --- also for Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(9_K9),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI PHOTO HIGHEST pro/other"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST matte/gloss/HiRes/PhotoCard/"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH plusGlossy/PhotoFilm"),INKSET(9_C9M9Y9K9c9m9),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH pro/matte/gloss/HiRes/PhotoCard/other"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/gloss/HiRes/PhotoCard"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO other"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_S820,2);
+
+static const canon_mode_t canon_BJC_S900_modes[] = {
+  /* plain modes --- also for Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH 2"),INKSET(9_C5M5Y5K9c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(9_K9),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(9_K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI PHOTO HIGHEST pro"),INKSET(9_C5M5Y5K5c9m9_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI PHOTO HIGHEST HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH plusGlossy"),INKSET(9_C5M5Y5K5c9m9_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/gloss/PhotoFilm"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH pro/HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/gloss/HiRes"),INKSET(9_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO DRAFT"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K5_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_BJC_S900,1);
+
+/* no K used in any modes */
+static const canon_mode_t canon_PIXMA_mini220_modes[] = {
+  { 1200,1200,CANON_INK_CMY,"1200x1200dpi_photohigh",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(9_c3m3y3),32,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_c3m3y3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH Gloss"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* CMYcmy */
+  /* Hagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Hagaki"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI Hagaki"),INKSET(9_C5M5Y5),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_mini220,3);
+
+static const canon_mode_t canon_PIXMA_mini320_modes[] = {
+  /* most modes used unsupported inks */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(11_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_mini320,0);
+
+static const canon_mode_t canon_SELPHY_DS700_modes[] = {
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: no subtraction */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: no subtraction */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH Glossy"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Hagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo3",N_("600x600 DPI HIGH Hagaki"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI Hagaki"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_SELPHY_DS700,3);
+
+static const canon_mode_t canon_SELPHY_DS810_modes[] = {
+  { 1200,1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(9_c3m3y3),32,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: no subtraction */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: no subtraction */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH Glossy"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C5M5Y5),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* Hagaki */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo3",N_("600x600 DPI HIGH Hagaki"),INKSET(9_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI Hagaki"),INKSET(9_C5M5Y5),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_SELPHY_DS810,3);
+
+
+/* most modes use ESC (S */
+static const canon_mode_t canon_PIXMA_iP90_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C9M9Y9K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,4},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},/*|MODE_FLAG_COLOR*/
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DRAFT DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},/*|MODE_FLAG_COLOR*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1-bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1-bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: no subtraction , no ESC (S */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C9M9Y9K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* TST */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C9M9Y9K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no ESC (S */
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C9M9Y9K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP90,2);
+
+/* all modes use ESC (S */
+static const canon_mode_t canon_PIXMA_iP100_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH MONO"),INKSET(11_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,4},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(11_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},/*|MODE_FLAG_COLOR*/
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},/*|MODE_FLAG_COLOR*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(11_C2M2Y2K2),8,MODE_FLAG_IP8500|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(11_C2M2Y2K2),8,MODE_FLAG_IP8500|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(11_C9M9Y4k6),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(11_C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO Matte/HiRes"),INKSET(11_C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(11_C5M5Y3k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* TST */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(11_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(11_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(11_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_S,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP100,2);
 
 /* testing */
 static const canon_mode_t canon_PIXMA_iP1000_modes[] = {
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DRAFT DPI"),INKSET(9_C3M3Y2K2h),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(9_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_iP1000,4);
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DRAFT DPI"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(9_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP1000,2);
 
 /* testing */
 static const canon_mode_t canon_PIXMA_iP1200_modes[] = {
   /* both cartridges */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DRAFT DPI"),INKSET(13_C3M3Y2K2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4K2c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DRAFT DPI"),INKSET(13_C3M3Y2K2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* mono modes */
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* color only modes*/
-  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi",N_("1200x1200 DPI PHOTO"),INKSET(13_c3m3y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi",N_("1200x1200 DPI PHOTO"),INKSET(13_c3m3y3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
   /* removed black */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH 4"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH 3"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI 3"),INKSET(13_C3M3Y2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(13_C3M3Y2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH 4"),INKSET(13_C4M4Y4c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH 3"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI 3"),INKSET(13_C3M3Y2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(13_C3M3Y2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 };
-DECLARE_MODES(canon_PIXMA_iP1200,4);
+DECLARE_MODES(canon_PIXMA_iP1200,2);
 
 static const canon_mode_t canon_PIXMA_iP1500_modes[] = {
   /* plain modes */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C9M9Y9K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C9M9Y9K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2h),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(9_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* mono */
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C4M4Y4K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* photo */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C9M9Y9K2c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(9_C9M9Y9K2c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C9M9Y9K2c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(9_C9M9Y9K2c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C5M5Y5K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_PIXMA_iP1500,3);
+DECLARE_MODES(canon_PIXMA_iP1500,1);
 
 /* testing */
 static const canon_mode_t canon_PIXMA_iP1900_modes[] = {
   /* plain, Hagaki, Env */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* mono */
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* photo high --- unlikely to work */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* photo std --- unlikely to work */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* photo high 2 --- unlikely to work */
-  {  1200, 1200,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH2"),INKSET(13_c3m3y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  /* photo draft */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGH2"),INKSET(13_c3m3y3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
   /* color only plain, hagaki, Env*/
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2b),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_2",N_("300x300 DPI 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4K2c4m4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2b),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_2",N_("300x300 DPI 2"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT 2"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 
 };
-DECLARE_MODES(canon_PIXMA_iP1900,2);
+DECLARE_MODES(canon_PIXMA_iP1900,1);
 
 static const canon_mode_t canon_PIXMA_iP2000_modes[] = {
   /* plain modes */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1-bpp, ignore other inks */
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1-bpp, ignore other inks */
-  /* photo */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(9_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(9_C5M5Y5K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C5M5Y5K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* OHP */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C4M4Y4K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-};
-DECLARE_MODES(canon_PIXMA_iP2000,5);
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1-bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1-bpp */
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH Gloss"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Other"),INKSET(9_c9m9y9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh4",N_("600x600 DPI PHOTO HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI PHOTO Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /*  T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* color untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP2000,2);
 
 static const canon_mode_t canon_PIXMA_iP3000_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI OHP HIGH"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI OHP"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* plain modes --- same for duplex */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  /* inkjet Hagaki --- untested */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* no K */
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI CD HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI CD DRAFT"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_PIXMA_iP3000,1);
 
+/* as iP3000 but with Hagaki/inkjet Hagaki */
 static const canon_mode_t canon_PIXMA_iP3100_modes[] = {
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(9_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},/* 1-bpp, ignore other inks [don't list] */
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1-bpp, ignore other inks [don't list] */
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1-bpp, ignore other inks [don't list] */
-  /* photo */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(9_C8M8Y8c16m16),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(9_C3M3Y3K2c3m3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(9_C3M3Y3K2c3m3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT"),INKSET(9_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* TST */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(9_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* plain modes --- same for duplex */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* no K */
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI CD HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* no K */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI CD DRAFT"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* no K */
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_PIXMA_iP3100,5);
+DECLARE_MODES(canon_PIXMA_iP3100,1);
 
 static const canon_mode_t canon_PIXMA_iP4000_modes[] = {
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(9_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /*Gernot adding the normal hi-quality mode for iP4000 here*/
-/*  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */
-/*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL},*/ /* this mode is used for CD printing, K is ignored by the printer then, the seperation between the small and large dot inks needs more work */
-/*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_superphoto",N_("600x600 DPI Superphoto"),INKSET(9_C8M8Y8c16m16k8),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,4}, */
-/* T-Shirt */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* not sure yet about CMYKk modes, so not inserting yet */
-};
-DECLARE_MODES(canon_PIXMA_iP4000,3);
-
-/* Gernot: I added iP8500 flag to 300dpi modes since that appears to be needed according to the pixma_parse output */
-/*         Also added B/W functionality to the standard plain modes */
-/*         CD mode is not the one the printer driver uses. Given here is actually the plain media High quality mode (now added). */
-/*         But for CD should be CMYcmk output inks, which I am not sure how to set */
-/*         For plain media output inks for high quality mode are CMYKcmk which again I am not sure how to set */
+  /* plain modes --- same for duplex */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  /* legacy modes were used before printer capabilites were improved to handle real mode from driver */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH (LEGACY)"),INKSET(4_C2M2Y2K2),16,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},/* legacy */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI (LEGACY)"),INKSET(4_C2M2Y2K2),16,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/* legacy */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT (LEGACY)"),INKSET(4_C2M2Y2K2),16,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},/* legacy */
+  /* actual printer modes --- same as for iP4100 */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4p),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt: CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP4000,4);
+
+/* iP4100, iP4100R */
+static const canon_mode_t canon_PIXMA_iP4100_modes[] = {
+  /* plain modes --- same for duplex */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4k4p),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT CD"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(9_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt: CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP4100,1);
+
 static const canon_mode_t canon_PIXMA_iP4200_modes[] = {
-  /* Q0 - fastest mode (in windows driver it's Q5, printer uses 50% of ink ( I think )) */
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,iP4200_300dpi_draft_lum_adjustment,NULL,NULL,0},
-  /* Q1 - normal 300x300 mode (in windows driver it's Q4 - normal darkness of printout ) */
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,iP4200_300dpi_lum_adjustment,NULL,NULL,1},
+  /* plain modes */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  /* highest plain mode: CcMmYKk */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
   /* Q2 - standard mode for this driver (in windows driver it's Q3) */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CcMmYyK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-/* {  600, 600,CANON_INK_CcMmYyK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL}, */
-};
-DECLARE_MODES(canon_PIXMA_iP4200,2);
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Q1 - normal 300x300 mode (in windows driver it's Q4 - normal darkness of printout ) */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,iP4200_300dpi_lum_adjustment,NULL,NULL,1},
+  /* Q0 - fastest mode (in windows driver it's Q5, printer uses 50% of ink ( I think )) */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,iP4200_300dpi_draft_lum_adjustment,NULL,NULL,0},
+  /* photo modes mostly use unsupported ink positions -- also use one for temporary CD printing */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet hagaki */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-Shirt"),INKSET(22_C4M4Y4K2k4one),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk --- MP500 */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Transparency"),INKSET(22_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo3",N_("600x600 DPI Transparency"),INKSET(22_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP4200,1);
+
+static const canon_mode_t canon_PIXMA_iP4300_modes[] = {
+  /* plain modes */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  /* highest plain mode: CcMmYKk */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,iP4200_300dpi_lum_adjustment,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,iP4200_300dpi_draft_lum_adjustment,NULL,NULL,0},
+  /* photo modes mostly use unsupported ink positions --- use photodraft for CD temporarily also */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet hagaki */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4one),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk --- MP500 */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photohigh3",N_("600x600 DPI HIGH Transparency"),INKSET(22_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo3",N_("600x600 DPI Transparency"),INKSET(22_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP4300,1);
+
+/* plain high mode has more output inks than declared in inkset, and unknown to boot */
+static const canon_mode_t canon_PIXMA_iP5000_modes[] = {
+  /* plain modes */
+    /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},/* 1-bpp, untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1-bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1-bpp */
+  /* photo --- most use plain high mode which is currently unsupported --- photodraft temporarily for CD printing */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT PlusGlossy"),INKSET(9_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* CMYcmk */
+  /* TST CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP5000,0);
 
 static const canon_mode_t canon_PIXMA_iP6000_modes[] = {
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGHEST"),INKSET(9_C4M4Y4K4c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH / PHOTO HIGH"),INKSET(9_C4M4Y4K4c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (DS)"),INKSET(9_C4M4Y4K4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain modes */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y3K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* photo modes */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST / CD"),INKSET(9_C8M8Y4K4c8m8),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH 2 / CD"),INKSET(9_C8M8Y4K4c8m8),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO / CD"),INKSET(9_C4M4Y4K4c4m4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST / CD"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / CD"),INKSET(9_C8M8Y4K4c8m8),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO / CD"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(9_C4M4Y4K4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y3K3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* T-shirt */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* OHP */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI OHP HIGH"),INKSET(9_C4M4Y4K4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI OHP"),INKSET(9_C4M4Y4K4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_PIXMA_iP6000,4);
+DECLARE_MODES(canon_PIXMA_iP6000,2);
 
-static const canon_mode_t canon_PIXMA_iP6700_modes[] = {
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+/* iP6210D, iP6220D, iP6310D, iP6320D */
+static const canon_mode_t canon_PIXMA_iP6210_modes[] = {
+  /* both cartridges */
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4k4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y3k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},/* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2b),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* photo modes */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4c7m7k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4c6m6k4photo),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/coated"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/coated"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* Hagaki, Envelope */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Hagaki/Env"),INKSET(19_C6M6Y4c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Hagaki/Env"),INKSET(19_C6M6Y4c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Hagaki/Env"),INKSET(19_C3M3Y3k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* CD media */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH CD"),INKSET(19_C4M4Y4c4m4k4CD),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO CD"),INKSET(19_C4M4Y4c4m4k4CD),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT CD"),INKSET(19_C4M4Y4c4m4k4CD),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  1200, 1200,CANON_INK_CcMmYK,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_C3M3Y3k3c3m3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* CMYkcm less 0x80 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C9M9Y9k9c9m9),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYkcm less 0x80 */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4k4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh4",N_("1200x1200 DPI PHOTO HIGHEST Pro COLOR-ONLY"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},/*same*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH COLOR-ONLY"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh5",N_("600x600 DPI PHOTO HIGH plusGlossy COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},/* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},/* cmy: subtract 0x60 */
   /* T-shirt */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_PIXMA_iP6700,0);
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std5",N_("600x600 DPI T-SHIRT COLOR-ONLY"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4k4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C4M4Y4k4c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y3k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},/* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2b),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP6210,1);
+
+static const canon_mode_t canon_PIXMA_iP6600_modes[] = {
+  /* plain modes --- duplex same CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYkcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4c6m6k4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYkcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(19_C7M7Y4c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(19_C6M6Y4c6m6k4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD media --- subchannels reordered */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft5",N_("600x600 DPI DRAFT CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Hagaki, Envelope CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(19_C3M3Y3k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP6600,1);
+
+static const canon_mode_t canon_PIXMA_iP6700_modes[] = {
+  /* plain modes --- duplex same CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYkcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4c6m6k4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYkcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(19_C7M7Y4c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(19_C6M6Y4c6m6k4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI FineArt"),INKSET(19_C7M7Y4c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* CD media --- subchannels reordered */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft5",N_("600x600 DPI DRAFT CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Hagaki, Envelope CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(19_C6M6Y4c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(19_C3M3Y3k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP6700,1);
 
 static const canon_mode_t canon_MULTIPASS_MP150_modes[] = {
-  /* {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */ /* need to check cmy */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  /* {  600, 600,CANON_INK_CMY,"600x600dpi_glossphotohigh",N_("600x600 DPI GLOSSPHOTO HIGH"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */ /* need to check cmy */
-  /* {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, */ /* need to check cmy */
-  /* {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, */ /* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_MULTIPASS_MP150,0);
-
-/* Gernot: add modes here: high & draft */
-static const canon_mode_t canon_MULTIPASS_MP170_modes[] = {
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_glossphotohigh",N_("600x600 DPI GLOSSPHOTO HIGH"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-/*plenty of other photo paper modes to add here*/
-DECLARE_MODES(canon_MULTIPASS_MP170,3);
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* untested: but Env/Hagaki uses it */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh3",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH Gloss"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP150,1);
+
+static const canon_mode_t canon_MULTIPASS_MP190_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro/Gold"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Matte/HiRes/inkjetHagaki"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+};
+DECLARE_MODES(canon_MULTIPASS_MP190,1);
+
+static const canon_mode_t canon_MULTIPASS_MP210_modes[] = {
+  /* both cartridges */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Matte/HiRes/inkjetHagaki"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP210,1);
+
+/* MP360, MP370, MP375R, MP390 */
+static const canon_mode_t canon_MULTIPASS_MP360_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK | CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),16,0,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGHEST Pro"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C9M9Y9K2c9m9y9photo8),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH Gloss"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/*CMYcmy*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4y4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* CMYcmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C5M5Y5K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4y4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_MP360,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK | CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP360,2);
 
 static const canon_mode_t canon_MULTIPASS_MX300_modes[] = {
-  /* plain media */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  1200, 1200,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c3m3y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_c9m9y9),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* the following should work fine */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-
-/* color only cartridge plain */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* need to check cmy */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MX300,3);
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Matte/HiRes/inkjetHagaki"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI TSHIRT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono3",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH 2"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},/*cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MX300,1);
 
 static const canon_mode_t canon_MULTIPASS_MX330_modes[] = {
   /* plain media */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* color only cartridge plain */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH 3"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MX330,4);
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossGold"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},/* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono3",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+};
+DECLARE_MODES(canon_MULTIPASS_MX330,1);
 
 static const canon_mode_t canon_MULTIPASS_MX340_modes[] = {
   /* plain media */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* color only cartridge plain */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH 3"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MX340,4);
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* color-only*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossGold"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},/* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono3",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+};
+DECLARE_MODES(canon_MULTIPASS_MX340,1);
 
 static const canon_mode_t canon_MULTIPASS_MX360_modes[] = {
   /* plain media */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO 2"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  /*{  1200, 600,CANON_INK_cmy,"1200x1200dpi_photohigh",N_("1200x1200 DPI PHOTO HIGH"),INKSET(13_c3m3y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},*/
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-/* color only cartridge plain */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH 3"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MX360,4);
-
-/* Gernot: add modes here: high & draft */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+/* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH (COLOR-ONLY)"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI (COLOR-ONLY)"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT (COLOR-ONLY)"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI (COLOR-ONLY)"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT (COLOR-ONLY)"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},/* untested */
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossProPlat"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},  
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* TST */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_MULTIPASS_MX360,1);
+
+static const canon_mode_t canon_MULTIPASS_MX370_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST proPlat"),INKSET(13_C14M14Y14c14m14y14),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* CMYcmy, cmy less 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX370,1);
+
+static const canon_mode_t canon_MULTIPASS_MX420_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST proPlat"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX420,1);
+
+static const canon_mode_t canon_MULTIPASS_MX510_modes[] = {
+  /* plain modes --- try to use based on inkset definitions */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST proPlat"),INKSET(13_C14M14Y14c14m14y14),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* CMYcmy, cmy less 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki --- try to use based on inkset definitions */
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX510,2);
+
+static const canon_mode_t canon_MULTIPASS_MP240_modes[] = {
+  /* plain color modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* Env/Hagaki color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+};
+DECLARE_MODES(canon_MULTIPASS_MP240,1);
+
 static const canon_mode_t canon_MULTIPASS_MP250_modes[] = {
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_MULTIPASS_MP250,12);
-
-/* still need to add 1200dpi mode user-defined */
+  /* plain color modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO (duplex)"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossPro/proPhotoHagaki"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high5",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono5",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+};
+DECLARE_MODES(canon_MULTIPASS_MP250,2);
+
 static const canon_mode_t canon_MULTIPASS_MP280_modes[] = {
-  /* plain hi */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* plain std */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* plain fast */
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /*end in color mode */
-  /* color-only cartridge modes for plain, allHagaki, Hagaki, Env */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MP280,4);
-
-/* still need to add 1200dpi mode user-defined */
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossProPlat"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* TST */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* Env/Hagaki color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+};
+DECLARE_MODES(canon_MULTIPASS_MP280,1);
+
+static const canon_mode_t canon_MULTIPASS_MP470_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested but Env/Hagaki use it */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST Pro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_c9m9y9),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo2",N_("600x600 DPI PHOTO Matte/HiRes/inkjetHagaki"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C5M5Y5),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C4M4Y4K2c4m4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono3",N_("600x600 DPI DRAFT MONO Env/Hagaki"),INKSET(13_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C4M4Y4c4m4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* subtract 0x60 from cmy */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft42",N_("600x600 DPI DRAFT Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP470,1);
+
 static const canon_mode_t canon_MULTIPASS_MP480_modes[] = {
-  /* plain hi */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* plain std */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* plain fast */
-  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add some B/W modes*/
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /*add photo paper modes */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /*end in color mode */
-  /* color-only cartridge modes for plain, Hagaki, Env */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MP480,4);
-
-/* same family: iP3300, iP3500, MX700, MP510, MP520, MP600 */
-/* on photo media, same modes do not use K ink */
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft2",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft2",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossPro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP480,1);
+
+static const canon_mode_t canon_MULTIPASS_MP490_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K,"300x300dpi_draftmono",N_("300x300 DPI DRAFT MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_draft3",N_("300x300 DPI DRAFT COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_photohigh2",N_("1200x1200 DPI PHOTO HIGHEST glossPro/proPhotoHagaki"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* cmy: subtract 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP490,1);
+
+/* same family: iP3300, iP3500, MX700, MP510, MP520 */
 static const canon_mode_t canon_MULTIPASS_MP520_modes[] = {
-  {  600, 600,CANON_INK_K|CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* 16 CMYKcm, mono: 16 K */
-  /* only the standard 600dpi mode was there before */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* 16 CMYK, mono: 16 K */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* 8 CMYK, mono: 8 K */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0}, /* 8 CMYK, mono: 8 K */
-  /* photo modes --- do not work because cannot deal with no k or K */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(22_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},*/ /* 16 CMYcm */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C4M4Y4K2c4m4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/ /* 16 CMYcm */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(22_C3M3Y3K2c3m3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/ /* 16 CMYcm */
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO plusGlossy/glossGold/gloss"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* CMYcm */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_draft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* CMY */
+  /* TST mode CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
 DECLARE_MODES(canon_MULTIPASS_MP520,1);
 
-/* similar to iP4500 */
-/* Hagaki, Envelope use plain mode but adds k to output inks */
+/* photo modes mostly use unsupprted inks */
+static const canon_mode_t canon_MULTIPASS_MP530_modes[] = {
+  /* plain modes --- duplex same */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_K|CANON_INK_CcMmYKk,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYKcmk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcmk --- temporarily using as CD mode also */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4one),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP530,1);
+
 static const canon_mode_t canon_MULTIPASS_MP540_modes[] = {
-  /* high mode -- B/W also */
-  /* TODO: std to output CMYKk as well as CMYK */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoStd mode */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* mode for inkjet Hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH HAGAKI"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO HAGAKI"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MP540,3);
-
-/* TODO: get std to output CMYKk as well as CMYK */
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* 16 */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO inkjet Hagaki"),INKSET(13_C5M5Y4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* 8 not 16 */
+  /* T-Shirt --- same as photo high */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP540,1);
+
+/* similar to MP540 but fewer modes */
+static const canon_mode_t canon_MULTIPASS_MP550_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt --- same as photo high */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP550,1);
+
+/* similar to MP540 but fewer modes */
+static const canon_mode_t canon_MULTIPASS_MP560_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt --- same as photo high */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP560,2);
+
+/* similar to MP830 */
+/* most photo modes use unsupported inks */
+static const canon_mode_t canon_MULTIPASS_MP600_modes[] = {
+  /* plain modes --- duplex same */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},/* k off */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes --- most unsupported --- using photodraft for CD temporarily too */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/* K off */
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* K off */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /* K off */
+  /* TST */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4one),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* K off */
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP600,1);
+
 static const canon_mode_t canon_MULTIPASS_MP640_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoStd mode */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* mode for inkjet Hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH HAGAKI / CD"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO HAGAKI / CD"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MP640,3);
-
-/* user-defined highest quality mode not yet supported */
-/* Note: printer does not accept quality setting of 0 */
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/* untested */
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* inkjet Hagaki / CD */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjetHagaki/CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjetHagaki/CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt --- same as photo high */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP640,2);
+
+/* similar to iP3000, but no duplex and different default standard modes, and all modes use K */
+static const canon_mode_t canon_MULTIPASS_MP700_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes CMYKcm/CMYK */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki CMYKcm/CMYK -- from Japanese model */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGHEST inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI CD HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI CD DRAFT"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYK */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYK */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKcm/CMYK */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGHEST Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP700,1);
+
+/* similar to iP3000 --- unlike MP700/730, the MP710/740 also do not use K for photo modes */
+static const canon_mode_t canon_MULTIPASS_MP710_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* with K */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_high",N_("300x300 DPI HIGH"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,1},/* 1bpp */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(4_C2M2Y2K2),8,0,NULL,1.0,1.0,NULL,NULL,NULL,0},/* 1bpp */
+  /* photo modes CMYcm/CMY */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT HiRes"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki CMYcm/CMY */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGHEST inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI CD HIGH"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI CD DRAFT"),INKSET(9_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYK */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohphigh",N_("600x600 DPI HIGH Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_ohp",N_("600x600 DPI Transparency"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMY */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKcm/CMYK */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGHEST Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* untested */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C4M4Y4K2c4m4plain),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* untested */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP710,1);
+
+static const canon_mode_t canon_MULTIPASS_MP900_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO LOW"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO pro/HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO / DRAFT PHOTO HiRes"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(9_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(9_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Transparency"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt --- same as plain std */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki --- same as plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(9_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki"),INKSET(9_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(9_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono4",N_("600x600 DPI MONO Env/Hagaki"),INKSET(9_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_MULTIPASS_MP900,1);
+
 static const canon_mode_t canon_PIXMA_iP2700_modes[] = {
-  /* user-defined mode: highest resolution, no mono */
-  /*{  1200, 1200,CANON_INK_CMYK,"1200x1200dpi_high",N_("1200x1200 DPI HIGH"),INKSET(13_c3m3y3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},*/
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* Std mode using only color cartridge */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI STANDARD 2"),INKSET(13_C3M3Y2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI STANDARD 2"),INKSET(13_C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* B/W modes */
-  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI DRAFT MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_iP2700,13);
-
-/* Gernot: added modes for iP4500.
-   I noticed that the monochrome modes use all inks but only K is sent in the printjob,
-   so the bw=1 flag does somehow do something even if the inkset contains all colors.
-   TODO: figure out how to set color setting for modes in order to use inkset for mono.
-*/
-static const canon_mode_t canon_PIXMA_iP4500_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi2 mode for CDs, some photo papers, Tshirt */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_iP4500,3);
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* mono modes */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI HIGH MONO"),INKSET(13_K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high3",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std3",N_("600x600 DPI COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std3",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  1200, 1200,CANON_INK_CMY,"1200x1200dpi_high",N_("1200x1200 DPI HIGHEST glossPro"),INKSET(13_c3m3y3),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},/* cmy: subtract 0x60*/
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono2",N_("600x600 DPI HIGH MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono2",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP2700,1);
+
+static const canon_mode_t canon_MULTIPASS_MX710_modes[] = {
+  /* plain modes --- duplex uses CMYKk for high and standard, fast remains the same */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI (duplex)"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  /*highest proPlat mode unsupported */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX710,2);
 
 /* MX860 --- similar to iP4500 */
 static const canon_mode_t canon_MULTIPASS_MX860_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi2 mode for CDs, some photo papers, Tshirt */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C4M4Y4K2c4m4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_MULTIPASS_MX860,3);
-
-/* MX870 --- similar to iP4500 */
-static const canon_mode_t canon_MULTIPASS_MX870_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi3 for inkjet Hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MX870,3);
+  /* plain modes --- duplex same CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX860,2);
+
+/* added duplex to MP540 */
+static const canon_mode_t canon_MULTIPASS_MX880_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3}, /* 16 */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO inkjet Hagaki"),INKSET(13_C5M5Y4y4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/* 8 not 16 */
+  /* T-Shirt --- same as photo high */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX880,1);
 
 static const canon_mode_t canon_MULTIPASS_MX7600_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K3k4_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-};
-DECLARE_MODES(canon_MULTIPASS_MX7600,3);
-
-/* Gernot: added modes for iP4700.
-           this appears to be same in iP4800 family.
-           y is swapped for k on all modes that use them.
-*/
+  /* plain modes CMYK --- duplex same */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K3k4_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, CANON_INK_K|600,CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, CANON_INK_K|600,CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MX7600,1);
+
+static const canon_mode_t canon_MULTIPASS_E500_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (COLOR-ONLY"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST proPlat"),INKSET(13_C14M14Y14c14m14y14),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4}, /* CMYcmy, cmy less 0x60 */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMY|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_E500,2);
+
+static const canon_mode_t canon_PIXMA_iP4500_modes[] = {
+  /* plain modes -- duplex same (except no mono) */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT Plus/PlusGlossyII"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(13_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk --- note this mode uses 2 bits not 4 */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP4500,1);
+
+static const canon_mode_t canon_PIXMA_iP4600_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1}, /*untested*/
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI HIGH PHOTO/CD"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes/CD"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT/CD"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/*untested*/
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* Hagaki and Env modes used K and k both */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},/*untested*/
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI HIGH T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_iP4600,1);
+
 static const canon_mode_t canon_PIXMA_iP4700_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoStd mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi3 mode for CDs, inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_iP4700,13);
+  /* plain modes --- duplex no mono CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /*T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_iP4700,2);
+
+static const canon_mode_t canon_PIXMA_iP4900_modes[] = {
+  /* plain */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* duplex, Env, Hagaki  modes use K and k both */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH duplex/Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI duplex/Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* draft */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_iP4900,1);
 
 static const canon_mode_t canon_PIXMA_iP5300_modes[] = {
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* plain paper modes -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* Photo modes */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* T-shirt: uses same Photo mode by CMYk output---can this work? */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_PIXMA_iP5300,4);
+  /* plain modes --- duplex same */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(13_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP5300,1);
+
+/* similar to iP5300 but PPplusGlossy different standard mode, PPGgold added */
+static const canon_mode_t canon_MULTIPASS_MP610_modes[] = {
+  /* plain modes --- duplex same */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy/GlossGold"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(13_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4K2c4m4y4on2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP610,1);
 
 static const canon_mode_t canon_MULTIPASS_MP800_modes[] = {
-  /* plain modes --- for inkjet std outputs CMYk, for env CMYKk, no idea yet how to get this, or what masks */
-  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* Fast Photo paper mode */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(22_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* T-shirt --- Gernot: actually this should use CMYk but I don't know how to get this yet */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MP800,0);
-
-/* like iP5300 plus CD */
-/* try to find way to output CMYK, CMYKk, and CMYk from plain modes */
-static const canon_mode_t canon_MULTIPASS_MP810_modes[] = {
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* plain paper modes -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* Photo modes */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* T-shirt: uses same Photo mode by CMYk output---can this work? */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MP810,4);
+  /* most photo modes use some unknown inks */
+  /* plain modes */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Fast Photo paper mode CMYcmk --- also using temporarily for CD printing */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki: PhotoFastCMYcmk, Std CMYk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP800,1);
 
+static const canon_mode_t canon_MULTIPASS_MP810_modes[] = {
+  /* plain paper modes */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  /* Photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2 / CD"),INKSET(13_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2 / CD"),INKSET(13_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2 / CD"),INKSET(13_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(13_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+
+};
+DECLARE_MODES(canon_MULTIPASS_MP810,1);
+
+/* similar to MP600 */
+/* most photo modes use unsupported inks */
 static const canon_mode_t canon_MULTIPASS_MP830_modes[] = {
-  /* not a real mode of the printer */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(4_C2M2Y2K2),0,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* real modes */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* Fast Photo paper mode */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(22_C3M3Y3K2c3m3k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* T-shirt --- Gernot: actually this should use CMYk but I don't know how to get this yet */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_MULTIPASS_MP830,0);
+  /* plain modes --- duplex same */
+  /* NOTE: temporarily allowing plain modes for CD printing */
+  {  600, 600,CANON_INK_CcMmYKk|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4k4on),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes --- photodraft for CD temporarily too */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2k3photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*CMYk*/
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2k4one),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP830,1);
 
 static const canon_mode_t canon_MULTIPASS_MP950_modes[] = {
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3K2k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-};
-DECLARE_MODES(canon_MULTIPASS_MP950,3);
-
+  /* plain modes CMYK --- same for duplex */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2c6m6k4off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI STD"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* inkjet Hagaki --- same as photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art CMYcmk */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh4",N_("600x600 DPI FineArt"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo5",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft5",N_("600x600 DPI DRAFT CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt transfers CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Transparency"),INKSET(19_C4M4Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Transparency"),INKSET(19_C4M4Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP950,1);
+
+/* high resolution mono modes use unknown inks */
 static const canon_mode_t canon_MULTIPASS_MP960_modes[] = {
-  /* 300 dpi plain modes (also mono) */
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* 600dpi plain modes (also mono) */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(19_C3M3Y3K2k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* hagaki fast uses this with output CMYKk (quality 2) */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI STD / HAGAKI DRAFT"),INKSET(19_C3M3Y3K2k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* PPpro,  inkjet Hagaki High CMYcmk --- no 0x60 additions to c,m */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / INKJET HAGAKI HIGH"),INKSET(19_C7M7Y4K2c7m7k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcmk */
-  /* hagaki high CMYKk (quality 4) OK! */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh4",N_("600x600 DPI HAGAKI HIGH"),INKSET(19_C6M6Y4K2c6m6k4hagaki),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  /* hagaki std CMYKk (quality 3) OK! */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo4",N_("600x600 DPI HAGAKI STD"),INKSET(19_C6M6Y4K2c6m6k4hagaki),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* Inkjet Hagaki Std CMYcmk --- no 0x60 additions to c,m */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO / INKJET HAGAKI STD"),INKSET(19_C6M6Y4K2c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* CMYcmk */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(19_C6M6Y4K2c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PPmatte */
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},*/
-  /* CD */
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* T-shirt transfers CMYk --- works great! OK */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI T-SHIRT TRANSFERS"),INKSET(19_C4M4Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* plain modes CMYK */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(19_C6M6Y4K2c6m6k4off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI STD"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  /* inkjet Hagaki --- same as photo modes */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art CMYcmk */
+  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh5",N_("600x600 DPI FineArt"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(19_C6M6Y4K2c6m6k4hagaki),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt transfers CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency CMYKk --- untested (taken from MP950) */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_high4",N_("600x600 DPI HIGH Transparency"),INKSET(19_C4M4Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(19_C4M4Y4K2k4on),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* photo modes high & std (600dpi) CMYcmk */
   /* photo mode 2 (600dpi) CMYcmk --- works, but c,m may need a bit of tone/density adjusting */
   /* photo mode 3 CD (600dpi) CMYcmk --- c,m too light, may need adjusting tone/density */
   /* inkjet hagaki outputs in CMYcmk std, hi --- c,m too light, may need adjusting tone/density */
-  /* hagaki outputs in CMYKk draft, std, high (OK) */
-  /* T-shirt transfer mode (600dpi) CMYk  (OK) */
 };
-DECLARE_MODES(canon_MULTIPASS_MP960,3);
+DECLARE_MODES(canon_MULTIPASS_MP960,2);
 
 static const canon_mode_t canon_MULTIPASS_MP970_modes[] = {
-  /*  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(7_C4M4Y4c4m4k4K4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},*/
-  /* 300 dpi plain modes (also mono) */
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* 600dpi plain modes (also mono) */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(19_C3M3Y3K2k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* hagaki fast uses this with output CMYKk (quality 2) */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI STD / HAGAKI DRAFT"),INKSET(19_C3M3Y3K2k3),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* PPpro,  inkjet Hagaki High CMYcmk --- no 0x60 additions to c,m */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / INKJET HAGAKI HIGH"),INKSET(19_C7M7Y4K2c7m7k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/* CMYcmk */
-  /* hagaki high CMYKk (quality 4) OK! */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh4",N_("600x600 DPI HAGAKI HIGH"),INKSET(19_C6M6Y4K2c6m6k4hagaki),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  /* hagaki std CMYKk (quality 3) OK! */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo4",N_("600x600 DPI HAGAKI STD"),INKSET(19_C6M6Y4K2c6m6k4hagaki),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* Inkjet Hagaki Std CMYcmk --- no 0x60 additions to c,m */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo",N_("600x600 DPI PHOTO / INKJET HAGAKI STD"),INKSET(19_C6M6Y4K2c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* CMYcmk */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(19_C6M6Y4K2c6m6k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PPmatte */
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(19_C4M4Y4K2c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},*/
-  /* CD */
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},*/
-  /* CMYcmk --- no cyan */
-  /*  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(19_C4M4Y4c4m4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  /* T-shirt transfers CMYk --- works great! OK */
-  {  600, 600,CANON_INK_CcMmYyK,"600x600dpi_high2",N_("600x600 DPI T-SHIRT TRANSFERS"),INKSET(19_C4M4Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /* photo modes high & std (600dpi) CMYcmk */
-  /* photo mode 2 (600dpi) CMYcmk --- works, but c,m may need a bit of tone/density adjusting */
-  /* photo mode 3 CD (600dpi) CMYcmk --- c,m too light, may need adjusting tone/density */
-  /* inkjet hagaki outputs in CMYcmk std, hi --- c,m too light, may need adjusting tone/density */
-  /* hagaki outputs in CMYKk draft, std, high (OK) */
-  /* T-shirt transfer mode (600dpi) CMYk  (OK) */
-};
-DECLARE_MODES(canon_MULTIPASS_MP970,0);
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(19_C6M6Y4K2c6m6k4off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/* untested */
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / FineArt"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},  
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYcmk */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPI DRAFT CD"),INKSET(19_C4M4Y4c4m4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt transfers CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},  
+  /* Env/Hagaki CMYKk --- same for duplex */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(19_C6M6Y4K2c6m6k4hagaki),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(19_C6M6Y4K2c6m6k4hagaki),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_MULTIPASS_MP970,2);
 
 /* most photo modes use H (grey) so unsupported presently */
-/* TODO: stad mode ouput CMYKk for Hagaki and Envelope */
 static const canon_mode_t canon_MULTIPASS_MP980_modes[] = {
   /* normal modes */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(16_C6M6Y4K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH (DS)"),INKSET(16_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(16_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(16_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(16_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* Photo modes: matte, high resolution, CD */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3 / CD"),INKSET(16_C8M8Y4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3 / CD"),INKSET(16_C8M8Y4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(16_C6M6Y4K2k4off),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(16_C3M3Y2K2k3off_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(16_C3M3Y2K2k3off_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(16_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(16_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Photo modes: matte, high resolution */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(16_C8M8Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(16_C8M8Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD -- same as above */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH CD"),INKSET(16_C8M8Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(16_C8M8Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* Photo modes: inkjet Hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH 2"),INKSET(16_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO 2"),INKSET(16_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(16_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(16_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt --- same as Photo High */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(16_C8M8Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
   /* Photo modes: other */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(16_C6M6Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(16_C6M6Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(16_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(16_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_MULTIPASS_MP980,0);
+DECLARE_MODES(canon_MULTIPASS_MP980,2);
 
 static const canon_mode_t canon_MULTIPASS_MP990_modes[] = {
-  /* normal modes */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  /*  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},*/
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /*  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},*/
-  /* PhotoHi3 mode for CDs, inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_MULTIPASS_MP990,0);
+  /* plain modes */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH (duplex)"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk --- most use grey (H) or unsupported inks */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/other"),INKSET(30_M6K6m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_MULTIPASS_MP990,1);
+
+static const canon_mode_t canon_PIXMA_iX4000_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Photo: CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki --- same as plain */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* TST mode */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH Transparency"),INKSET(22_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Transparency"),INKSET(22_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iX4000,1);
 
 static const canon_mode_t canon_PIXMA_iX5000_modes[] = {
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(22_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Photo: CMYcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(22_C4M4Y4K2c4m4photo),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI inkjet Hagaki"),INKSET(22_C3M3Y3K2c3m3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photodraft2",N_("600x600 DPI DRAFT inkjet Hagaki"),INKSET(22_C3M3Y2K2photo_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki --- same as plain */
+  {  600, 600,CANON_INK_CcMmYK|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(22_C4M4Y4K2c4m4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(22_C3M3Y2K2_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* TST mode */
-  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(22_C4M4Y4K2),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
 };
-DECLARE_MODES(canon_PIXMA_iX5000,0);
+DECLARE_MODES(canon_PIXMA_iX5000,1);
 
 static const canon_mode_t canon_PIXMA_iX7000_modes[] = {
  /* plain */
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K3k4_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2k2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* photo - no mono: all output CMYKk */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C6M6Y2K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y2K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C6M6Y2K2k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-};
-DECLARE_MODES(canon_PIXMA_iX7000,0);
-
-/* format: 0x90 */
-/* ink   : 0x4  */
-/* Not sure why MODE_FLAG_PRO is needed for Fast mode, or if it even works. Driver Fast mode uses iP8500 flag instead */
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K3k4_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2k2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0}, /* untested */
+  /* photo CMYKk */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photodraft2",N_("600x600 DPI Env/Hagaki"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art */
+  {  600, 600,CANON_INK_CMYKk,"600x600dpi_photo3",N_("600x600 DPI HIGH FineArt"),INKSET(13_C6M6Y2K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_iX7000,1);
+
+/* mono uses bw=2 */
 static const canon_mode_t canon_PIXMA_Pro9000_modes[] = {
-/* original mode entered here */
-/*  { 600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
 /* Plain Modes */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH (Hagaki)"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-/* Plain Modes Mono */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH 2"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain mono */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT 2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 /* Photo Modes */
 /* highest uses R,G so cannot support */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(11_C6M6Y6K6c16m16_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed2",N_("600x600 DPI PHOTO MEDIUM 2"),INKSET(11_C6M6Y6K6c16m16_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO STD / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(11_C5M5Y5K5c5m5_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
-/* Photo Modes Mono */  
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonohigh",N_("600x600 DPI PHOTO MONO HIGH / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonomed",N_("600x600 DPI PHOTO MONO MEDIUM"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomono",N_("600x600 DPI PHOTO MONO STD / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonodraft",N_("600x600 DPI PHOTO MONO DRAFT"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_Pro9000,0);
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH GlossPro/proPlat/pro"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT gloss"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed2",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI inkjet Hagaki"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* photo mono */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonohigh",N_("600x600 DPI PHOTO MONO HIGH / CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonomed",N_("600x600 DPI PHOTO MONO MEDIUM"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomono",N_("600x600 DPI PHOTO MONO / CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonodraft",N_("600x600 DPI PHOTO MONO DRAFT"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki 2"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI MONO HIGH Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* board, canvas, FineArt, Museum Etching */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI Board/Canvas/FineArt/Museum"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+};
+DECLARE_MODES(canon_PIXMA_Pro9000,1);
 
 /* all use normal BJ format and ink codes */
+/* mono uses bw=2 */
 static const canon_mode_t canon_PIXMA_Pro9000mk2_modes[] = {
-  /* plain */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI PLAIN / T-SHIRT"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* plain mono */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain mono modes */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT 2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
   /* photo modes --- highest use RGH so cannot support yet */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(11_C6M6Y6K6c16m16_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM"),INKSET(11_C6M6Y6K6c16m16_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO / CD"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(11_C6M6Y6K6c6m6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH gloss"),INKSET(11_C6M6Y6K6c16m16_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomed",N_("600x600 DPI PHOTO MEDIUM pro/proPlat/"),INKSET(11_C6M6Y6K6c16m16_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO gloss"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(11_C6M6Y6K6c16m16_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
   /* photo mono */
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonohigh",N_("600x600 DPI PHOTO MONO HIGH / CD"),INKSET(11_C16M16Y16K16c16m16),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonomed",N_("600x600 DPI PHOTO MONO MEDIUM"),INKSET(11_C16M16Y16K16c16m16),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomono",N_("600x600 DPI PHOTO MONO / CD"),INKSET(11_C16M16Y16K16c16m16),MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonodraft",N_("600x600 DPI PHOTO MONO DRAFT"),INKSET(11_C16M16Y16K16c16m16),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_Pro9000mk2,0);
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonohigh",N_("600x600 DPI PHOTO MONO HIGH / CD"),INKSET(11_C16M16Y16K16c16m16),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonomed",N_("600x600 DPI PHOTO MONO MEDIUM"),INKSET(11_C16M16Y16K16c16m16),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomono",N_("600x600 DPI PHOTO MONO / CD"),INKSET(11_C16M16Y16K16c16m16),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photomonodraft",N_("600x600 DPI PHOTO MONO DRAFT"),INKSET(11_C16M16Y16K16c16m16),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high2",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI MONO HIGH Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* board, canvas, FineArt, Museum Etching */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh5",N_("600x600 DPI Board/Canvas/FineArt/Museum"),INKSET(11_C6M6Y6K6c6m6_c),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+};
+DECLARE_MODES(canon_PIXMA_Pro9000mk2,1);
 
 /* all modes use normal BJ ink and format codes */
 /* However, most modes use RGH inks as well as CMYKcmyk, and so cannot be currently supported */
 /* the Pro9500 has fewer quality settings in the driver than the Pro9500 Mk.II but I put the "missing" ones in anyway */
 static const canon_mode_t canon_PIXMA_Pro9500_modes[] = {
   /* plain mode: fast, 1 only but maybe accept 2 and 0 quality settings too */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 /* plain mono: these modes use CMYK inks also */
 /* used for plain, hagaki */
 /*             bw=2                           */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono2",N_("600x600 DPI MONO PLAIN/HAGAKI HIGH"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HAGAKI STD"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO PLAIN STD"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono2",N_("600x600 DPI MONO PLAIN/Hagaki HIGH"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO Hagaki STD"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO PLAIN STD"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
 /* Photo modes: only mono using CMYK-only can be supported currently */
-/* this has k instead of K */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_monophoto",N_("600x600 DPI MONO PHOTO"),INKSET(11_C16M16Y16k16),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+/* this has k instead of K --- also CD */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photomono",N_("600x600 DPI MONO PHOTO / CD"),INKSET(11_C16M16Y16k16),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
 };
-DECLARE_MODES(canon_PIXMA_Pro9500,0);
+DECLARE_MODES(canon_PIXMA_Pro9500,1);
 
 /* all modes use normal BJ ink and format codes */
 /* However, most modes use RGH inks as well as CMYKcmyk, and so cannot be currently supported */
 static const canon_mode_t canon_PIXMA_Pro9500mk2_modes[] = {
 /* plain: 3 variations on the Fast mode: 600/1 and 600/0 are supported, but perhaps 600/2 is also possible */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 /* plain mono: these modes use CMYK inks also */
 /* used for plain, hagaki */
 /*             bw=2                           */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono2",N_("600x600 DPI MONO PLAIN/HAGAKI HIGH"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO HAGAKI STD"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO PLAIN STD"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono2",N_("600x600 DPI MONO PLAIN/Hagaki HIGH"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_highmono",N_("600x600 DPI MONO Hagaki STD"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_mono",N_("600x600 DPI MONO PLAIN STD"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draftmono2",N_("600x600 DPI MONO DRAFT2"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
 /* Photo modes: only mono using CMYK-only can be supported currently */
-/* this has k instead of K */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_monophoto",N_("600x600 DPI MONO PHOTO"),INKSET(11_C16M16Y16k16),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+/* this has k instead of K --- also CD */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photomono",N_("600x600 DPI MONO PHOTO / CD"),INKSET(11_C16M16Y16k16),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+};
+DECLARE_MODES(canon_PIXMA_Pro9500mk2,1);
+
+/* iP7100 */
+/* ESC (r command is 0x64 but another one befor data is sent: ESC (r 0x62 0x0 */
+static const canon_mode_t canon_PIXMA_iP7100_modes[] = {
+  /* plain modes: color */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI plain/T-Shirt"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Hagaki/Env */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* plain modes: mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO / CD High"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO plusDS/gloss"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI CD Draft"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Fine Art*/
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO FineArt"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
 };
-DECLARE_MODES(canon_PIXMA_Pro9500mk2,0);
+DECLARE_MODES(canon_PIXMA_iP7100,2);
+
+static const canon_mode_t canon_PIXMA_iP7500_modes[] = {
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(19_C6M6Y4K2c6m6k4off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK|CANON_INK_K,"600x600dpi",N_("600x600 DPI"),INKSET(19_C3M3Y3K2k3off),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi",N_("300x300 DPI"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_CMYK|CANON_INK_K,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(19_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(19_C6M6Y4K2c6m6k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(19_C4M4Y4K2c4m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI FineArt"),INKSET(19_C7M7Y4K2c7m7k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Hagaki, Envelope */
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_high2",N_("600x600 DPI HIGH Hagaki/Env"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_std2",N_("600x600 DPI Hagaki/Env"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYKk|CANON_INK_K,"600x600dpi_draft2",N_("600x600 DPI DRAFT Hagaki/Env"),INKSET(19_C3M3Y3K2k3),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD media */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft4",N_("600x600 DPIDRAFT CD"),INKSET(19_C4M4Y4c4m4k4CD),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(19_C4M4Y4K2k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP7500,1);
+
+/* iP8100 */
+/* ESC (r command is 0x64 but another one befor data is sent: ESC (r 0x62 0x0 */
+static const canon_mode_t canon_PIXMA_iP8100_modes[] = {
+  /* plain modes: color */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI plain/T-Shirt"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Hagaki/Env */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* plain modes: mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  /* one mode for PPpro ud1, hi cannot be supported yet as it uses Red ink (R) in addtion to CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO / CD High"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO plusDS/gloss"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI CD Draft"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Fine Art*/
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO FineArt"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP8100,2);
 
 /* iP8500 */
-/* ESC R command is 0x64 but another one befor data is sent: ESC R) 0x62 0x0 */
-/* Photo modes and CD mode have unsupported format 0x90, unsupported ink settings 0x4 --- need to debug this */
+/* ESC (r command is 0x64 but another one befor data is sent: ESC (r 0x62 0x0 */
 static const canon_mode_t canon_PIXMA_iP8500_modes[] = {
-  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_std",N_("600x600 DPI"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_std2",N_("600x600 DPI 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,2}, /* original single mode, but printer does not even use this via the driver! */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT 2"),INKSET(11_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* plain modes */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* plain modes: mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  /* some modes cannot be supported yet as they use Red (R) and Green (G) ink in addition to CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO HiRes/other"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT plus"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT plusDS/glossy"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* CD CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft3",N_("600x600 DPI DRAFT CD"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Transparency CMYK */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* T-Shirt CMYK */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_iP8500,2);
+
+/* iP8600 */
+/* ESC (r command is 0x64 but another one befor data is sent: ESC (r 0x62 0x0 */
+static const canon_mode_t canon_PIXMA_iP8600_modes[] = {
+  /* plain modes: color */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI plain/T-Shirt"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Env/Hagaki */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* plain modes: mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  /* one mode for PPpro ud1, hi, and PPplusGlossy hi cannot be supported yet as it uses Red (R) and Green (G) ink in addition to CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH plusDS/gloss"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO pro/plusGlossy/matte/HiRes CD High"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO plusDS/gloss"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI CD Draft"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki separate out */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjetHagaki"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjetHagaki"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI PHOTO FineArt"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  /* Transparency */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+};
+DECLARE_MODES(canon_PIXMA_iP8600,2);
+
+/* iP9910 */
+/* ESC (r command before data is sent: ESC (r 0x62 0x0 */
+static const canon_mode_t canon_PIXMA_iP9910_modes[] = {
+  /* plain modes: color */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI plain/T-Shirt"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI LOW"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft2",N_("600x600 DPI DRAFT"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* Hagaki/Env */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(11_C6M6Y6K9c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT Env/Hagaki"),INKSET(11_C2M2Y2K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* plain modes: mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_K,"600x600dpi_draftmono",N_("600x600 DPI MONO DRAFT"),INKSET(11_K2),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
+  /* photo modes */
+  /* one mode for PPpro hi, and PPplusGlossy hi cannot be supported yet as it uses Red (R) and Green (G) ink in addtion to CMYKcm */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH plusDS/gloss"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo",N_("600x600 DPI PHOTO pro"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO pro/plusGlossy/matte/HiRes/other CD High"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO gloss CD Draft"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT plusGlossy"),INKSET(11_C5M5Y5K5c5m5_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* inkjet Hagaki separate out */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjetHagaki"),INKSET(11_C6M6Y6K6c16m16_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photo3",N_("600x600 DPI inkjetHagaki"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Fine Art */
+  {  600, 600,CANON_INK_CcMmYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH FineArt"),INKSET(11_C6M6Y6K6c6m6_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_PRO,NULL,1.0,1.0,NULL,NULL,NULL,4},
   /* Transparency */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI OHP"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft3",N_("600x600 DPI DRAFT OHP"),INKSET(11_C6M6Y6K6_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_std4",N_("600x600 DPI Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_draft4",N_("600x600 DPI DRAFT Transparency"),INKSET(11_C6M6Y6K6_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
 };
-DECLARE_MODES(canon_PIXMA_iP8500,3);
+DECLARE_MODES(canon_PIXMA_iP9910,2);
+
+static const canon_mode_t canon_PIXMA_MG2100_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI STANDARD COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2K2off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST proPlat"),INKSET(13_C14M14Y14c14m14y14),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI MONO HIGH Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI STANDARD Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_MG2100,1);
+
+static const canon_mode_t canon_PIXMA_MG3100_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high5",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* mono */
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono",N_("600x600 DPI MONO HIGH"),INKSET(13_C4M4Y3K4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono",N_("600x600 DPI MONO"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K,"300x300dpi_mono",N_("300x300 DPI MONO"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* color-only modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high2",N_("600x600 DPI HIGH COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std2",N_("600x600 DPI STANDARD COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_CMY,"300x300dpi_std2",N_("300x300 DPI COLOR-ONLY"),INKSET(13_C2M2Y2K2off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* Photo modes */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGHEST proPlat"),INKSET(13_C14M14Y14c14m14y14),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,4},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C4M4Y4),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  /* Env/Hagaki modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K,"600x600dpi_highmono3",N_("600x600 DPI MONO HIGH Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K,"600x600dpi_mono3",N_("600x600 DPI MONO Env/Hagaki"),INKSET(13_C3M3Y2K3),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_BLACK,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* color-only */
+  {  600, 600,CANON_INK_CMY,"600x600dpi_high4",N_("600x600 DPI HIGH Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMY,"600x600dpi_std4",N_("600x600 DPI STANDARD Env/Hagaki COLOR-ONLY"),INKSET(13_C3M3Y2K3off),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_COLOR,NULL,1.0,1.0,NULL,NULL,NULL,2},
+};
+DECLARE_MODES(canon_PIXMA_MG3100,1);
 
-/* Gernot: added modes for MG5100.
-   I noticed that the monochrome modes use all inks but only K is sent in the printjob,
-   so the bw=1 flag does somehow do something even if the inkset contains all colors.
-   TODO: figure out how to set color setting for modes in order to use inkset for mono.
-*/
 static const canon_mode_t canon_PIXMA_MG5100_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoStd mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi3 mode for inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_MG5100,13);
+  /* plain modes --- duplex no mono */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},/*mono untested*/
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4k4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4k4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4k4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4k4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Hagaki/Env: use K and k both CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4k4),8,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG5100,2);
 
 static const canon_mode_t canon_PIXMA_MG5200_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft",N_("600x600 DPI PHOTO DRAFT"),INKSET(13_C8M8Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoStd mode for high quality photo papers */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh2",N_("600x600 DPI PHOTO HIGH 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft2",N_("600x600 DPI PHOTO DRAFT 2"),INKSET(13_C6M6Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* PhotoHi3 mode for CDs, inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(13_C5M5Y4y4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_MG5200,13);
-
-/* for this printer the photo modes (except for CDs) have unknown inks, so these modes are not added. Now we get plain paper, non-photo hagaki, and CDs. */
+  /* plain modes --- duplex no mono CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},/*untested*/
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},/*untested*/
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG5200,2);
+
+static const canon_mode_t canon_PIXMA_MG5300_modes[] = {
+  /* plain modes -- B/W also */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(13_C6M6Y4K2y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2y3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Duplex/Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH duplex/Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI duplex/Env/Hagaki"),INKSET(13_C3M3Y2K2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* draft */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(13_C2M2Y2K2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO"),INKSET(13_C6M6Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(13_C5M5Y4y4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(13_C8M8Y4y4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG5300,1);
+
+/* for this printer most photo modes have grey (H) ink. */
 static const canon_mode_t canon_PIXMA_MG6100_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi3 mode for CDs, inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_MG6100,7);
-
-/* for this printer the photo modes have unknown inks, so these modes are not added. Now we get plain paper and non-photo hagaki. */
+  /* plain modes --- duplex no mono CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_high2",N_("600x600 DPI HIGH (duplex)"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO other"),INKSET(30_M6K6m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet Hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high3",N_("600x600 DPI HIGH Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std3",N_("600x600 DPI Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG6100,2);
+
+/* for this printer most photo modes have grey (H) ink. */
+static const canon_mode_t canon_PIXMA_MG6200_modes[] = {
+  /* plain modes --- duplex no mono CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Duplex/Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* draft */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO other"),INKSET(30_M6K6m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG6200,1);
+
+/* for this printer most photo modes have grey (H) ink. */
 static const canon_mode_t canon_PIXMA_MG8100_modes[] = {
-  /* high mode -- B/W also */
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  /* standard mode -- B/W also */
-  /*{  600, 600,CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(13_C3M3Y2K2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},*/
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_draft",N_("600x600 DPI DRAFT"),INKSET(30_K2C3M3Y2k3_c),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  /* draft modes -- B/W also */
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
-  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi_draft",N_("300x300 DPI DRAFT"),INKSET(30_K2C2M2Y2),MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,0},
-  /* PhotoHi3 mode for CDs, inkjet hagaki */
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI PHOTO HIGH 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI PHOTO 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
-  {  600, 600,CANON_INK_CMYK,"600x600dpi_photodraft3",N_("600x600 DPI PHOTO DRAFT 3"),INKSET(30_C5M5Y4k4),MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,1},
-};
-DECLARE_MODES(canon_PIXMA_MG8100,4);
+  /* plain modes --- duplex no mono CMYK */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* Duplex/Env/Hagaki CMYKk */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* draft */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO other"),INKSET(30_M6K6m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG8100,1);
+
+/* for this printer most photo modes have grey (H) ink. */
+static const canon_mode_t canon_PIXMA_MG8200_modes[] = {
+  /* plain modes */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi_high",N_("600x600 DPI HIGH"),INKSET(30_K2C6M6Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYK,"600x600dpi",N_("600x600 DPI"),INKSET(30_K2C3M3Y2k3_c),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_NODUPLEX,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* duplex, Hagaki, Env modes use K and k */
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_high2",N_("600x600 DPI HIGH duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_K|CANON_INK_CMYKk,"600x600dpi_std2",N_("600x600 DPI duplex/Env/Hagaki"),INKSET(30_K2C3M3Y2k3on_c),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* draft */
+  {  300, 300,CANON_INK_K|CANON_INK_CMYK,"300x300dpi",N_("300x300 DPI"),INKSET(30_K2C2M2Y2),8,MODE_FLAG_EXTENDED_T|MODE_FLAG_IP8500,NULL,1.0,1.0,NULL,NULL,NULL,1},
+  /* photo modes CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh",N_("600x600 DPI PHOTO HIGH matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo",N_("600x600 DPI PHOTO matte/HiRes"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo2",N_("600x600 DPI PHOTO other"),INKSET(30_M6K6m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* CD CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh3",N_("600x600 DPI HIGH CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo3",N_("600x600 DPI CD"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T|MODE_FLAG_CD,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* inkjet hagaki CMYk */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photohigh4",N_("600x600 DPI HIGH inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_photo4",N_("600x600 DPI inkjet Hagaki"),INKSET(30_C5M5Y4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,2},
+  /* T-Shirt */
+  {  600, 600,CANON_INK_CMYK,"600x600dpi_tshirt",N_("600x600 DPI T-SHIRT"),INKSET(30_M8K8m4k4),16,MODE_FLAG_EXTENDED_T,NULL,1.0,1.0,NULL,NULL,NULL,3},
+};
+DECLARE_MODES(canon_PIXMA_MG8200,1);
 
 
 #endif
diff --git a/src/main/canon-printers.h b/src/main/canon-printers.h
index 4e8f6be..08b86f1 100644
--- a/src/main/canon-printers.h
+++ b/src/main/canon-printers.h
@@ -24,9 +24,15 @@
 /* This file contains the capabilities of the various canon printers
 */
 
+/* TODO-LIST
+ *
+ *   * adjust the paper sizes based on available Canon PPDs and
+ *     Windows driver information
+ *
+ */
 #ifndef GUTENPRINT_INTERNAL_CANON_PRINTERS_H
 #define GUTENPRINT_INTERNAL_CANON_PRINTERS_H
-
+#define INCH(x) (72 * x)
 
 typedef struct canon_caps {
   const char* name;   /* model name */
@@ -37,13 +43,17 @@ typedef struct canon_caps {
   int border_right;   /* right margin, points */
   int border_top;     /* absolute top margin, points */
   int border_bottom;  /* absolute bottom margin, points */
-  int raster_lines_per_block; /* number of raster lines in every F) command */
+  /*  int raster_lines_per_block; */
+  /* number of raster lines in every F) command */
   const canon_slotlist_t* slotlist; /*available paperslots */
   unsigned long features;  /* special bjl settings */
   unsigned char ESC_r_arg; /* argument used for the ESC (r command during init */
+  int ESC_l_len; /* length of ESC (l command, in bytes */
+  int ESC_P_len; /* length of ESC (P command, in bytes */
   const char** control_cmdlist;
   const canon_modelist_t* modelist;
   const canon_paperlist_t* paperlist;
+  const canon_modeuselist_t* modeuselist;
   const char *lum_adjustment;
   const char *hue_adjustment;
   const char *sat_adjustment;
@@ -140,6 +150,51 @@ static const char iP4200_hue_adjustment[] =
 "</curve>\n"
 "</gutenprint>\n";
 
+static const char MP450_sat_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* B */
+/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
+/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.05 1.10 1.20 1.26 1.34 1.41 "  /* Y */
+/* Y */  "1.38 1.32 1.24 1.15 1.08 1.00 1.00 1.00 "  /* G */
+/* G */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char MP450_lum_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "0.52 0.56 0.61 0.67 0.79 0.86 0.91 0.98 "  /* B */
+/* B */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* M */
+/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.04 "  /* R */
+/* R */  "1.04 1.04 1.04 1.04 1.03 1.03 1.03 1.02 "  /* Y */
+/* Y */  "1.02 0.97 0.92 0.88 0.83 0.78 0.74 0.71 "  /* G */
+/* G */  "0.70 0.62 0.59 0.53 0.48 0.52 0.53 0.51 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char MP450_hue_adjustment[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */  "-.30 -.33 -.35 -.37 -.40 -.30 -.20 0.00 "  /* B */
+/* B */  "0.00 -.04 -.01 0.08 0.14 0.16 0.09 0.00 "  /* M */
+/* M */  "0.00 0.00 -.05 -.07 -.10 -.08 -.06 0.00 "  /* R */
+/* R */  "0.00 0.04 0.08 0.10 0.13 0.10 0.07 0.00 "  /* Y */
+/* Y */  "0.00 -.11 -.18 -.23 -.30 -.37 -.46 -.54 "  /* G */
+/* G */  "0.00 0.00 -.02 -.05 -.07 -.11 -.17 -.25 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
 static const char* control_cmd_ackshort[] = {
   "AckTime=Short",
   NULL
@@ -153,6 +208,19 @@ static const char* control_cmd_PIXMA_iP4000[] = {
   NULL
 };
 
+static const char* control_cmd_BJC_i550[] = {
+/*"SetTime=20060722092503", */         /*what is this for?*/
+  "SetSilent=OFF",
+  "SelectParallel=ECP",
+  NULL
+};
+
+static const char* control_cmd_BJC_i6100[] = {
+/*"SetTime=20060722092503", */         /*what is this for?*/
+  "SelectParallel=ECP",
+  NULL
+};
+
 static const char* control_cmd_PIXMA_iP4200[] = {
 /*"SetTime=20060722092503", */         /*original driver sends current time, is it needed?*/
   "SetSilent=OFF",
@@ -160,15 +228,14 @@ static const char* control_cmd_PIXMA_iP4200[] = {
   NULL
 };
 
-static const char* control_cmd_MULTIPASS_MP150[] = {
-  "AckTime=Short",
-  "MediaDetection=ON",
+static const char* control_cmd_PIXMA_iP2700[] = {
+/*"SetTime=20060722092503", */         /*what is this for?*/
+  "SetSilent=OFF",
   NULL
 };
 
-static const char* control_cmd_PIXMA_iP2700[] = {
+static const char* control_cmd_PIXMA_MG5300[] = {
 /*"SetTime=20060722092503", */         /*what is this for?*/
-  "SetSilent=OFF",
   NULL
 };
 
@@ -179,71 +246,79 @@ static const canon_cap_t canon_model_capabilities[] =
   /* the first printer is used as default in case something has gone wrong in printers.xml */
   { /* Canon MULTIPASS MP830 */
     "PIXMA MP830", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px,0,control_cmd_MULTIPASS_MP150, */  /*features */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP830_modelist,
-    /* &canon_PIXMA_iP4000_paperlist, */
     &canon_MULTIPASS_MP600_paperlist,
+    &canon_MULTIPASS_MP830_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP800 */
     "PIXMA MP800", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP800_modelist,
     &canon_MULTIPASS_MP600_paperlist,
+    &canon_MULTIPASS_MP800_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP810 */
     "PIXMA MP810", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP810_modelist,
     &canon_MULTIPASS_MP600_paperlist,
+    &canon_MULTIPASS_MP810_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP950 */
     "PIXMA MP950", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200,  /* features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /* features */
     &canon_MULTIPASS_MP950_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+    &canon_MULTIPASS_MP950_paperlist,
+    &canon_MULTIPASS_MP950_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP960 */
     "PIXMA MP960", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4600_slotlist, /* changed from iP4000 */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200,  /* features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4600_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /* features */
     &canon_MULTIPASS_MP960_modelist,
-    &canon_PIXMA_iP4600_paperlist, /* changed from iP4000 */
+    &canon_MULTIPASS_MP960_paperlist,
+    &canon_MULTIPASS_MP960_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -251,45 +326,51 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA MP970 */
     "PIXMA MP970", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP970_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+    &canon_MULTIPASS_MP970_paperlist,
+    &canon_MULTIPASS_MP970_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP980 */
     "PIXMA MP980", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4600_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP980_modelist,
     &canon_MULTIPASS_MP980_paperlist,
+    &canon_MULTIPASS_MP980_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP990 --- uses XML */
     "PIXMA MP990", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4600_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP990_modelist,
     &canon_MULTIPASS_MP990_paperlist,
+    &canon_MULTIPASS_MP990_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
 
   /* ******************************** */
@@ -309,43 +390,191 @@ static const canon_cap_t canon_model_capabilities[] =
 
   { /* Canon S200x *//* heads: BC-24 */
     "S200", 3,
-    618, 936,       /* 8.58" x 13 " */
-    10, 10, 9, 20,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD1 | CANON_CAP_rr,0x61,NULL,
+    INCH(19/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 20,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD1 | CANON_CAP_rr,0x61,
+    2,0,
+    NULL,
     &canon_S200_modelist,
-    &canon_default_paperlist,
+    &canon_BJC_S200_paperlist,
+    &canon_BJC_S200_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
-
   { /* Canon BJC S300 */
     "S300", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort,
-    &canon_BJC_8500_modelist,
-    &canon_default_paperlist,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0,
+    2,0,
+    control_cmd_ackshort,
+    &canon_BJC_S300_modelist,
+    &canon_BJC_S300_paperlist,
+    &canon_BJC_S300_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S330 */
+    "S330", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_S330_modelist,
+    &canon_BJC_S330_paperlist,
+    &canon_BJC_S330_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon S500 */
+    "S500", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0,
+    2,0,
+    control_cmd_BJC_i6100,
+    &canon_BJC_S500_modelist,
+    &canon_BJC_S300_paperlist,
+    &canon_BJC_S500_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon S520 */
+    "S520", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0,
+    2,0,
+    control_cmd_BJC_i6100,
+    &canon_BJC_S520_modelist,
+    &canon_BJC_S520_paperlist,
+    &canon_BJC_S520_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S600 *//* heads: BC-50 */
+    "S600", 3,
+    842, INCH(17),
+    10, 10, 9, 15,
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0,
+    2,0,
+    control_cmd_BJC_i6100,
+    &canon_BJC_S600_modelist,
+    &canon_BJC_S300_paperlist,
+    &canon_BJC_S600_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S750 */
+    "S750", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px,0,
+    2,0,
+    control_cmd_BJC_i550,
+    &canon_BJC_S750_modelist,
+    &canon_BJC_S750_paperlist,
+    &canon_BJC_S750_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S800 */
+    "S800", 3,
+    842, INCH(17),
+    10, 10, 9, 15,
+    &canon_BJC_S800_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_p,0,
+    2,0,
+    control_cmd_BJC_i6100,
+    &canon_BJC_S800_modelist,
+    &canon_BJC_S800_paperlist,
+    &canon_BJC_S800_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S820 */
+    "S820", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0,
+    2,0,
+    control_cmd_BJC_i550,
+    &canon_BJC_S820_modelist,
+    &canon_BJC_S800_paperlist,
+    &canon_BJC_S820_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S830D */
+    "S830", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_S820_modelist,
+    &canon_BJC_S800_paperlist,
+    &canon_BJC_S820_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC S900 */
+    "S900", 3,
+    INCH(17/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 15,  /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_rr,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_S900_modelist,
+    &canon_BJC_S800_paperlist,
+    &canon_BJC_S900_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
-
   { /* Canon  BJ 30   *//* heads: BC-10 */
     "30", 1,
-    9.5*72, 14*72,
-    11, 9, 10, 18,
-    8,
+    INCH(19/2), INCH(14),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_30_modelist,
     &canon_default_paperlist,
+    &canon_BJC_30_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -353,13 +582,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon  BJC 85  *//* heads: BC-20 BC-21 BC-22 */
     "85", 1,
-    9.5*72, 14*72,
-    11, 9, 10, 18,
-    8,
+    INCH(19/2), INCH(23),      /* from MacOSX driver */
+    10, 10, 9, 20, /* confirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_85_modelist,
     &canon_default_paperlist,
+    &canon_BJC_85_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -369,12 +600,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 4300 *//* heads: BC-20 BC-21 BC-22 BC-29 */
     "4300", 1,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_cart,0,
+    2,0,
+    NULL,
     &canon_BJC_4300_modelist,
     &canon_default_paperlist,
+    &canon_BJC_4300_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -383,13 +616,31 @@ static const canon_cap_t canon_model_capabilities[] =
 
   { /* Canon BJC 4400 *//* heads: BC-20 BC-21 BC-22 BC-29 */
     "4400", 1,
-    9.5*72, 14*72,
-    11, 9, 10, 18,
-    8,
+    INCH(19/2), INCH(14),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_4400_modelist,
     &canon_default_paperlist,
+    &canon_BJC_4400_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC 4550 *//* heads: BC-21 BCI-21 BC-22 */
+    "4550", 3,
+    INCH(17), INCH(22),
+    11, 9, 10, 18, /* unconfirmed */
+    &canon_default_slotlist,
+    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_cart,0,
+    2,0,
+    NULL,
+    &canon_BJC_4550_modelist,
+    &canon_default_paperlist,
+    &canon_BJC_4550_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -399,12 +650,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 6000 *//* heads: BC-30/BC-31 BC-32/BC-31 */
     "6000", 3,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1,0,control_cmd_ackshort,
+    CANON_CAP_STD1,0,
+    2,0,
+    control_cmd_ackshort,
     &canon_BJC_6000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_6000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -414,12 +667,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 6200 *//* heads: BC-30/BC-31 BC-32/BC-31 */
     "6200", 3,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1,0,control_cmd_ackshort,
+    CANON_CAP_STD1,0,
+    2,0,
+    control_cmd_ackshort,
     &canon_BJC_6000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_6000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -428,13 +683,15 @@ static const canon_cap_t canon_model_capabilities[] =
 
   { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
     "6500", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1,0,NULL,
+    CANON_CAP_STD1,0,
+    2,0,
+    NULL,
     &canon_BJC_6000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_6000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -442,27 +699,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 8200 *//* heads: BC-50 */
     "8200", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1 | CANON_CAP_r,0x61,control_cmd_ackshort,
+    CANON_CAP_STD1 | CANON_CAP_r,0x61,
+    2,0,
+    control_cmd_ackshort,
     &canon_BJC_8200_modelist,
     &canon_default_paperlist,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-  },
-  { /* Canon S500 */
-    "S500", 3,
-    842, 17*72,
-    10, 10, 15, 15,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_r | CANON_CAP_p,0x61,control_cmd_ackshort,
-    &canon_S500_modelist,
-    &canon_default_paperlist,
+    &canon_BJC_8200_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -479,12 +724,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 210 *//* heads: BC-02 BC-05 BC-06 */
     "210", 1,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
     &canon_BJC_210_modelist,
     &canon_default_paperlist,
+    &canon_BJC_210_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -493,12 +740,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 240 *//* heads: BC-02 BC-05 BC-06 */
     "240", 1,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
     &canon_BJC_240_modelist,
     &canon_default_paperlist,
+    &canon_BJC_240_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -507,12 +756,14 @@ static const canon_cap_t canon_model_capabilities[] =
   { /* Canon BJC 250 *//* heads: BC-02 BC-05 BC-06 */
     "250", 1,
     618, 936,      /* 8.58" x 13 " */
-    11, 9, 10, 18,
-    8,
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
     &canon_BJC_240_modelist,
     &canon_default_paperlist,
+    &canon_BJC_240_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -520,13 +771,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 1000 *//* heads: BC-02 BC-05 BC-06 */
     "1000", 1,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_240_modelist,
     &canon_default_paperlist,
+    &canon_BJC_240_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -534,13 +787,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 2000 *//* heads: BC-20 BC-21 BC-22 BC-29 */
     "2000", 1,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_2000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_2000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -548,13 +803,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 3000 *//* heads: BC-30 BC-33 BC-34 */
     "3000", 3,
-    842, 17*72,
-    10, 10, 9, 15,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a | CANON_CAP_p,0,NULL, /*FIX? should have _r? */
+    842, INCH(17),
+    10, 10, 9, 15, /* unconfirmed but looks right */
+    &canon_MULTIPASS_MP150_slotlist, /* cartridge selection option */
+    CANON_CAP_STD0 | CANON_CAP_p | CANON_CAP_cart,0,
+    2,0,
+    control_cmd_BJC_i6100,
     &canon_BJC_3000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_3000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -562,13 +819,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 6100 *//* heads: BC-30/BC-31 BC-32/BC-31 */
     "6100", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r,0x61,NULL,
+    CANON_CAP_STD1 | CANON_CAP_a | CANON_CAP_r,0x61,
+    2,0,
+    NULL,
     &canon_BJC_3000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_3000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -576,41 +835,48 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 7000 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
     "7000", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1,0,NULL,
+    CANON_CAP_STD1,0,
+    2,0,
+    NULL,
     &canon_BJC_7000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_7000_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
-  { /* Canon BJC i560 */
-    "i560", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
+  { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
+    "7100", 3,
+    842, INCH(17),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1,0,NULL,
-    &canon_BJC_i560_modelist,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
+    &canon_BJC_7100_modelist,
     &canon_default_paperlist,
+    &canon_BJC_7100_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
-  { /* Canon BJC 7100 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
-    "7100", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
-    &canon_BJC_7100_modelist,
-    &canon_default_paperlist,
+  { /* Canon BJC i50 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
+    /* 50i sold outside of Japan as the i70, but we need i in front for the name */
+    "i50", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15,/* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i50_modelist,
+    &canon_BJC_i50_paperlist,
+    &canon_BJC_i50_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -618,13 +884,332 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC i80 *//* heads: BC-60/BC-61 BC-60/BC-62   ??????? */
     "i80", 3,
-    842, 17*72,
-    11, 9, 10, 18,
-    8,
-    &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
     &canon_BJC_i80_modelist,
-    &canon_default_paperlist,
+    &canon_BJC_i80_paperlist,
+    &canon_BJC_i80_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+#if 0
+  { /* Canon BJC i250 */ /* does not conform to any current model, commands not known yet */
+    "i250", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i250_modelist,
+    &canon_BJC_i250_paperlist,
+    &canon_BJC_i250_modeuselist,/*not yet created*/
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i320 */ /* does not conform to any current model, commands not known yet */
+    "i320", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i320_modelist,
+    &canon_BJC_i320_paperlist,
+    &canon_BJC_i320_modeuselist,/*not yet created*/
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+#endif
+  { /* Canon BJC i450 */
+    "i450", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i450_modelist,
+    &canon_BJC_i450_paperlist,
+    &canon_BJC_i450_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i455*/
+    "i455", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i455_modelist,
+    &canon_BJC_i455_paperlist,
+    &canon_BJC_i455_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i550 */
+    "i550", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_BJC_i550,
+    &canon_BJC_i550_modelist,
+    &canon_BJC_i550_paperlist,
+    &canon_BJC_i550_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i560 */
+    "i560", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_BJC_i550,
+    &canon_BJC_i560_modelist,
+    &canon_BJC_i560_paperlist,
+    &canon_BJC_i560_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i850 */
+    "i850", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_BJC_i550,
+    &canon_BJC_i850_modelist,
+    &canon_BJC_i850_paperlist,
+    &canon_BJC_i850_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i860 */
+    "i860", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_BJC_i860_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_BJC_i550,
+    &canon_BJC_i860_modelist,
+    &canon_BJC_i560_paperlist,
+    &canon_BJC_i860_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i900D */
+    "i900", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i900_modelist,
+    &canon_BJC_i560_paperlist,
+    &canon_BJC_i900_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i950 */
+    "i950", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i950_modelist,
+    &canon_BJC_i950_paperlist,
+    &canon_BJC_i950_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i960 */
+    "i960", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_BJC_i860_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i960_modelist,
+    &canon_BJC_i560_paperlist,
+    &canon_BJC_i960_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i990 */
+    "i990", 3,
+    INCH(17/2), INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_BJC_i860_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i990_modelist,
+    &canon_BJC_i560_paperlist,
+    &canon_BJC_i990_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon BJC i6100 */
+    "i6100", 3,
+    933, INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_BJC_i6100, /* 32 times 0x0 before form feed not implemented */
+    &canon_BJC_i6100_modelist,
+    &canon_BJC_i6100_paperlist,
+    &canon_BJC_i6100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i9100 */
+    "i9100", 3,
+    933, INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i9100_modelist,
+    &canon_BJC_i9100_paperlist,
+    &canon_BJC_i9100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon BJC i9900 */
+    "i9900", 3,
+    933, INCH(23), /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_M|CANON_CAP_BORDERLESS,0,/* ESC (M 0x0 0x0 0x0 */
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,
+    &canon_BJC_i9900_modelist,
+    &canon_BJC_i9900_paperlist,
+    &canon_BJC_i9900_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+
+  /***************/
+  /* mini models */
+  /***************/
+
+  { /*  mini220 */
+    "PIXMA mini220", 3,
+    INCH(4), INCH(8), /* US 4" x 8" */       /* from MacOSX driver */
+    10, 10, 9, 15, /* for hagaki: 3.4mm L/R, 3mm top, 5mm bottom */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,
+    &canon_PIXMA_mini220_modelist,
+    &canon_SELPHY_DS810_paperlist,
+    &canon_PIXMA_mini220_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /*  mini320 */
+    "PIXMA mini320", 3,
+    INCH(5), INCH(8),       /* from MacOSX driver */
+    10, 10, 9, 15, /* for hagaki: 3.4mm L/R, 3mm top, 5mm bottom */
+    &canon_MULTIPASS_MP250_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,
+    &canon_PIXMA_mini320_modelist,
+    &canon_PIXMA_mini320_paperlist,
+    &canon_PIXMA_mini320_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+
+
+  /*************/
+  /* DS models */
+  /*************/
+
+  { /* Canon DS700 */
+    "SELPHY DS700", 3,
+    INCH(4), INCH(6), /* US 4" x 6" */       /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,2, /* ESC (l and (P command lengths */
+    NULL,
+    &canon_SELPHY_DS700_modelist,
+    &canon_SELPHY_DS700_paperlist,
+    &canon_SELPHY_DS700_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+  },
+  { /* Canon DS810 */
+    "SELPHY DS810", 3,
+    INCH(4), INCH(8), /* US 4" x 8" */       /* from MacOSX driver */
+    10, 10, 9, 15, /* confirmed */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    NULL,
+    &canon_SELPHY_DS810_modelist,
+    &canon_SELPHY_DS810_paperlist,
+    &canon_SELPHY_DS810_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -640,13 +1225,15 @@ static const canon_cap_t canon_model_capabilities[] =
 
   { /* Canon BJC 5100 *//* heads: BC-20 BC-21 BC-22 BC-23 BC-29 */
     "5100", 1,
-    17*72, 22*72,
-    11, 9, 10, 18,
-    8,
+    INCH(17), INCH(22),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
     &canon_BJC_3000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_3000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -654,13 +1241,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 5500 *//* heads: BC-20 BC-21 BC-29 */
     "5500", 1,
-    22*72, 34*72,
-    11, 9, 10, 18,
-    8,
+    INCH(22), INCH(34),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD0 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_5500_modelist,
     &canon_default_paperlist,
+    &canon_BJC_5500_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -668,13 +1257,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 6500 *//* heads: BC-30/BC-31 BC-32/BC-31 */
     "6500", 3,
-    17*72, 22*72,
-    11, 9, 10, 18,
-    8,
+    INCH(17), INCH(22),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD1 | CANON_CAP_a,0,NULL,
+    CANON_CAP_STD1 | CANON_CAP_a,0,
+    2,0,
+    NULL,
     &canon_BJC_3000_modelist,
     &canon_default_paperlist,
+    &canon_BJC_3000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -682,27 +1273,64 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon BJC 8500 *//* heads: BC-80/BC-81 BC-82/BC-81 */
     "8500", 3,
-    17*72, 22*72,
-    11, 9, 10, 18,
-    8,
+    INCH(17), INCH(22),
+    11, 9, 10, 18, /* unconfirmed */
     &canon_default_slotlist,
-    CANON_CAP_STD0,0,NULL,
+    CANON_CAP_STD0,0,
+    2,0,
+    NULL,
     &canon_BJC_8500_modelist,
     &canon_default_paperlist,
+    &canon_BJC_8500_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
+  { /* Canon PIXMA iP90, iP90v */
+    "PIXMA iP90", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */        /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_S|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iP90_modelist,
+    &canon_PIXMA_iP90_paperlist,
+    &canon_PIXMA_iP90_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP100 */
+    "PIXMA iP100", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_S|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iP100_modelist,
+    &canon_PIXMA_iP100_paperlist,
+    &canon_PIXMA_iP100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+#if 0
   { /* Canon PIXMA iP1000 */
     "PIXMA iP1000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1000_modelist,
     &canon_PIXMA_iP1000_paperlist,
+    &canon_PIXMA_iP1000_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
@@ -710,13 +1338,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP1200 --- iP1300 same */
     "PIXMA iP1200", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1200_modelist,
     &canon_PIXMA_iP1200_paperlist,
+    &canon_PIXMA_iP1200_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
@@ -724,13 +1354,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP1500 */
     "PIXMA iP1500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1500_modelist,
     &canon_PIXMA_iP1500_paperlist,
+    &canon_PIXMA_iP1500_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
@@ -738,13 +1370,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP1600 */
     "PIXMA iP1600", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_MULTIPASS_MP170_modelist,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
+    &canon_MULTIPASS_MP150_modelist,
     &canon_PIXMA_iP1500_paperlist,
+    &canon_PIXMA_iP1600_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
@@ -752,39 +1386,46 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP1900 */
     "PIXMA iP1900", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* rear only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_P,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1900_modelist,
     &canon_PIXMA_iP1900_paperlist,
+    &canon_PIXMA_iP1900_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
     NULL
   },
+#endif
   { /* Canon PIXMA iP2000 */
     "PIXMA iP2000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP2000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_iP2000_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+    &canon_PIXMA_iP2000_paperlist,
+    &canon_PIXMA_iP2000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
+#if 0
   { /* Canon PIXMA iP2200 */
     "PIXMA iP2200", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1900_modelist,
     &canon_PIXMA_iP2200_paperlist,
     NULL,
@@ -794,13 +1435,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP2500 */
     "PIXMA iP2500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1900_modelist,
     &canon_PIXMA_iP2200_paperlist,/* OHP experimental */
+    &canon_PIXMA_iP2500_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
@@ -808,27 +1451,32 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP2600 */
     "PIXMA iP2600", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* auto sheet feeder only */
-    CANON_CAP_STD0,0,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* auto sheet feeder only */
+    CANON_CAP_STD0,0,
+    2,0,
+    control_cmd_PIXMA_iP4000,  /*features */
     &canon_PIXMA_iP1900_modelist,
     &canon_PIXMA_iP2600_paperlist,
+    &canon_PIXMA_iP2600_modeuselist,/*not created yet*/
     NULL,
     NULL,
     NULL,
     NULL
   },
+#endif
   { /* Canon PIXMA iP2700 */
     "PIXMA iP2700", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.30 (from MacOSX driver only INCH(23) ) */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* rear only */
-    CANON_CAP_STD0|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_T|CANON_CAP_XML,0,control_cmd_PIXMA_iP2700,  /*features */
+    CANON_CAP_STD0|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_iP2700_modelist,
     &canon_PIXMA_iP2700_paperlist,
+    &canon_PIXMA_iP2700_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -836,98 +1484,175 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP3000 */
     "PIXMA iP3000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP3000_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+    &canon_PIXMA_iP3000_paperlist,
+    &canon_PIXMA_iP3000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA iP3100 */
     "PIXMA iP3100", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP3100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP3100_modelist,
     &canon_PIXMA_iP3100_paperlist,
+    &canon_PIXMA_iP3100_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon PIXMA iP4000 */
-    "PIXMA iP4000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px /*|CANON_CAP_I*/,0x64,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_PIXMA_iP4000_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+  { /* Canon PIXMA iP3300 */
+    "PIXMA iP3300", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3500_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP520_modelist,
+    &canon_PIXMA_iP3300_paperlist,
+    &canon_PIXMA_iP3300_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* PIXMA MP740 (== iP4000 without duplex) */
-    "PIXMA MP740", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px /*,|CANON_CAP_I*/,0x64,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_PIXMA_iP4000_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+  { /* Canon PIXMA iP3500 - like MP520 */
+    "PIXMA iP3500", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3500_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP520_modelist,
+    &canon_MULTIPASS_MP520_paperlist,
+    &canon_MULTIPASS_MP520_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon PIXMA iP5300, MP610 */
-    "PIXMA iP5300", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+  { /* Canon PIXMA iP3600 */
+    "PIXMA iP3600", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3600_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP540_modelist,
+    &canon_PIXMA_iP3600_paperlist,
+    &canon_PIXMA_iP3600_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP4000 */
+    "PIXMA iP4000", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_PIXMA_iP5300_modelist,
-    /*&canon_PIXMA_iP4000_paperlist,*/
-    &canon_MULTIPASS_MP600_paperlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4000,  /*features */
+    &canon_PIXMA_iP4000_modelist,
+    &canon_PIXMA_iP4000_paperlist,
+    &canon_PIXMA_iP4000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon PIXMA iP4600 */
-    "PIXMA iP4600", 3,          /*model, model_id*/
-    8.5*72, 26.625*72, /* max paper width and height */
+  { /* Canon PIXMA iP4100 */
+    "PIXMA iP4100", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
     10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
-    16,
-    &canon_PIXMA_iP4600_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150,  /*features */
-    &canon_PIXMA_iP5300_modelist,
-    &canon_PIXMA_iP4600_paperlist,
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP4100_modelist,
+    &canon_PIXMA_iP4100_paperlist,
+    &canon_PIXMA_iP4100_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
+  { /* Canon PIXMA iP4200 */
+    "PIXMA iP4200", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP4200_modelist,
+    &canon_PIXMA_iP4200_paperlist,
+    &canon_PIXMA_iP4200_modeuselist,
+    iP4200_lum_adjustment,
+    iP4200_hue_adjustment,
+    iP4200_sat_adjustment,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP4300 */
+    "PIXMA iP4300", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP4300_modelist, /* slight differences to iP4200 */
+    &canon_PIXMA_iP4200_paperlist,
+    &canon_PIXMA_iP4300_modeuselist,
+    iP4200_lum_adjustment,
+    iP4200_hue_adjustment,
+    iP4200_sat_adjustment,
+    iP4500_channel_order
+  },
   { /* Canon PIXMA iP4500 CD-R tray F */
     "PIXMA iP4500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4500_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_MULTIPASS_MP150,  /* features */
-    &canon_PIXMA_iP4500_modelist, /* changed from iP5300 */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /* features */
+    &canon_PIXMA_iP4500_modelist,
     &canon_PIXMA_iP4500_paperlist,
+    &canon_PIXMA_iP4500_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP4600 */
+    "PIXMA iP4600", 3,          /*model, model_id*/
+    INCH(17/2), 1917, /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4600_slotlist, /* iP4600 uses ESC (r 0x64 at reset followed by 0x65 later for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP4600_modelist,
+    &canon_PIXMA_iP4600_paperlist,
+    &canon_PIXMA_iP4600_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -935,97 +1660,175 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iP4700 CD-R tray G */
     "PIXMA iP4700", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4600_slotlist, /* there is some ESC (r 0x65 command for CD tray also, not sure why */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /* features */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4600_slotlist, /* iP4700 uses ESC (r 0x64 at reset followed by 0x65 later for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /* features */
     &canon_PIXMA_iP4700_modelist,
     &canon_PIXMA_iP4700_paperlist,
+    &canon_PIXMA_iP4700_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon PIXMA iP4200 */
-    "PIXMA iP4200", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4200,  /*features */
-    &canon_PIXMA_iP4200_modelist,
-    &canon_PIXMA_iP4000_paperlist,
-    iP4200_lum_adjustment,
-    iP4200_hue_adjustment,
-    iP4200_sat_adjustment,
-    NULL
-  },
   { /* Canon PIXMA iP4800 CD-R tray G */
     "PIXMA iP4800", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_iP4600_slotlist, /* there is some ESC (r 0x68 command for CD tray also, not sure why */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /* features */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4600_slotlist, /* iP4800 uses ESC (r 0x64 at reset followed by 0x68 later for CD media only */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /* features */
     &canon_PIXMA_iP4700_modelist,/* same for iP4800 */
     &canon_PIXMA_iP4700_paperlist,/* same for iP4800 */
+    &canon_PIXMA_iP4700_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP4900 CD-R tray G */
+    "PIXMA iP4900", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4600_slotlist, /* iP4900 uses ESC (r 0x68 command for CD tray only */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features Uses ESC (r only for CD media */
+    &canon_PIXMA_iP4900_modelist,
+    &canon_PIXMA_MG5200_paperlist,
+    &canon_PIXMA_iP4900_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP5000 */
+    "PIXMA iP5000", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP5000_modelist,
+    &canon_PIXMA_iP5000_paperlist,
+    &canon_PIXMA_iP5000_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP5300 */
+    "PIXMA iP5300", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP5300_modelist,
+    &canon_MULTIPASS_MP600_paperlist,
+    &canon_PIXMA_iP5300_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon PIXMA iP6000 */
+  { /* Canon PIXMA iP6000D */
     "PIXMA iP6000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP6000_modelist,
     &canon_PIXMA_iP4000_paperlist,
+    &canon_PIXMA_iP6000_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon PIXMA iP6100 */
+  { /* Canon PIXMA iP6100D */
     "PIXMA iP6100", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP6000_modelist,
     &canon_PIXMA_iP6100_paperlist,
+    &canon_PIXMA_iP6100_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon PIXMA iP6600 */
+  { /* Canon PIXMA iP6210D */
+    "PIXMA iP6210", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* has ESC (T */
+    CANON_CAP_STD0|CANON_CAP_T|CANON_CAP_NOBLACK|CANON_CAP_P|CANON_CAP_I|CANON_CAP_px|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iP6210_modelist,
+    &canon_PIXMA_iP90_paperlist,
+    &canon_PIXMA_iP6210_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP6600D */
     "PIXMA iP6600", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_PIXMA_iP6700_modelist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP6600_modelist,
     &canon_PIXMA_iP6600_paperlist,
+    &canon_PIXMA_iP6600_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon PIXMA iP6700 */
+  { /* Canon PIXMA iP6700D */
     "PIXMA iP6700", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_r|CANON_CAP_px,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP6700_modelist,
     &canon_PIXMA_iP6700_paperlist,
+    &canon_PIXMA_iP6700_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iX4000 --- like iX5000 but includes Transparency and ud1 mode is different */
+    "PIXMA iX4000", 3,          /*model, model_id*/
+    933, INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iX4000_modelist,
+    &canon_PIXMA_iP1500_paperlist,
+    &canon_PIXMA_iX4000_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1033,182 +1836,337 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA iX5000 */
     "PIXMA iX5000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist,
-    /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x61,control_cmd_PIXMA_iP4000, */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP4000,  /*features */
+    933, INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_iX5000_modelist,
     &canon_PIXMA_iP1500_paperlist,
+    &canon_PIXMA_iX5000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA iX6500 --- with XML */
     "PIXMA iX6500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    933, 1917,       /* max paper width and height */       /* from linux v3.50 driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP540_modelist,
     &canon_MULTIPASS_MX880_paperlist,
+    &canon_PIXMA_iX6500_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA iX7000 --- with XML */
     "PIXMA iX7000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    933, INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iX7000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iX7000_modelist,
     &canon_PIXMA_iX7000_paperlist,
+    &canon_PIXMA_iX7000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP510 --- like MP520 but without PPGgold paper support */
     "PIXMA MP510", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP520_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP2700,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP520_modelist,
     &canon_MULTIPASS_MP520_paperlist, /* Windows driver lacks PPGgold, but let us try anyway */
+    &canon_MULTIPASS_MP520_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP520 */
     "PIXMA MP520", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP520_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I,0,control_cmd_PIXMA_iP2700,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP520_modelist,
     &canon_MULTIPASS_MP520_paperlist,
+    &canon_MULTIPASS_MP520_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP530 */
+    "PIXMA MP530", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP530_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_MULTIPASS_MP530_modelist,
+    &canon_MULTIPASS_MP600_paperlist,
+    &canon_MULTIPASS_MP530_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP540 */
     "PIXMA MP540", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r,0x64,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP540_modelist,
     &canon_MULTIPASS_MX330_paperlist,
+    &canon_MULTIPASS_MP540_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon PIXMA MP550 ---wth XML */
+  { /* Canon PIXMA MP550 ---with XML */
     "PIXMA MP550", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /*features */
-    &canon_MULTIPASS_MP540_modelist, /* seems to have same modes */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP550_modelist, /* similar to MP540 but fewer modes */
     &canon_MULTIPASS_MP250_paperlist,
+    &canon_MULTIPASS_MP550_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP560 ---with XML */
+    "PIXMA MP560", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP560_modelist, /* like MP550 but has duplex */
+    &canon_MULTIPASS_MP250_paperlist,
+    &canon_MULTIPASS_MP560_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP600 */
     "PIXMA MP600", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MX850_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000,  /*features */
-    &canon_MULTIPASS_MP520_modelist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_P|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_MULTIPASS_MP600_modelist,
     &canon_MULTIPASS_MP600_paperlist,
+    &canon_MULTIPASS_MP600_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP610 */
+    "PIXMA MP610", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4500_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_MULTIPASS_MP610_modelist,
+    &canon_MULTIPASS_MP610_paperlist,
+    &canon_MULTIPASS_MP610_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP620 */
+    "PIXMA MP620", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_r|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP540_modelist,
+    &canon_MULTIPASS_MX330_paperlist,
+    &canon_MULTIPASS_MP620_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP630 */
     "PIXMA MP630", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5200_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_r|CANON_CAP_DUPLEX|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP640_modelist,
     &canon_MULTIPASS_MP630_paperlist,
+    &canon_MULTIPASS_MP630_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA MP640 */
     "PIXMA MP640", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5200_slotlist,
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_r,0x64,control_cmd_PIXMA_iP4200,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_r|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_MULTIPASS_MP640_modelist,
     &canon_MULTIPASS_MP640_paperlist,
+    &canon_MULTIPASS_MP640_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP700/MP730 --- split from iP3000 driver, with modifications */
+    /* US model: control_cmd_iP2700 */
+    /* Japanese model: control_BJC_i550, so chose this as base (more commands) */
+    "PIXMA MP700", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from user manual */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,0,
+    control_cmd_BJC_i550,  /*features */
+    &canon_MULTIPASS_MP700_modelist,
+    &canon_MULTIPASS_MP700_paperlist,
+    &canon_MULTIPASS_MP700_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
+  { /* PIXMA MP710/MP740 --- heavily modified from MP700/MP730 */
+    "PIXMA MP710", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from user manual */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP710_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP710_modelist,
+    &canon_MULTIPASS_MP710_paperlist,
+    &canon_MULTIPASS_MP710_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* PIXMA MP750/MP760/MP770/MP780/MP790 */
+    "PIXMA MP750", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP3100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iP4100_modelist,
+    &canon_MULTIPASS_MP750_paperlist,
+    &canon_MULTIPASS_MP750_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MP900 */
+    "PIXMA MP900", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP900_slotlist, /* auto sheetfeeder amd CD tray only */
+    CANON_CAP_STD0|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP900_modelist,
+    &canon_PIXMA_iP3100_paperlist,
+    &canon_MULTIPASS_MP900_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
   { /* Canon PIXMA Pro9000 */
     "PIXMA Pro9000", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(14), INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_Pro9000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_Pro9000_modelist,
     &canon_PIXMA_Pro9000_paperlist,
+    &canon_PIXMA_Pro9000_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA Pro9000 Mk.II */
     "PIXMA Pro9002", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(14), 1917,       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_Pro9000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_Pro9000mk2_modelist,
     &canon_PIXMA_Pro9000mk2_paperlist,
+    &canon_PIXMA_Pro9000mk2_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon PIXMA Pro9500 */
     "PIXMA Pro9500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(14), INCH(23),       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_Pro9000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_Pro9500_modelist,
     &canon_PIXMA_Pro9500_paperlist,
+    &canon_PIXMA_Pro9500_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1216,171 +2174,383 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA Pro9500 Mk.II */
     "PIXMA Pro9502", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(14), 1917,       /* max paper width and height */       /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_Pro9000_slotlist,
-    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_PIXMA_Pro9500mk2_modelist,
     &canon_PIXMA_Pro9500mk2_paperlist,
+    &canon_PIXMA_Pro9500mk2_modeuselist,
     NULL,
     NULL,
     NULL,
     NULL
   },
+  { /* Canon PIXMA iP7100 */
+    "PIXMA iP7100", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP7100_modelist,
+    &canon_PIXMA_iP7100_paperlist,
+    &canon_PIXMA_iP7100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP7500 */
+    "PIXMA iP7500", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP7500_modelist,
+    &canon_PIXMA_iP7500_paperlist,
+    &canon_PIXMA_iP7500_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP8100 */
+    "PIXMA iP8100", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP8100_modelist,
+    &canon_PIXMA_iP7100_paperlist,
+    &canon_PIXMA_iP8100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
   { /* Canon PIXMA iP8500 */
     "PIXMA iP8500", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_iP4000_slotlist,
-    /*CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px,0x61,control_cmd_PIXMA_iP4000,*/  /*features */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P,0x64,control_cmd_PIXMA_iP4000,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
     &canon_PIXMA_iP8500_modelist,
-    &canon_PIXMA_iP4000_paperlist,
+    &canon_PIXMA_iP8500_paperlist,
+    &canon_PIXMA_iP8500_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP8600 */
+    "PIXMA iP8600", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_iP4000_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_I|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200,  /*features */
+    &canon_PIXMA_iP8600_modelist,
+    &canon_PIXMA_iP7100_paperlist,
+    &canon_PIXMA_iP8600_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA iP9910 */
+    "PIXMA iP9910", 3,          /*model, model_id*/
+    933, INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP900_slotlist,
+    CANON_CAP_STD0|CANON_CAP_I|CANON_CAP_rr|CANON_CAP_px|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_PIXMA_iP9910_modelist,
+    &canon_PIXMA_iP9910_paperlist,
+    &canon_PIXMA_iP9910_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP150 */
     "PIXMA MP150", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    /* &canon_PIXMA_iP4000_slotlist, */
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    /* CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_T|CANON_CAP_I,0x61,control_cmd_MULTIPASS_MP150, */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP150_modelist,
-    /* &canon_PIXMA_iP4000_paperlist, */
     &canon_MULTIPASS_MP150_paperlist,
+    &canon_MULTIPASS_MP150_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon MULTIPASS MP170 */
-    "PIXMA MP170", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
-    &canon_MULTIPASS_MP170_modelist,
-    &canon_MULTIPASS_MP170_paperlist,
+  { /* Canon MULTIPASS MP190 */
+    "PIXMA MP190", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP190_modelist,
+    &canon_MULTIPASS_MP190_paperlist,
+    &canon_MULTIPASS_MP190_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MP210 */
+    "PIXMA MP210", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP250_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP210_modelist,
+    &canon_MULTIPASS_MP150_paperlist,
+    &canon_MULTIPASS_MP210_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MP360/370/375R/390 */
+    "PIXMA MP360", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from user manual */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,2, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP360_modelist,
+    &canon_MULTIPASS_MP360_paperlist,
+    &canon_MULTIPASS_MP360_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP450 */
     "PIXMA MP450", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
-    &canon_MULTIPASS_MP170_modelist,
-    &canon_MULTIPASS_MP170_paperlist,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP150_modelist,
+    &canon_MULTIPASS_MP150_paperlist,
+    &canon_MULTIPASS_MP150_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MP470 --- no XML */
+    "PIXMA MP470", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP470_modelist,
+    &canon_MULTIPASS_MP470_paperlist,
+    &canon_MULTIPASS_MP470_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP480 --- no XML */
     "PIXMA MP480", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP480_modelist,
     &canon_MULTIPASS_MP480_paperlist,
+    &canon_MULTIPASS_MP480_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MP490 --- with XML */
+    "PIXMA MP490", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP490_modelist,
+    &canon_MULTIPASS_MP493_paperlist,
+    &canon_MULTIPASS_MP490_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
-  { /* Canon MULTIPASS MP493: new model after MP480(?) --- with XML */
+  { /* Canon MULTIPASS MP493 --- with XML */
     "PIXMA MP493", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP480_modelist,
     &canon_MULTIPASS_MP493_paperlist,
+    &canon_MULTIPASS_MP493_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MP495 identical to MP280 it seems --- with XML */
     "PIXMA MP495", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP280_modelist,
     &canon_MULTIPASS_MP280_paperlist,
+    &canon_MULTIPASS_MP280_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MP240 */
+    "PIXMA MP240", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T  */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MP240_modelist,
+    &canon_MULTIPASS_MP240_paperlist,
+    &canon_MULTIPASS_MP240_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
-  { /* Canon MULTIPASS MP250 */
+  { /* Canon MULTIPASS MP250 --- with XML */
     "PIXMA MP250", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 & v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T  */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0x61,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP250_modelist,
     &canon_MULTIPASS_MP250_paperlist,
+    &canon_MULTIPASS_MP250_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon MULTIPASS MP270 */
+  { /* Canon MULTIPASS MP270 --- with XML */
     "PIXMA MP270", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.20 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T  */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP250_modelist,
     &canon_MULTIPASS_MP250_paperlist,
+    &canon_MULTIPASS_MP250_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
   },
-  { /* Canon MULTIPASS MP280 */
+  { /* Canon MULTIPASS MP280 --- with XML */
     "PIXMA MP280", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray.  */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_r|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features  Also uses CAP_T. MP280 no duplex, no 0x61 */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP250_slotlist, /* these models only have a rear tray. Also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MP280_modelist,
     &canon_MULTIPASS_MP280_paperlist,
+    &canon_MULTIPASS_MP280_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MG2100 */
+    "PIXMA MG2100", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features Also uses CAP_T */
+    &canon_PIXMA_MG2100_modelist,
+    &canon_PIXMA_MG5100_paperlist,
+    &canon_PIXMA_MG2100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MG3100 */
+    "PIXMA MG3100", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_T|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features Also uses CAP_T */
+    &canon_PIXMA_MG3100_modelist,
+    &canon_PIXMA_MG5100_paperlist,
+    &canon_PIXMA_MG3100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon PIXMA MG5100 */
     "PIXMA MG5100", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /* features */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /* features */
     &canon_PIXMA_MG5100_modelist,
     &canon_PIXMA_MG5100_paperlist,
+    &canon_PIXMA_MG5100_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1388,13 +2558,31 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA MG5200 --- like MG5100, plus CD tray */
     "PIXMA MG5200", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_MG5200_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /* features */
-    &canon_PIXMA_MG5200_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /* features */
+    &canon_PIXMA_MG5200_modelist,
+    &canon_PIXMA_MG5200_paperlist,
+    &canon_PIXMA_MG5200_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MG5300 --- like MG5200 */
+    "PIXMA MG5300", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features */
+    &canon_PIXMA_MG5300_modelist,
     &canon_PIXMA_MG5200_paperlist,
+    &canon_PIXMA_MG5300_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1402,13 +2590,31 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA MG6100 */
     "PIXMA MG6100", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_MG5200_slotlist, /* same as MG5200 */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /* features */
-    &canon_PIXMA_MG6100_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /* features */
+    &canon_PIXMA_MG6100_modelist,
     &canon_PIXMA_MG6100_paperlist,
+    &canon_PIXMA_MG6100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MG6200 */
+    "PIXMA MG6200", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features */
+    &canon_PIXMA_MG6200_modelist,
+    &canon_PIXMA_MG6100_paperlist,
+    &canon_PIXMA_MG6200_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1416,13 +2622,31 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon PIXMA MG8100 */
     "PIXMA MG8100", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_PIXMA_MG5200_slotlist, /* same as MG5200 */
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150,  /* features */
-    &canon_PIXMA_MG8100_modelist,/* there is some ESC (r 0x68 command for CD tray also, not sure why */
-    &canon_PIXMA_MG6100_paperlist, /* same as MG6100 */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.40 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /* features */
+    &canon_PIXMA_MG8100_modelist,
+    &canon_PIXMA_MG6100_paperlist,
+    &canon_PIXMA_MG8100_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon PIXMA MG8200 */
+    "PIXMA MG8200", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5200_slotlist, /* ESC (r only for CD media */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_r|CANON_CAP_rr|CANON_CAP_I|CANON_CAP_P|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,  /* features */
+    &canon_PIXMA_MG8200_modelist,
+    &canon_PIXMA_MG6100_paperlist,
+    &canon_PIXMA_MG8200_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1431,13 +2655,15 @@ static const canon_cap_t canon_model_capabilities[] =
   /* MX series */
   { /* Canon MULTIPASS MX300 --- MX310 is the same */
     "PIXMA MX300", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    2,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MX300_modelist,
     &canon_MULTIPASS_MX300_paperlist,
+    &canon_MULTIPASS_MX300_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1445,27 +2671,31 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX330 */
     "PIXMA MX330", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MX330_modelist,
     &canon_MULTIPASS_MX330_paperlist,
+    &canon_MULTIPASS_MX330_modeuselist,
     NULL,
     NULL,
     NULL,
     iP4500_channel_order
   },
-  { /* Canon MULTIPASS MX340 */
+  { /* Canon MULTIPASS MX340 --- with XML*/
     "PIXMA MX340", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
-    &canon_MULTIPASS_MP170_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I,0,control_cmd_MULTIPASS_MP150,  /*features */
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.30 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_MULTIPASS_MP150_slotlist, /* these models only have an auto sheet feeder also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MX340_modelist,
     &canon_MULTIPASS_MX340_paperlist,
+    &canon_MULTIPASS_MX340_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1473,13 +2703,31 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX360 -- with XML */
     "PIXMA MX360", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.50 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
     &canon_MULTIPASS_MX360_modelist,
     &canon_MULTIPASS_MX360_paperlist,
+    &canon_MULTIPASS_MX360_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MX370 --- with XML */
+    "PIXMA MX370", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.70 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist, /* only front tray also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,8, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,
+    &canon_MULTIPASS_MX370_modelist,
+    &canon_MULTIPASS_MX420_paperlist,
+    &canon_MULTIPASS_MX370_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1487,27 +2735,63 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX420 --- with XML */
     "PIXMA MX420", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.50 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP250_slotlist, /* only rear tray also uses CAP_T */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150,  /*features */
-    &canon_MULTIPASS_MP480_modelist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700,  /*features */
+    &canon_MULTIPASS_MX420_modelist,
     &canon_MULTIPASS_MX420_paperlist,
+    &canon_MULTIPASS_MX420_modeuselist,
     NULL,
     NULL,
     NULL,
-    NULL
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MX510 --- with XML */
+    "PIXMA MX510", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.70 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist, /* only front tray also uses CAP_T */
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,8, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300,
+    &canon_MULTIPASS_MX510_modelist,
+    &canon_MULTIPASS_MX420_paperlist,
+    &canon_MULTIPASS_MX510_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
   },
   { /* Canon MULTIPASS MX700 */
     "PIXMA MX700", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MP520_slotlist, /* front, rear, button, and front/plain-only */
-    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0,control_cmd_PIXMA_iP4000, /*features*/
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700, /*features*/
     &canon_MULTIPASS_MP520_modelist,
     &canon_MULTIPASS_MX300_paperlist,
+    &canon_MULTIPASS_MX700_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS MX710 --- with XML */
+    "PIXMA MX710", 3,          /*model, model_id*/
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from linux driver v3.70 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG5100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,8, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300, /*features*/
+    &canon_MULTIPASS_MX710_modelist,
+    &canon_MULTIPASS_MX420_paperlist,
+    &canon_MULTIPASS_MX710_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1515,13 +2799,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX850 */
     "PIXMA MX850", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MX850_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200, /*features*/
     &canon_PIXMA_iP4500_modelist, /* same inksets as iP4500 */
     &canon_MULTIPASS_MX850_paperlist,
+    &canon_MULTIPASS_MX850_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1529,13 +2815,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX860 */
     "PIXMA MX860", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200, /*features*/
     &canon_MULTIPASS_MX860_modelist,
     &canon_MULTIPASS_MX330_paperlist,
+    &canon_MULTIPASS_MX860_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1543,13 +2831,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX870 --- with XML */
     "PIXMA MX870", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.30 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0x64,control_cmd_MULTIPASS_MP150, /*features*/
-    &canon_MULTIPASS_MX870_modelist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0x64,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700, /*features*/
+    &canon_MULTIPASS_MX860_modelist,
     &canon_MULTIPASS_MX340_paperlist,
+    &canon_MULTIPASS_MX870_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1557,13 +2847,15 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX880 --- with XML */
     "PIXMA MX880", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.50 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_PIXMA_MG5100_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML,0,control_cmd_MULTIPASS_MP150, /*features*/
-    &canon_MULTIPASS_MP540_modelist,
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP2700, /*features*/
+    &canon_MULTIPASS_MX880_modelist,
     &canon_MULTIPASS_MX880_paperlist,
+    &canon_MULTIPASS_MX880_modeuselist,
     NULL,
     NULL,
     NULL,
@@ -1571,13 +2863,47 @@ static const canon_cap_t canon_model_capabilities[] =
   },
   { /* Canon MULTIPASS MX7600 */
     "PIXMA MX7600", 3,          /*model, model_id*/
-    842, 17*72,       /* max paper width and height */
-    10, 10, 15, 15,    /*border_left, border_right, border_top, border_bottom */
-    8,
+    INCH(17/2), INCH(23),       /* max paper width and height */ /* from MacOSX driver */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
     &canon_MULTIPASS_MX7600_slotlist,
-    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I,0x64,control_cmd_PIXMA_iP4000, /*features*/
+    CANON_CAP_STD0|CANON_CAP_DUPLEX|CANON_CAP_r|CANON_CAP_px|CANON_CAP_P|CANON_CAP_I|CANON_CAP_BORDERLESS,0x64,
+    3,4, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_iP4200, /*features*/
     &canon_MULTIPASS_MX7600_modelist,
     &canon_MULTIPASS_MX7600_paperlist,
+    &canon_MULTIPASS_MX7600_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS E500 --- with XML */
+    "PIXMA E500", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.60 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,6, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300, /*features*/
+    &canon_MULTIPASS_E500_modelist,
+    &canon_MULTIPASS_MX880_paperlist,
+    &canon_MULTIPASS_E500_modeuselist,
+    NULL,
+    NULL,
+    NULL,
+    iP4500_channel_order
+  },
+  { /* Canon MULTIPASS E600 --- with XML */
+    "PIXMA E600", 3,          /*model, model_id*/
+    INCH(17/2), 1917,       /* max paper width and height */ /* from linux driver v3.70 */
+    10, 10, 9, 15,    /*border_left, border_right, border_top, border_bottom */
+    &canon_PIXMA_MG2100_slotlist,
+    CANON_CAP_STD0|CANON_CAP_px|CANON_CAP_P|CANON_CAP_T|CANON_CAP_I|CANON_CAP_XML|CANON_CAP_BORDERLESS,0,
+    3,8, /* ESC (l and (P command lengths */
+    control_cmd_PIXMA_MG5300, /*features*/
+    &canon_MULTIPASS_E500_modelist,
+    &canon_MULTIPASS_MX880_paperlist,
+    &canon_MULTIPASS_E500_modeuselist,
     NULL,
     NULL,
     NULL,
diff --git a/src/main/channel.c b/src/main/channel.c
index 4bea5e2..eb50825 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.34 2011/04/16 15:48:20 rlk Exp $"
+ * "$Id: channel.c,v 1.35 2011/12/30 00:36:10 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -736,9 +736,10 @@ limit_ink(const stp_vars_t *v)
   int i;
   int retval = 0;
   stpi_channel_group_t *cg = get_channel_group(v);
-  unsigned short *ptr = cg->output_data;
+  unsigned short *ptr;
   if (!cg || cg->ink_limit == 0 || cg->ink_limit >= cg->max_density)
     return 0;
+  ptr = cg->output_data;
   for (i = 0; i < cg->width; i++)
     {
       int total_ink = ink_sum(ptr, cg->total_channels);
@@ -1065,11 +1066,12 @@ static void
 generate_gloss(const stp_vars_t *v, unsigned *zero_mask)
 {
   stpi_channel_group_t *cg = get_channel_group(v);
-  unsigned short *output = cg->output_data;
+  unsigned short *output;
   unsigned gloss_mask;
   int i, j, k;
   if (!cg || cg->gloss_channel == -1 || cg->gloss_limit <= 0)
     return;
+  output = cg->output_data;
   gloss_mask = ~(1 << cg->gloss_physical_channel);
   for (i = 0; i < cg->width; i++)
     {
diff --git a/src/main/escp2-driver.c b/src/main/escp2-driver.c
index a2fc23e..7819510 100644
--- a/src/main/escp2-driver.c
+++ b/src/main/escp2-driver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-driver.c,v 1.57 2010/12/19 02:51:37 rlk Exp $"
+ * "$Id: escp2-driver.c,v 1.58 2012/01/19 13:25:40 m0m Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -273,7 +273,7 @@ escp2_set_remote_sequence(stp_vars_t *v)
 	{
 	  /* If there's ever duplex no tumble, we'll need to special
 	     case it, too */
-	  if (pd->duplex == DUPLEX_TUMBLE && (pd->input_slot->duplex & DUPLEX_TUMBLE))
+	  if (pd->duplex == DUPLEX_TUMBLE && pd->input_slot && (pd->input_slot->duplex & DUPLEX_TUMBLE))
 	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
 	  else
 	    stp_send_command(v, "DP", "bcc", 0, 2); /* Auto duplex */
diff --git a/src/main/gutenprint-internal.h b/src/main/gutenprint-internal.h
index 65fd10c..0fa17b4 100644
--- a/src/main/gutenprint-internal.h
+++ b/src/main/gutenprint-internal.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: gutenprint-internal.h,v 1.3 2010/08/04 00:33:56 rlk Exp $"
+ * "$Id: gutenprint-internal.h,v 1.5 2011/06/12 00:31:51 rlk Exp $"
  *
  *   Print plug-in header file for the GIMP.
  *
@@ -53,6 +53,7 @@ extern "C" {
 extern void stpi_init_paper(void);
 extern void stpi_init_dither(void);
 extern void stpi_init_printer(void);
+extern void stpi_vars_print_error(const stp_vars_t *v, const char *prefix);
 #define BUFFER_FLAG_FLIP_X	0x1
 #define BUFFER_FLAG_FLIP_Y	0x2
 extern stp_image_t* stpi_buffer_image(stp_image_t* image, unsigned int flags);
@@ -68,6 +69,7 @@ do									\
       stp_erprintf("\nERROR: ***Gutenprint %s assertion %s failed!"	\
 		   " file %s, line %d.  %s\n", PACKAGE_VERSION,		\
 		   #x, __FILE__, __LINE__, "Please report this bug!");	\
+      if ((v)) stpi_vars_print_error((v), "ERROR");			\
       stp_abort();							\
     }									\
 } while (0)
@@ -81,5 +83,5 @@ do									\
 
 #endif /* GUTENPRINT_INTERNAL_INTERNAL_H */
 /*
- * End of "$Id: gutenprint-internal.h,v 1.3 2010/08/04 00:33:56 rlk Exp $".
+ * End of "$Id: gutenprint-internal.h,v 1.5 2011/06/12 00:31:51 rlk Exp $".
  */
diff --git a/src/main/module.c b/src/main/module.c
index 83d9037..5d078a2 100644
--- a/src/main/module.c
+++ b/src/main/module.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: module.c,v 1.26 2006/09/28 15:40:05 m0m Exp $"
+ * "$Id: module.c,v 1.27 2012/01/19 13:25:40 m0m Exp $"
  *
  *   Gutenprint module loader - load modules with libltdl/libdl.
  *
@@ -96,7 +96,8 @@ module_list_freefunc(void *item /* module to remove */)
   if (module && module->fini) /* Call the module exit function */
     module->fini();
 #if defined(USE_LTDL) || defined(USE_DLOPEN)
-  DLCLOSE(module->handle); /* Close the module if it's not static */
+  if (module && module->handle)
+    DLCLOSE(module->handle); /* Close the module if it's not static */
 #endif
 }
 
diff --git a/src/main/mxml-file.c b/src/main/mxml-file.c
index 3209169..a5d4025 100644
--- a/src/main/mxml-file.c
+++ b/src/main/mxml-file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $"
+ * "$Id: mxml-file.c,v 1.13 2012/01/19 13:26:48 m0m Exp $"
  *
  * File loading code for mini-XML, a small XML-like file parsing library.
  *
@@ -39,7 +39,8 @@
 
 #include <gutenprint/mxml.h>
 #include "config.h"
-
+#define MXML_BUFSIZE (64)
+#define ENTITY_BUFSIZE (64)
 
 /*
  * Local functions...
@@ -390,13 +391,13 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
   * Read elements and other nodes from the file...
   */
 
-  if ((buffer = malloc(64)) == NULL)
+  if ((buffer = malloc(MXML_BUFSIZE)) == NULL)
   {
     fputs("Unable to allocate string buffer!\n", stderr);
     return (NULL);
   }
 
-  bufsize    = 64;
+  bufsize    = MXML_BUFSIZE;
   bufptr     = buffer;
   parent     = top;
   whitespace = 0;
@@ -492,7 +493,6 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	  break;
 	else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
 	{
-          free(buffer);
 	  return (NULL);
 	}
 	else if ((bufptr - buffer) == 3 && !strncmp(buffer, "!--", 3))
@@ -513,7 +513,6 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	    break;
 	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	}
@@ -554,7 +553,6 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	    break;
 	  else if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	}
@@ -685,7 +683,7 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
       * support &lt;, &amp;, &gt;, &nbsp;, &quot;, &#nnn;, and &#xXXXX;...
       */
 
-      char	entity[64],		/* Entity string */
+      char	entity[ENTITY_BUFSIZE],		/* Entity string */
 		*entptr;		/* Pointer into entity */
 
 
@@ -745,7 +743,6 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 
 	if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
 	{
-          free(buffer);
 	  return (NULL);
 	}
       }
@@ -759,12 +756,10 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	{
 	  if (mxml_add_char(0xc0 | (ch >> 6), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | (ch & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
         }
@@ -772,17 +767,14 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	{
 	  if (mxml_add_char(0xe0 | (ch >> 12), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | ((ch >> 6) & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | (ch & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	}
@@ -790,22 +782,18 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 	{
 	  if (mxml_add_char(0xf0 | (ch >> 18), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | ((ch >> 12) & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | ((ch >> 6) & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	  if (mxml_add_char(0x80 | (ch & 63), &bufptr, &buffer, &bufsize))
 	  {
-            free(buffer);
 	    return (NULL);
 	  }
 	}
@@ -819,7 +807,6 @@ mxml_load_data(stp_mxml_node_t *top,	/* I - Top node */
 
       if (mxml_add_char(ch, &bufptr, &buffer, &bufsize))
       {
-        free(buffer);
 	return (NULL);
       }
     }
@@ -868,22 +855,22 @@ mxml_parse_element(stp_mxml_node_t *node,	/* I - Element node */
   * Initialize the name and value buffers...
   */
 
-  if ((name = malloc(64)) == NULL)
+  if ((name = malloc(MXML_BUFSIZE)) == NULL)
   {
     fputs("Unable to allocate memory for name!\n", stderr);
     return (EOF);
   }
 
-  namesize = 64;
+  namesize = MXML_BUFSIZE;
 
-  if ((value = malloc(64)) == NULL)
+  if ((value = malloc(MXML_BUFSIZE)) == NULL)
   {
     free(name);
     fputs("Unable to allocate memory for value!\n", stderr);
     return (EOF);
   }
 
-  valsize = 64;
+  valsize = MXML_BUFSIZE;
 
  /*
   * Loop until we hit a >, /, ?, or EOF...
@@ -938,7 +925,6 @@ mxml_parse_element(stp_mxml_node_t *node,	/* I - Element node */
         break;
       else if (mxml_add_char(ch, &ptr, &name, &namesize))
       {
-        free(name);
 	free(value);
 	return (EOF);
       }
@@ -955,6 +941,8 @@ mxml_parse_element(stp_mxml_node_t *node,	/* I - Element node */
       {
         fprintf(stderr, "Missing value for attribute '%s' in element %s!\n",
 	        name, node->value.element.name);
+	free(name);
+	free(value);
         return (EOF);
       }
 
@@ -973,7 +961,6 @@ mxml_parse_element(stp_mxml_node_t *node,	/* I - Element node */
 	  else if (mxml_add_char(ch, &ptr, &value, &valsize))
 	  {
             free(name);
-	    free(value);
 	    return (EOF);
 	  }
 
@@ -994,7 +981,6 @@ mxml_parse_element(stp_mxml_node_t *node,	/* I - Element node */
 	  else if (mxml_add_char(ch, &ptr, &value, &valsize))
 	  {
             free(name);
-	    free(value);
 	    return (EOF);
 	  }
 
@@ -1477,5 +1463,5 @@ mxml_write_ws(stp_mxml_node_t *node,	/* I - Current node */
 
 
 /*
- * End of "$Id: mxml-file.c,v 1.10 2008/07/20 01:12:15 easysw Exp $".
+ * End of "$Id: mxml-file.c,v 1.13 2012/01/19 13:26:48 m0m Exp $".
  */
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index c824474..6968ff0 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.249 2011/05/01 07:40:55 gernot2270 Exp $"
+ * "$Id: print-canon.c,v 1.523 2012/05/25 17:52:30 gernot2270 Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -67,11 +67,8 @@
 #  define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif /* !MAX */
 
-
-
-
-
-
+/* set this to 1 to see errors in make, set to 0 (normal) to avoid noise */
+#define ERRPRINT 0
 
 static int
 pack_pixels(unsigned char* buf,int len)
@@ -105,26 +102,31 @@ pack_pixels(unsigned char* buf,int len)
 }
 
 /* model peculiarities */
-#define CANON_CAP_MSB_FIRST 0x02ul    /* how to send data           */
-#define CANON_CAP_a         0x04ul
-#define CANON_CAP_b         0x08ul
-#define CANON_CAP_q         0x10ul
-#define CANON_CAP_m         0x20ul
-#define CANON_CAP_d         0x40ul
-#define CANON_CAP_t         0x80ul
-#define CANON_CAP_c         0x100ul
-#define CANON_CAP_p         0x200ul
-#define CANON_CAP_l         0x400ul
-#define CANON_CAP_r         0x800ul
-#define CANON_CAP_g         0x1000ul
-#define CANON_CAP_px        0x2000ul
-#define CANON_CAP_rr        0x4000ul
-#define CANON_CAP_I         0x8000ul
-#define CANON_CAP_T         0x10000ul /* not sure of this yet! */
-#define CANON_CAP_P         0x20000ul
-#define CANON_CAP_DUPLEX    0x40000ul
-#define CANON_CAP_XML       0x80000ul /* not sure of this yet */
-#define CANON_CAP_CARTRIDGE 0x100000ul /* not sure of this yet */
+#define CANON_CAP_MSB_FIRST  0x02ul    /* how to send data           */
+#define CANON_CAP_a          0x04ul
+#define CANON_CAP_b          0x08ul
+#define CANON_CAP_q          0x10ul
+#define CANON_CAP_m          0x20ul
+#define CANON_CAP_d          0x40ul
+#define CANON_CAP_t          0x80ul
+#define CANON_CAP_c          0x100ul
+#define CANON_CAP_p          0x200ul
+#define CANON_CAP_l          0x400ul
+#define CANON_CAP_r          0x800ul
+#define CANON_CAP_g          0x1000ul
+#define CANON_CAP_px         0x2000ul
+#define CANON_CAP_rr         0x4000ul
+#define CANON_CAP_I          0x8000ul
+#define CANON_CAP_T          0x10000ul /* not sure of this yet! */
+#define CANON_CAP_P          0x20000ul
+#define CANON_CAP_DUPLEX     0x40000ul
+#define CANON_CAP_XML        0x80000ul /* not sure of this yet */
+#define CANON_CAP_CARTRIDGE  0x100000ul /* not sure of this yet */
+#define CANON_CAP_M          0x200000ul /* not sure of this yet */
+#define CANON_CAP_S          0x400000ul /* not sure of this yet */
+#define CANON_CAP_cart       0x800000ul /* BJC printers with Color, Black, Photo options */
+#define CANON_CAP_BORDERLESS 0x1000000ul /* borderless printing */
+#define CANON_CAP_NOBLACK    0x2000000ul /* no Black cartridge selection */
 
 #define CANON_CAP_STD0 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|\
                         CANON_CAP_l|CANON_CAP_q|CANON_CAP_t)
@@ -135,9 +137,9 @@ pack_pixels(unsigned char* buf,int len)
 #include "canon-inks.h"
 #include "canon-modes.h"
 #include "canon-media.h"
+#include "canon-media-mode.h"
 #include "canon-printers.h"
 
-
 typedef struct {
     char name;
     const canon_ink_t* props;
@@ -147,13 +149,15 @@ typedef struct {
     unsigned int delay;
 } canon_channel_t;
 
-
-
 typedef struct
 {
   const canon_mode_t* mode; 
   const canon_slot_t* slot;
   const canon_paper_t *pt;
+  /* cartridge selection for CANON_CAP_T and CANON_CAP_cart */
+  const char *ink_set;
+  const canon_modeuse_t* modeuse;
+  /* final inks used for output, after selection process completed */
   unsigned int used_inks;
   int num_channels;
   int quality;
@@ -190,6 +194,19 @@ typedef struct
   double cd_outer_radius;
 } canon_privdata_t;
 
+const canon_modeuse_t* select_media_modes(stp_vars_t *v, const canon_paper_t* media_type,const canon_modeuselist_t* mlist);
+int compare_mode_valid(stp_vars_t *v,const canon_mode_t* mode,const canon_modeuse_t* muse, const canon_modeuselist_t* mlist);
+const canon_mode_t* suitable_mode_monochrome(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode);
+const canon_mode_t* find_first_matching_mode_monochrome(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode);
+const canon_mode_t* find_first_matching_mode(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode);
+const canon_mode_t* suitable_mode_color(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode);
+const canon_mode_t* find_first_matching_mode_color(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode);
+const canon_mode_t* suitable_mode_photo(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode);
+const canon_mode_t* find_first_matching_mode_photo(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode);
+const canon_mode_t* suitable_mode_general(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode);
+const char* find_ink_type(stp_vars_t *v,const canon_mode_t* mode,const char *printing_mode);
+const canon_mode_t* canon_check_current_mode(stp_vars_t *v);
+
 static void canon_write_line(stp_vars_t *v);
 
 static void canon_advance_paper(stp_vars_t *, int);
@@ -252,11 +269,16 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
     STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
+  /*
+   * Don't check this parameter.  We may offer different settings for
+   * different ink sets, but we need to be able to handle settings from PPD
+   * files that don't have constraints set up.
+   */
   {
     "InkType", N_("Ink Type"), "Color=Yes,Category=Advanced Printer Setup",
     N_("Type of ink in the printer"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
-    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
   },
   {
     "InkChannels", N_("Ink Channels"), "Color=Yes,Category=Advanced Printer Functionality",
@@ -264,10 +286,32 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
     STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
+  /*
+   * Don't check this parameter.  We may offer different settings for
+   * different ink sets, but we need to be able to handle settings from PPD
+   * files that don't have constraints set up.
+   */
   {
     "PrintingMode", N_("Printing Mode"), "Color=Yes,Category=Core Parameter",
     N_("Printing Output Mode"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
+  },
+  /*
+   * Don't check this parameter.  We may offer different settings for
+   * different ink sets, but we need to be able to handle settings from PPD
+   * files that don't have constraints set up.
+   */
+  {
+    "InkSet", N_("Ink Set"), "Color=Yes,Category=Basic Printer Setup",
+    N_("Type of inkset in the printer"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 0, 0
+  },
+  {
+    "FullBleed", N_("Borderless"), "Color=No,Category=Basic Printer Setup",
+    N_("Print without borders"),
+    STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_FEATURE,
     STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
@@ -356,7 +400,6 @@ static const float_param_t float_parameters[] =
   },
 };
 
-
 static const int float_parameter_count =
 sizeof(float_parameters) / sizeof(const float_param_t);
 
@@ -374,23 +417,23 @@ static const stp_param_string_t duplex_types[] =
 };
 #define NUM_DUPLEX (sizeof (duplex_types) / sizeof (stp_param_string_t))
 
-
-
 static const canon_paper_t *
 get_media_type(const canon_cap_t* caps,const char *name)
 {
   int i;
   if (name && caps->paperlist)
-    for (i = 0; i < caps->paperlist->count; i++)
-      {
-	/* translate paper_t.name */
-	if (!strcmp(name, caps->paperlist->papers[i].name))
-	  return &(caps->paperlist->papers[i]);
-      }
-  return &(caps->paperlist->papers[0]);
+    {
+      for (i = 0; i < caps->paperlist->count; i++)
+        {
+	  /* translate paper_t.name */
+	  if (!strcmp(name, caps->paperlist->papers[i].name))
+	    return &(caps->paperlist->papers[i]);
+        }
+      return &(caps->paperlist->papers[0]);
+    }
+  return NULL;
 }
 
-
 static const char* canon_families[] = {
  "", /* the old BJC printers */
  "S",
@@ -402,6 +445,9 @@ static const char* canon_families[] = {
  "PIXMA Pro",
  "PIXMA MG",
  "PIXMA MX",
+ "SELPHY DS",
+ "PIXMA mini",
+ "PIXMA E",
 };
 
 /* canon model ids look like the following
@@ -417,18 +463,17 @@ static char* canon_get_printername(const stp_vars_t* v)
   char* name;
   size_t len;
   if(family >= sizeof(canon_families) / sizeof(canon_families[0])){
-    stp_erprintf("canon_get_printername: no family %i using default BJC\n", family);
+    stp_eprintf(v,"canon_get_printername: no family %i using default BJC\n", family);
     family = 0;
   }
   len = strlen(canon_families[family]) + 7; /* max model nr. + terminating 0 */
   name = stp_zalloc(len);
   snprintf(name,len,"%s%u",canon_families[family],nr);
+  if (ERRPRINT)
+    stp_eprintf(v,"canon_get_printername: current printer name: %s\n", name);
   return name;
 }
 
-
-
-
 static const canon_cap_t * canon_get_model_capabilities(const stp_vars_t*v)
 {
   int i;
@@ -440,7 +485,7 @@ static const canon_cap_t * canon_get_model_capabilities(const stp_vars_t*v)
       return &(canon_model_capabilities[i]);
     }
   }
-  stp_erprintf("canon: model %s not found in capabilities list=> using default\n",name);
+  stp_eprintf(v,"canon: model %s not found in capabilities list=> using default\n",name);
   stp_free(name);
   return &(canon_model_capabilities[0]);
 }
@@ -458,28 +503,46 @@ canon_source_type(const char *name, const canon_cap_t * caps)
     return &(caps->slotlist->slots[0]);
 }
 
-
 /* function returns the current set printmode (specified by resolution) */
 /* if no mode is set the default mode will be returned */
 static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
+#if 0
     const char* input_slot = stp_get_string_parameter(v, "InputSlot");
-    const char *resolution = stp_get_string_parameter(v, "Resolution");
     const char *quality = stp_get_string_parameter(v, "Quality");
+#endif
+    const char *resolution = stp_get_string_parameter(v, "Resolution");
     const canon_cap_t * caps = canon_get_model_capabilities(v);
     const canon_mode_t* mode = NULL;
+    const char *ink_type = stp_get_string_parameter(v, "InkType");/*debug*/
+    const char *ink_set = stp_get_string_parameter(v, "InkSet");/*debug*/
     int i;
 
+  stp_dprintf(STP_DBG_CANON, v,"Entered canon_get_current_mode\n");
+  if (ERRPRINT)
+    stp_eprintf(v,"entered canon_get_current_mode\n");
+
+    if (ink_set)
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: InkSet value (high priority): '%s'\n",ink_set);
+    else
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: InkSet value is NULL\n");
+      
+    if (ink_type)
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: InkType value (low priority): '%s'\n",ink_type);
+    else
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: InkType value is NULL\n");
+
     if(resolution){
-        for(i=0;i<caps->modelist->count;i++){
+      for(i=0;i<caps->modelist->count;i++){
             if(!strcmp(resolution,caps->modelist->modes[i].name)){
                 mode = &caps->modelist->modes[i];
                 break;
             }
         }
     }
-
+#if 0
     if(!mode)
         mode = &caps->modelist->modes[caps->modelist->default_mode];
+#endif
 
 #if 0
     if(quality && strcmp(quality, "None") == 0)
@@ -502,36 +565,1929 @@ static const canon_mode_t* canon_get_current_mode(const stp_vars_t *v){
     }
 #endif
 
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: current mode is '%s'\n",resolution);
+    if (ERRPRINT)
+      stp_eprintf(v,"current mode is '%s'\n",resolution);
+    
+    return mode;
+}
 
+const canon_modeuse_t* select_media_modes(stp_vars_t *v, const canon_paper_t* media_type,const canon_modeuselist_t* mlist){
+  const canon_modeuse_t* muse = NULL;
+  int i;
+  for(i=0;i<mlist->count;i++){
+    if(!strcmp(media_type->name,mlist->modeuses[i].name)){
+      muse = &mlist->modeuses[i];
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: mode searching: assigned media '%s'\n",mlist->name);
+      if (ERRPRINT)
+	stp_eprintf(v,"mode searching: assigned media '%s'\n",mlist->name);
+      break;
+    }
+  }
+  return muse;
+}
 
+int compare_mode_valid(stp_vars_t *v,const canon_mode_t* mode,const canon_modeuse_t* muse, const canon_modeuselist_t* mlist){
+  int i=0;
+  int modecheck=1;
+  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: mode searching: assigned mode-media '%s'\n",mlist->name);
+  if (ERRPRINT)
+    stp_eprintf(v,"mode searching: assigned mode-media '%s'\n",mlist->name);
+  while (muse->mode_name_list[i]!=NULL){
+    if(!strcmp(mode->name,muse->mode_name_list[i])){
+      modecheck=0;
+      break;
+    }
+    i++;
+  }
+  return modecheck;
+}
 
+const canon_mode_t* suitable_mode_monochrome(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  int i=0;
+  int j;
+  int modefound=0;
+
+  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Entered suitable_mode_monochrome\n");
+
+  while ((muse->mode_name_list[i]!=NULL) && (modefound != 1)){
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	if ( (muse->use_flags & INKSET_BLACK_MODEREPL) ) { 
+	  /* only look at modes with MODE_FLAG_BLACK if INKSET_BLACK_MODEREPL is in force */
+	  if ( (caps->modelist->modes[j].quality >= quality) && (caps->modelist->modes[j].flags & MODE_FLAG_BLACK) ){ 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check -- rare for monochrome, cannot remember any such case */
+	      mode = &caps->modelist->modes[j];
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+	else { /* no special replacement modes for black inkset */
+	  if ( (caps->modelist->modes[j].quality >= quality) ){ 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check -- rare for monochrome, cannot remember any such case */
+	      mode = &caps->modelist->modes[j];
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+      }
+    }
+    i++;
+  }
+  return mode;
+}
 
-    return mode;
+const canon_mode_t* find_first_matching_mode_monochrome(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  /* only look at modes with MODE_FLAG_BLACK if INKSET_BLACK_MODEREPL is in force */
+  int i=0;
+  int modefound=0;
+  int j;
+
+  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+    /* pick first mode with MODE_FLAG_BLACK */
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	/* only look at modes with MODE_FLAG_BLACK if INKSET_BLACK_MODEREPL is in force */
+	if ( (caps->modelist->modes[j].flags & MODE_FLAG_BLACK) ) { 
+	  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	    /* duplex check -- rare for monochrome, cannot remember any such case */
+	    mode = &caps->modelist->modes[j];
+	    modefound=1;
+	  }
+	}
+	break; /* go to next mode in muse list */
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* find_first_matching_mode(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  int i=0;
+  int modefound=0;
+  int j;
+
+  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	  /* duplex check -- rare for monochrome, cannot remember any such case */
+	  mode = &caps->modelist->modes[j];
+	  modefound=1;
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (find_first_matching_mode): picked mode without inkset limitation (%s)\n",mode->name);
+	}
+	break; /* go to next mode in muse list */
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* suitable_mode_color(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  int i=0;
+  int j;
+  int modefound=0;
+  
+  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Entered suitable_mode_color\n");
+
+  while ((muse->mode_name_list[i]!=NULL) && (modefound != 1)){
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	if ( (muse->use_flags & INKSET_COLOR_MODEREPL) ) { 
+	  /* only look at modes with MODE_FLAG_COLOR if INKSET_COLOR_MODEREPL is in force */
+	  if ( (caps->modelist->modes[j].quality >= quality)  && (caps->modelist->modes[j].flags & MODE_FLAG_COLOR) ) { 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check */
+	      mode = &caps->modelist->modes[j];
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (suitable_mode_color): picked mode with special replacement inkset (%s)\n",mode->name);
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+	else { /* no special replacement modes for color inkset */
+	  if ( (caps->modelist->modes[j].quality >= quality) ){ 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check */
+	      mode = &caps->modelist->modes[j];
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (suitable_mode_color): picked mode without any special replacement inkset (%s)\n",mode->name);
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* find_first_matching_mode_color(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  /* only look at modes with MODE_FLAG_COLOR if INKSET_COLOR_MODEREPL is in force */
+  int i=0;
+  int modefound=0;
+  int j;
+
+  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+    /* pick first mode with MODE_FLAG_COLOR */
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	/* only look at modes with MODE_FLAG_COLOR if INKSET_COLOR_MODEREPL is in force */
+	if ( (caps->modelist->modes[j].flags & MODE_FLAG_COLOR) ) { 
+	  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	    /* duplex check */
+	    mode = &caps->modelist->modes[j];
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (find_first_matching_mode_color): picked first mode with special replacement inkset (%s)\n",mode->name);
+	    modefound=1;
+	  }
+	}
+	break; /* go to next mode in muse list */
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* suitable_mode_photo(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  int i=0;
+  int j;
+  int modefound=0;
+
+  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Entered suitable_mode_photo\n");
+  
+  while ((muse->mode_name_list[i]!=NULL) && (modefound != 1)){
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	if ( (muse->use_flags & INKSET_PHOTO_MODEREPL) ) { 
+	  /* only look at modes with MODE_FLAG_PHOTO if INKSET_PHOTO_MODEREPL is in force */
+	  if ( (caps->modelist->modes[j].quality >= quality)  && (caps->modelist->modes[j].flags & MODE_FLAG_PHOTO) ) { 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check */
+	      mode = &caps->modelist->modes[j];
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+	else { /* if no special replacement modes for photo inkset */
+	  if ( (caps->modelist->modes[j].quality >= quality) ){ 
+	    /* keep setting the mode until lowest matching quality is found */
+	    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	      /* duplex check */
+	      mode = &caps->modelist->modes[j];
+	      modefound=1;
+	    }
+	  }
+	  break; /* go to next mode in muse list */
+	}
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* find_first_matching_mode_photo(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  /* only look at modes with MODE_FLAG_PHOTO if INKSET_PHOTO_MODEREPL is in force */
+  int i=0;
+  int modefound=0;
+  int j;
+  
+  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+    /* pick first mode with MODE_FLAG_PHOTO */
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	/* only look at modes with MODE_FLAG_PHOTO if INKSET_PHOTO_MODEREPL is in force */
+	if ( (caps->modelist->modes[j].flags & MODE_FLAG_PHOTO) ) { 
+	  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	    /* duplex check */
+	    mode = &caps->modelist->modes[j];
+	    modefound=1;
+	  }
+	}
+	break; /* go to next mode in muse list */
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const canon_mode_t* suitable_mode_general(stp_vars_t *v,const canon_modeuse_t* muse,const canon_cap_t *caps,int quality,const char *duplex_mode) {
+  const canon_mode_t* mode=NULL;
+  int i=0;
+  int j;
+  int modefound=0;
+
+  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Entered suitable_mode_general\n");
+  
+  while ((muse->mode_name_list[i]!=NULL) && (modefound != 1)){
+    for(j=0;j<caps->modelist->count;j++){
+      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+	if ( (caps->modelist->modes[j].quality >= quality) ) { 
+	  /* keep setting the mode until lowest matching quality is found */
+	  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+	    /* duplex check */
+	    mode = &caps->modelist->modes[j];
+	    modefound=1;
+	  }
+	}
+	break; /* go to next mode in muse list */
+      }
+    }
+    i++;
+  }
+  return mode;
+}
+
+const char* find_ink_type(stp_vars_t *v,const canon_mode_t* mode,const char *printing_mode) {
+  int i,inkfound;
+  const char *ink_type = stp_get_string_parameter(v, "InkType");
+
+  /* if InkType does not match that of mode, change InkType to match it */
+  /* choose highest color as default, as there is only one option for Black */
+  /* if InkType does not match that of mode, change InkType to match it */
+  /* choose highest color as default, as there is only one option for Black */
+  if (printing_mode && !strcmp(printing_mode,"BW")) {
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+    stp_set_string_parameter(v, "InkType", "Gray");
+    ink_type = stp_get_string_parameter(v, "InkType");
+  } else {
+    inkfound=0;
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+	if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+	  inkfound=1;
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+	  ink_type = stp_get_string_parameter(v, "InkType");
+	  break;
+	}
+      }
+    }
+    /* if no match found choose first available inkset */
+    if (inkfound==0) {
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+	  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	    inkfound=1; /* set */
+	    break;
+	  }
+	}
+      }
+    }
+  }
+  return ink_type;
+}
+
+/* function checks printmode (specified by resolution) */
+/* and substitutes a mode if needed. NULL is returned for now */
+const canon_mode_t* canon_check_current_mode(stp_vars_t *v){
+#if 0
+  const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+  const char *quality = stp_get_string_parameter(v, "Quality");
+#endif
+  const char *resolution = stp_get_string_parameter(v, "Resolution");
+  const char *ink_set = stp_get_string_parameter(v, "InkSet");
+  const char *duplex_mode = stp_get_string_parameter(v, "Duplex");
+  const char *ink_type = stp_get_string_parameter(v, "InkType");
+  const char *printing_mode = stp_get_string_parameter(v, "PrintingMode");
+  const canon_cap_t * caps = canon_get_model_capabilities(v);
+  const canon_mode_t* mode = NULL;
+  const canon_modeuselist_t* mlist = caps->modeuselist;
+  const canon_modeuse_t* muse = NULL;
+  const canon_paper_t* media_type = get_media_type(caps,stp_get_string_parameter(v, "MediaType"));
+  int i,j;
+  int modecheck, quality, modefound;
+#if 0
+  int inkfound;
+#endif
+
+  stp_dprintf(STP_DBG_CANON, v,"Entered canon_check_current_mode: got PrintingMode %s\n",printing_mode);
+  if (ERRPRINT)
+    stp_eprintf(v,"entered canon_check_current_mode: got PrintingMode %s\n",printing_mode);
+
+  /* Logic: priority of options
+     1. Media --- always present for final selection.
+     2. InkSet (cartridge selection) --- optional as only some printers offer this.
+     3. PrintingMode --- for printers which have K-only monochrome modes can choose BW.
+     4. Duplex --- for printers that have special duplex modes need to skip non-duplex modes.
+     5. InkType --- suggestion only, since modes are tied to ink types in most Canon printers.
+     6. Quality --- suggestion, based on initially-selected mode.
+     7. Mode --- once chosen, InkType is selected based on quality, inkset, printing mode.
+  */
+
+  /*
+    canon-mode-media:
+    INKSET_BLACK_SUPPORT: media type supports black-only cartridge
+    INKSET_COLOR_SUPPORT: media type supports color-only cartridge
+    INKSET_BLACK_MODEREPL: media type has special modes for black-only cartridge
+    INKSET_COLOR_MODEREPL: media type has special modes for black-only cartridge
+    INKSET_PHOTO_SUPPORT: media type supports special photo cartridge
+    DUPLEX_MODEREPL: media type has (a) special mode(s) for duplex
+    canon-modes.h:
+    MODE_FLAG_BLACK: mode can be used for supporting black-only cartridge
+    MODE_FLAG_COLOR: mode can be used for supporting color-only cartridge
+    MODE_FLAG_PHOTO: mode can be used for supporting photo cartridge
+    MODE_FLAG_NOPDUPLEX: mode cannot be used for duplex, must be skipped
+  */
+
+  if(resolution){
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- (Initial) Resolution already known: '%s'\n",resolution);
+    if (ERRPRINT)
+      stp_eprintf(v,"check_current_mode --- (Initial) Resolution already known: '%s'\n",resolution);
+    for(i=0;i<caps->modelist->count;i++){
+      if(!strcmp(resolution,caps->modelist->modes[i].name)){
+	mode = &caps->modelist->modes[i];
+	break;
+      }
+    }
+  }
+  else {
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- (Initial) Resolution not yet known \n");
+    if (ERRPRINT)
+      stp_eprintf(v,"check_current_mode --- (Initial) Resolution not yet known \n");
+  }
+    
+  if (ink_set)
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: (Initial) InkSet value (high priority): '%s'\n",ink_set);
+  else
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: (Initial) InkSet value is NULL\n");
+  
+  if (ink_type)
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: (Initial) InkType value (low priority): '%s'\n",ink_type);
+  else
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: (Initial) InkType value is NULL\n");
+
+  /* beginning of mode replacement code */
+  if (media_type && resolution && mode) {
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- Resolution, Media, Mode all known \n");
+    if (ERRPRINT)
+      stp_eprintf(v,"check_current_mode --- Resolution, Media, Mode all known \n");
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: media type selected: '%s'\n",media_type->name);
+    if (ERRPRINT)
+      stp_eprintf(v,"media type selected: '%s'\n",media_type->name);
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: (Inital) Gutenprint: mode initally active: '%s'\n",mode->name);
+    if (ERRPRINT)
+      stp_eprintf(v,"(Inital) mode initially active: '%s'\n",mode->name);
+      
+    /* scroll through modeuse list to find media */
+    muse = select_media_modes(v,media_type,mlist);
+
+    /* now scroll through to find if the mode is in the modeuses list */
+    modecheck=compare_mode_valid(v,mode,muse,mlist);
+
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: modecheck value: '%i'\n",modecheck);
+    if (ERRPRINT)
+      stp_eprintf(v,"modecheck value: '%i'\n",modecheck);
+            
+    /* if we did not find a valid mode, need to replace it */
+    if (modecheck!=0) {
+
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (check_current_mode): no suitable mode exists, need to find a mode\n");
+      quality = mode->quality;
+      /* Black InkSet */
+      if (ink_set && !strcmp(ink_set,"Black"))  {
+	stp_set_string_parameter(v, "PrintingMode","BW");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	if (!(mode->ink_types & CANON_INK_K)) {
+	  /* need a new mode: 
+	     loop through modes in muse list searching for a matching inktype, comparing quality
+	  */
+	  mode=suitable_mode_monochrome(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media matching the InkSet limitation */
+	    if ( (muse->use_flags & INKSET_BLACK_MODEREPL) ) {  
+	      mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for black inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Black): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected K inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  mode=suitable_mode_monochrome(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media matching the InkSet limitation */
+	    if ( (muse->use_flags & INKSET_BLACK_MODEREPL) ) {
+	    mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for black inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif
+	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Black): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+      } /* End of Black Inkset */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* Color InkSet */
+      /* Added limitation: "Color" for BJC corresponds to "Both" on other types */
+      else if ( (ink_set && !strcmp(ink_set,"Color")) && (caps->features & CANON_CAP_T) ) {
+	stp_set_string_parameter(v, "PrintingMode","Color");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	if (!(mode->ink_types & CANON_INK_CMY)) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): inkset incorrect for Color cartridge---need new mode\n");
+	  /* need a new mode
+	     loop through modes in muse list searching for a matching inktype, comparing quality
+	  */
+	  mode=suitable_mode_color(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_COLOR_MODEREPL) ) {  
+	      mode=find_first_matching_mode_color(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode for color inkset (%s)\n",mode->name);
+	    }
+	    else {  /* no special replacement modes for color inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode with no special replacement modes for color inkset (%s)\n",mode->name);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected RGB inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): inkset OK but need to check other parameters\n");
+	  mode=suitable_mode_color(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_COLOR_MODEREPL) ) {
+	      mode=find_first_matching_mode_color(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode for color inkset (%s)\n",mode->name);
+	    }
+	    else {  /* no special replacement modes for color inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode with no special replacement modes for color inkset (%s)\n",mode->name);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+      }  /* end of Color InkSet */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* Photo cartridge selection: only use modes that support it */
+      else if (ink_set && !strcmp(ink_set,"Photo")) {
+	/* Photo cartridge printing does not seem to have any monochrome option */
+	stp_set_string_parameter(v, "PrintingMode","Color");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	/* need to match photo cartridge mode flag */
+	if (!(mode->flags & MODE_FLAG_PHOTO)) {
+	  /* need a new mode
+	     loop through modes in muse list searching for a matching inkset, comparing quality
+	  */
+	  mode=suitable_mode_photo(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_PHOTO_MODEREPL) ) {
+	      mode=find_first_matching_mode_photo(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for photo inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  mode=suitable_mode_photo(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_PHOTO_MODEREPL) ) {
+	      mode=find_first_matching_mode_photo(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for photo inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+
+#endif
+
+	} 
+      } /* end of Photo Inkset  */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* no restrictions for InkSet "Both" (non-BJC) or "Color" (BJC) or if no InkSet set yet --- do not worry about InkSet at all */
+      else {
+	if (printing_mode && !strcmp(printing_mode,"Color")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode Color\n");
+	  /* must skip K-only inksets if they exist: they only exist if the option "BW" is also declared but we cannot check if an option exists or not */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	  i=0;
+	  quality = mode->quality;
+	  modefound=0;
+	  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	    for(j=0;j<caps->modelist->count;j++){
+	      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		if ( (caps->modelist->modes[j].quality >= quality) ) {
+		  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		    /* duplex check */
+		    if (caps->modelist->modes[j].ink_types > CANON_INK_K) {
+		      mode = &caps->modelist->modes[j];
+		      modefound=1;
+		    }
+		  }
+		}
+		break; /* go to next mode in muse list */
+	      }
+	    }
+	    i++;
+	  }
+	  /*}*/
+	}
+	else if (printing_mode && !strcmp(printing_mode,"BW")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode BW\n");
+	  /* need to find K-only inksets: they must exist since we declared the printer to have this capability! */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	  i=0;
+	  quality = mode->quality;
+	  modefound=0;
+	  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	    for(j=0;j<caps->modelist->count;j++){
+	      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		if ( (caps->modelist->modes[j].quality >= quality) ) {
+		  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		    /* duplex check */
+		    if (caps->modelist->modes[j].ink_types & CANON_INK_K) { /* AND means support for CANON_IN_K is included */
+		      mode = &caps->modelist->modes[j];
+		      modefound=1;
+		    }
+		  }
+		}
+		break; /* go to next mode in muse list */
+	      }
+	    }
+	    i++;
+	  }
+	  /*}*/
+	}
+	else { /* no restriction from PrintingMode if not set yet */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode not set yet\n");
+	  /* if mode is not a matching duplex mode, need to find a new one */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	  i=0;
+	  quality = mode->quality;
+	  modefound=0;
+	  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	    for(j=0;j<caps->modelist->count;j++){
+	      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		if ( (caps->modelist->modes[j].quality >= quality) ) {
+		  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		    /* duplex check */
+		    mode = &caps->modelist->modes[j];
+		    modefound=1;
+		  }
+		}
+		break; /* go to next mode in muse list */
+	      }
+	    }
+	    i++;
+	  }
+	  /*}*/
+	}
+	/* if no mode was found yet, repeat with no restrictions --- since some media may not allow PrintingMode to be what was selected */
+	/*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	if (modefound==0) {
+	  i=0;
+	  quality = mode->quality;
+	  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	    for(j=0;j<caps->modelist->count;j++){
+	      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		if ( (caps->modelist->modes[j].quality >= quality) ) {
+		  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		    /* duplex check */
+		    mode = &caps->modelist->modes[j];
+		    modefound=1;
+		    /* set PrintingMode to whatever the mode is capable of */
+		    if (caps->modelist->modes[j].ink_types > CANON_INK_K) {
+		      stp_set_string_parameter(v,"PrintingMode","Color");
+		      printing_mode = stp_get_string_parameter(v, "PrintingMode");
+		      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode set to Color\n");
+		    } else {
+		      stp_set_string_parameter(v,"PrintingMode","BW");
+		      printing_mode = stp_get_string_parameter(v, "PrintingMode");
+		      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode set to BW\n");
+		    }
+		  }
+		}
+		break; /* go to next mode in muse list */
+	      }
+	    }
+	    i++;
+	  }
+	}
+
+	ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	/* if InkType does not match that of mode, change InkType to match it */
+	/* choose highest color as default, as there is only one option for Black */
+	/* if InkType does not match that of mode, change InkType to match it */
+	/* choose highest color as default, as there is only one option for Black */
+	if (printing_mode && !strcmp(printing_mode,"BW")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	  stp_set_string_parameter(v, "InkType", "Gray");
+	  ink_type = stp_get_string_parameter(v, "InkType");
+	} else {
+	  inkfound=0;
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+	      if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		inkfound=1;
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+	  /* if no match found choose first available inkset */
+	  if (inkfound==0) {
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  inkfound=1; /* set */
+		  break;
+		}
+	      }
+	    }
+	  }
+	}
+#endif
+
+	/* end of cartridge option block */
+	
+	stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: mode searching: replaced mode with: '%s'\n",mode->name);
+	if (ERRPRINT)
+	  stp_eprintf(v,"mode searching: replaced mode with: '%s'\n",mode->name);
+	
+#if 0
+	/* set InkType for the mode decided upon */
+	for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	  if (mode->ink_types & canon_inktypes[i].ink_type) {
+	    if (strcmp(ink_type,canon_inktypes[i].name)) {
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (Mode found): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	      stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+	      ink_type = stp_get_string_parameter(v, "InkType");
+	      break;
+	    }
+	  }
+	}
+#endif
+	
+      }
+    }/* added one here */
+    else { /* we did find the mode in the list for media, so it should take precedence over other settings, as it is more specific. */
+
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (check_current_mode):  mode exists, need to check for consistency (%s)\n",mode->name);
+      quality = mode->quality;
+      /* Black InkSet */
+      if (ink_set && !strcmp(ink_set,"Black")) {
+	stp_set_string_parameter(v, "PrintingMode","BW");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	if (!(mode->ink_types & CANON_INK_K)) {
+	  /* need a new mode: 
+	     loop through modes in muse list searching for a matching inktype, comparing quality
+	  */
+	  mode=suitable_mode_monochrome(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_BLACK_MODEREPL) ) {  
+	      mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for black inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0	  
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Black): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected K inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  mode=suitable_mode_monochrome(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_BLACK_MODEREPL) ) {  
+	      mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for black inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Black): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+      } /* End of Black Inkset */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* InkSet Color */
+      else if ( (ink_set && !strcmp(ink_set,"Color")) && (caps->features & CANON_CAP_T) ) {
+	stp_set_string_parameter(v, "PrintingMode","Color");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	if (!(mode->ink_types & CANON_INK_CMY)) { /* Color InkSet */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): inkset incorrect for Color cartridge---need new mode\n");
+	  /* need a new mode
+	     loop through modes in muse list searching for a matching inktype, comparing quality
+	  */
+	  mode=suitable_mode_color(v,muse,caps,quality,duplex_mode);
+
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_COLOR_MODEREPL) ) {  
+	      mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode for color inkset (%s)\n",mode->name);
+	    }
+	    else {  /* no special replacement modes for color inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode with no special replacement modes for color inkset (%s)\n",mode->name);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected RGB inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): inkset OK but need to check other parameters\n");
+	  mode=suitable_mode_color(v,muse,caps,quality,duplex_mode); /* something wrong here!!! */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): returned mode for color inkset: %s\n",mode->name);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_COLOR_MODEREPL) ) {
+	      mode=find_first_matching_mode_monochrome(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode for color inkset (%s)\n",mode->name);
+	    }
+	    else {  /* no special replacement modes for color inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): Decided on first matching mode with no special replacement modes for color inkset (%s)\n",mode->name);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+      } /* End of Color Inkset */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* Photo cartridge selection: only use modes that support it */
+      else if (ink_set && !strcmp(ink_set,"Photo")) {
+	/* Photo cartridge printing does not seem to have any monochrome option */
+	stp_set_string_parameter(v, "PrintingMode","Color");
+	printing_mode = stp_get_string_parameter(v, "PrintingMode");
+	/* need to match photo cartridge mode flag */
+	if (!(mode->flags & MODE_FLAG_PHOTO)) {
+	  /* need a new mode
+	     loop through modes in muse list searching for a matching inkset, comparing quality
+	  */
+	  mode=suitable_mode_photo(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_PHOTO_MODEREPL) ) {  
+	      mode=find_first_matching_mode_photo(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for photo inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	}
+	else {
+	  /* mode is fine */
+	  /* matched expected inkset, but need to check if Duplex matches, and if not, get a new mode with right inkset */
+	  mode=suitable_mode_photo(v,muse,caps,quality,duplex_mode);
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  if (modefound == 0) { /* still did not find a mode: pick first one for that media */
+	    if ( (muse->use_flags & INKSET_PHOTO_MODEREPL) ) {
+	      mode=find_first_matching_mode_photo(v,muse,caps,duplex_mode);
+	    }
+	    else {  /* no special replacement modes for photo inkset */
+	      mode=find_first_matching_mode(v,muse,caps,duplex_mode);
+	    }
+	  }
+	  if (!mode)
+	    modefound=0;
+	  else
+	    modefound=1;
+
+	  ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  /* if InkType does not match that of mode, change InkType to match it */
+	  /* choose highest color as default, as there is only one option for Black */
+	  if (printing_mode && !strcmp(printing_mode,"BW")) {
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	    stp_set_string_parameter(v, "InkType", "Gray");
+	    ink_type = stp_get_string_parameter(v, "InkType");
+	  } else {
+	    inkfound=0;
+	    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		  inkfound=1;
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  break;
+		}
+	      }
+	    }
+	    /* if no match found choose first available inkset */
+	    if (inkfound==0) {
+	      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+		if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		  if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		    stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		    ink_type = stp_get_string_parameter(v, "InkType");
+		    inkfound=1; /* set */
+		    break;
+		  }
+		}
+	      }
+	    }
+	  }
+#endif	  
+#if 0
+	  /* set InkType for the mode found */
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) {
+	      if (strcmp(ink_type,canon_inktypes[i].name)) { /* if InkType does not match selected mode ink type*/
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Color): InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+#endif
+
+	} 
+      } /* end of Photo Inkset  */
+      /*-------------------------------------------------------------------------------------------------*/
+      /* no restrictions for InkSet "Both" (non-BJC) or "Color" (BJC) or if no InkSet set yet */
+      else {
+	if (printing_mode && !strcmp(printing_mode,"Color")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode Color\n");
+	  /* must skip K-only inksets if they exist: they only exist if the option "BW" is also declared but we cannot check if an option exists or not */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	    i=0;
+	    quality = mode->quality;
+	    modefound=0;
+	    while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	      for(j=0;j<caps->modelist->count;j++){
+		if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		  if ( (caps->modelist->modes[j].quality >= quality) ) {
+		    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		      /* duplex check */
+		      if (caps->modelist->modes[j].ink_types > CANON_INK_K) {
+			if (!strcmp(mode->name,caps->modelist->modes[j].name)) {
+			  mode = &caps->modelist->modes[j];
+			  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) Color: Decided on mode (%s)\n",mode->name);
+			  modefound=1;
+			}
+		      }
+		    }
+		  }
+		  break; /* go to next mode in muse list */
+		}
+	      }
+	      i++;
+	    }
+	    /*}*/
+	}
+	else if (printing_mode && !strcmp(printing_mode,"BW")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode BW\n");
+	  /* need to find K-only inksets: they must exist since we declared the printer to have this capability! */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	    i=0;
+	    quality = mode->quality;
+	    modefound=0;
+	    while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	      for(j=0;j<caps->modelist->count;j++){
+		if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		  if ( (caps->modelist->modes[j].quality >= quality) ) {
+		    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		      /* duplex check */
+		      if (caps->modelist->modes[j].ink_types & CANON_INK_K) { /* AND means CANON_INK_K is included in the support */
+			if (!strcmp(mode->name,caps->modelist->modes[j].name)) {
+			  mode = &caps->modelist->modes[j];
+			  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) BW: Decided on mode (%s)\n",mode->name);
+			  modefound=1;
+			}
+		      }
+		    }
+		  }
+		  break; /* go to next mode in muse list */
+		}
+	      }
+	      i++;
+	    }
+	    /*}*/
+	}
+	else { /* no restriction from PrintingMode if not set yet */
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode not set yet\n");
+	  /* if mode is not a matching duplex mode, need to find a new one */
+	  /*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	    i=0;
+	    quality = mode->quality;
+	    modefound=0;
+	    while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	      for(j=0;j<caps->modelist->count;j++){
+		if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		  if ( (caps->modelist->modes[j].quality >= quality) ) {
+		    if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		      /* duplex check */
+		      if (!strcmp(mode->name,caps->modelist->modes[j].name)) {
+			mode = &caps->modelist->modes[j];
+			stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode not set yet: Decided on first matching mode with quality match (%s)\n",mode->name);
+			modefound=1;
+		      }
+		    }
+		  }
+		  break; /* go to next mode in muse list */
+		}
+	      }
+	      i++;
+	    }
+	    /*}*/
+	}
+	/* if no mode was found yet, repeat with no restrictions --- since some media may not allow PrintingMode to be what was selected */
+	/*if ( (duplex_mode) || (mode->flags & MODE_FLAG_NODUPLEX) ) {*/
+	if (modefound==0) {
+	  i=0;
+	  quality = mode->quality;
+	  while ( (muse->mode_name_list[i]!=NULL)  && (modefound != 1) ) {
+	    for(j=0;j<caps->modelist->count;j++){
+	      if(!strcmp(muse->mode_name_list[i],caps->modelist->modes[j].name)){/* find right place in canon-modes list */
+		if ( (caps->modelist->modes[j].quality >= quality) ) {
+		  if ( !(duplex_mode) || !(muse->use_flags & DUPLEX_SUPPORT) || !(caps->modelist->modes[j].flags & MODE_FLAG_NODUPLEX) ) {
+		    /* duplex check */
+		    mode = &caps->modelist->modes[j];
+		    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) No mode previously found---catch-all: Decided on first matching mode (%s)\n",mode->name);
+		    modefound=1;
+		    /* set PrintingMode to whatever the mode is capable of */
+		    if (caps->modelist->modes[j].ink_types > CANON_INK_K){
+		      stp_set_string_parameter(v,"PrintingMode","Color");
+		      printing_mode = stp_get_string_parameter(v, "PrintingMode");
+		      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode set to Color\n");
+		    } else {
+		      stp_set_string_parameter(v,"PrintingMode","BW");
+		      printing_mode = stp_get_string_parameter(v, "PrintingMode");
+		      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both) PrintingMode set to BW\n");
+		    }
+		  }
+		}
+		break; /* go to next mode in muse list */
+	      }
+	    }
+	    i++;
+	  }
+	}
+
+	ink_type=find_ink_type(v,mode,printing_mode);
+#if 0
+	/* if InkType does not match that of mode, change InkType to match it */
+	/* choose highest color as default, as there is only one option for Black */
+	/* if InkType does not match that of mode, change InkType to match it */
+	/* choose highest color as default, as there is only one option for Black */
+	if (printing_mode && !strcmp(printing_mode,"BW")) {
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType changed to %u (%s)\n",CANON_INK_K, "Gray");
+	  stp_set_string_parameter(v, "InkType", "Gray");
+	  ink_type = stp_get_string_parameter(v, "InkType");
+	} else {
+	  inkfound=0;
+	  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType of mode %s is currently set as %s\n",mode->name,ink_type);
+	  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	    if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+	      if ( !(strcmp(ink_type,canon_inktypes[i].name))) {
+		inkfound=1;
+		stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): InkType match found %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		ink_type = stp_get_string_parameter(v, "InkType");
+		break;
+	      }
+	    }
+	  }
+	  /* if no match found choose first available inkset */
+	  if (inkfound==0) {
+	    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	      if (mode->ink_types & canon_inktypes[i].ink_type) { /* a mode can have several ink_types: must compare with ink_type if set */
+		if ((!ink_type) || (strcmp(ink_type,canon_inktypes[i].name))) { /* if InkType does not match selected mode ink type*/
+		  stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint (InkSet:Both): No match found---InkType changed to %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+		  stp_set_string_parameter(v, "InkType", canon_inktypes[i].name);
+		  ink_type = stp_get_string_parameter(v, "InkType");
+		  inkfound=1; /* set */
+		  break;
+		}
+	      }
+	    }
+	  }
+	}
+#endif
+      }
+    }
+  }
+  /* end of mode replacement code */
+
+
+#if 0
+  if(quality && strcmp(quality, "None") == 0)
+    quality = "Standard";
+
+  if(quality && !strcmp(quality,"Standard")){
+    return &caps->modelist->modes[caps->modelist->default_mode];
+  }
+#endif
+
+#if 0
+  /* only some modes can print to cd */
+  if(input_slot && !strcmp(input_slot,"CD") && !(mode->flags & MODE_FLAG_CD)){
+    for(i=0;i<caps->modelist->count;i++){
+      if(caps->modelist->modes[i].flags & MODE_FLAG_CD){
+	mode = &caps->modelist->modes[i];
+	break;
+      }
+    }
+  }
+#endif
+
+
+  if (mode) {
+    stp_set_string_parameter(v, "Resolution",mode->text);  /* check_current_mode checks resolution! */
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- updated Resolution: '%s'\n",mode->name);
+  }
+
+  if (mode) {
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- Final returned mode: '%s'\n",mode->name);
+    if (ERRPRINT)
+      stp_eprintf(v,"check_current_mode --- Final returned mode: '%s'\n",mode->name);
+  }
+  else {
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  check_current_mode --- Final returned mode is NULL \n");
+    if (ERRPRINT)
+      stp_eprintf(v,"check_current_mode --- Final returned mode is NULL \n");
+  }
+
+  /* set PrintingMode in case of Inkset precedence */
+  if (mode) { /* final mode takes precedence */
+    if (mode->ink_types == CANON_INK_K)
+      stp_set_string_parameter(v, "PrintingMode", "BW");
+    else
+      stp_set_string_parameter(v, "PrintingMode", "Color");
+  }
+  else if (ink_type) { /* mode not yet known, but InkType known. InkSet should have been handled together with InkType above */
+    if (!strcmp(ink_type,"Gray"))
+      stp_set_string_parameter(v, "PrintingMode", "BW");
+    else
+      stp_set_string_parameter(v, "PrintingMode", "Color");
+  }
+
+  if (printing_mode)
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final PrintingMode %s\n",printing_mode);
+  else /* should not happen */
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final PrintingMode is NULL\n");
+
+  if (ink_set)
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final InkSet value (high priority): '%s'\n",ink_set);
+  else
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final InkSet value is NULL\n");
+  
+  if (ink_type)
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final InkType value (low priority): '%s'\n",ink_type);
+  else
+    stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint: Final InkType value is NULL\n");
+
+  return mode;
 }
 
 /* function returns the best ink_type for the current mode */
 static unsigned int
 canon_printhead_colors(const stp_vars_t*v)
 {
-  int i;
+  int i,j;
   const canon_mode_t* mode;
+  const canon_cap_t * caps = canon_get_model_capabilities(v);
   const char *print_mode = stp_get_string_parameter(v, "PrintingMode");
   const char *ink_type = stp_get_string_parameter(v, "InkType");
-  if(print_mode && strcmp(print_mode, "BW") == 0)
+  const char *ink_set = stp_get_string_parameter(v, "InkSet");
+
+  stp_dprintf(STP_DBG_CANON, v,"Entered canon_printhead_colors: got PrintingMode %s\n",print_mode);
+  if (ERRPRINT)
+    stp_eprintf(v,"entered canon_printhead_colors: got PrintingMode %s\n",print_mode);
+
+  /* if a mode is available, use it. Else mode is NULL */
+  if (ERRPRINT)
+    stp_eprintf(v,"Calling get_current_parameter from canon_printhead_colors");
+  mode = canon_get_current_mode(v);
+  
+  /* get the printing mode again */
+  print_mode = stp_get_string_parameter(v, "PrintingMode");
+
+  /* if the printing mode was already selected as BW, accept it */
+  if(print_mode && !strcmp(print_mode, "BW") && !(caps->features & CANON_CAP_NOBLACK) ){ /* workaround in case BW is a default */
+    stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[BW]) Found InkType %u (CANON_INK_K)\n",CANON_INK_K);
+    stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[BW]) NOBLACK? %lu\n",(caps->features & CANON_CAP_NOBLACK));
+    if (ERRPRINT) {
+      stp_eprintf(v,"(canon_printhead_colors[BW]) Found InkType %u (CANON_INK_K)\n",CANON_INK_K);
+      stp_eprintf(v,"(canon_printhead_colors[BW]) NOBLACK? %lu\n",(caps->features & CANON_CAP_NOBLACK));
+    }
     return CANON_INK_K;
+  }
+  /* alternatively, if the cartridge selection is in force, and black cartride is selected, accept it */
+  if(ink_set && !strcmp(ink_set, "Black")){
+    stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[BW]) Found InkSet black selection\n");
+    if (ERRPRINT)
+      stp_eprintf(v,"(canon_printhead_colors[BW]) Found InkSet black selection\n");
+    return CANON_INK_K;
+  }
+  
+  /* originaly finds selected InkType of form: CANON_INK_<inks> */
+  /* but this is incorrect, since it does not check media or mode */
+  /* change: deal with mode set and mode not set cases */
+
+  /* if mode was already set, then return the ink types for only that mode */
 
-  if(ink_type){
+  if (mode) {
+    /* if an inktype selected check what it is */
+    if(ink_type){
       for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
-          if(ink_type && !strcmp(canon_inktypes[i].name,ink_type))
-              return canon_inktypes[i].ink_type;
-     }
+	if (mode->ink_types & canon_inktypes[i].ink_type) {
+	  stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[inktype]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  if (ERRPRINT)
+	    stp_eprintf(v,"(canon_printhead_colors[inktype]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  return canon_inktypes[i].ink_type;
+	}
+      }
+    }
+    else {
+      /* find the matching inks for the mode: chooses the first one found for a mode! */
+      /* ink types are arranged in decreasing order so those with more meta inks are discovered first */
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	if(mode->ink_types & canon_inktypes[i].ink_type) {
+	  stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[mode]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  if (ERRPRINT)
+	    stp_eprintf(v,"(canon_printhead_colors[mode]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  return canon_inktypes[i].ink_type;
+	}
+      }
+    }
   }
-  mode = canon_get_current_mode(v);
-  for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
-    if(mode->ink_types & canon_inktypes[i].ink_type)
-        return canon_inktypes[i].ink_type;
+  else { /* mode not yet set */
+    /* if an inktype selected check what it is */
+    if(ink_type){
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	if(ink_type && !strcmp(canon_inktypes[i].name,ink_type)) {
+	  stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[inktype]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  if (ERRPRINT)
+	    stp_eprintf(v,"(canon_printhead_colors[inktype]) Found InkType %i(%s)\n",canon_inktypes[i].ink_type,canon_inktypes[i].name);
+	  return canon_inktypes[i].ink_type;
+	}
+      }
+    }
+    else { /* no ink type selected yet */
+      if (ERRPRINT)
+	stp_eprintf(v,"canon_printhead_colors: no mode and no inktype: we have to choose the highest one to return\n");
+      /* loop through all modes, and return the highest inktype found */
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	for(j=0;j<caps->modelist->count;j++){
+	  if(caps->modelist->modes[j].ink_types & canon_inktypes[i].ink_type){
+	    stp_dprintf(STP_DBG_CANON, v," highest inktype found ---  %s(%s)\n",canon_inktypes[i].name,canon_inktypes[i].text);
+	    if (ERRPRINT)
+	      stp_eprintf(v,"highest inktype found --- %s(%s)\n",canon_inktypes[i].name,canon_inktypes[i].text);
+	    return canon_inktypes[i].ink_type;
+	  }
+	}
+      }
+    }
+    
+  }
+
+  /* originally as fallback choose CANON_INK_K */
+  /* However, some Canon printers do not have monochrome mode at all, only color meta ink modes, like iP6000 series */
+#if 0
+  stp_dprintf(STP_DBG_CANON, v,"(canon_printhead_colors[fall-through]) Returning InkType %i(CANON_INK_K)\n",CANON_INK_K);
+  if (ERRPRINT)
+    stp_eprintf(v,"(canon_printhead_colors[fall-through]) Found InkType %i(CANON_INK_K)\n",CANON_INK_K);
+  return CANON_INK_K;
+#endif
+  /* new fallback: loop through ink type in reverse order, picking first one found, which if CANON_INK_K is supported will be that, else the lowest amount of color */
+  for(i=((sizeof(canon_inktypes)/sizeof(canon_inktypes[0]))-1);i>=0;i--){
+    for(j=0;j<caps->modelist->count;j++){
+      if(caps->modelist->modes[j].ink_types & canon_inktypes[i].ink_type){
+	stp_dprintf(STP_DBG_CANON, v," lowest inktype found ---  %s(%s)\n",canon_inktypes[i].name,canon_inktypes[i].text);
+	if (ERRPRINT)
+	  stp_eprintf(v,"lowest inktype found --- %s(%s)\n",canon_inktypes[i].name,canon_inktypes[i].text);
+	return canon_inktypes[i].ink_type;
+      }
+    }
   }
+
+  /* if fails until here, return something reasonable in most situations */
   return CANON_INK_K;
+  
 }
 
 static unsigned char
@@ -553,22 +2509,42 @@ canon_size_type(const stp_vars_t *v, const canon_cap_t * caps)
       if (!strcmp(name,"Legal"))       return 0x0f;
       if (!strcmp(name,"Tabloid"))     return 0x11; /* 11x17 */
       if (!strcmp(name,"w283h420"))    return 0x14; /* Hagaki */
-      if (!strcmp(name,"COM10"))       return 0x16;
-      if (!strcmp(name,"DL"))          return 0x17;
-      if (!strcmp(name,"LetterExtra")) return 0x2a;
-      if (!strcmp(name,"A4Extra"))     return 0x2b;
+      /*      if (!strcmp(name,"COM10"))       return 0x16;*/
+      /*      if (!strcmp(name,"DL"))          return 0x17;*/
+      if (!strcmp(name,"LetterExtra")) return 0x2a; /* Letter navi --- Letter+ */
+      if (!strcmp(name,"A4Extra"))     return 0x2b; /* A4navi --- A4+ */
       if (!strcmp(name,"A3plus"))      return 0x2c; /* A3navi --- A3+ */
-      if (!strcmp(name,"w288h144"))    return 0x2d;
+      if (!strcmp(name,"w288h144"))    return 0x2d; /* ??? */
+      if (!strcmp(name,"COM10"))       return 0x2e; /* US Comm #10 Env */
+      if (!strcmp(name,"DL"))          return 0x2f; /* Euro DL Env */
+      if (!strcmp(name,"w297h666"))    return 0x30; /* Western Env #4 (you4) */
+      if (!strcmp(name,"w277h538"))    return 0x31; /* Western Env #6 (you6) */
       if (!strcmp(name,"w252h360J"))   return 0x32; /* L --- similar to US 3.5x5 size */
       if (!strcmp(name,"w360h504J"))   return 0x33; /* 2L --- similar to US5x7 */
       if (!strcmp(name,"w288h432J"))   return 0x34; /* KG --- same size as US 4x6 */
+      if (!strcmp(name,"w155h257"))    return 0x36; /* Japanese Business Card 55mm x 91mm */
       if (!strcmp(name,"w360h504"))    return 0x37; /* US5x7 */
       if (!strcmp(name,"w420h567"))    return 0x39; /* Ofuku Hagaki */
+      if (!strcmp(name,"w340h666"))    return 0x3a; /* Japanese Long Env #3 (chou3) */
+      if (!strcmp(name,"w255h581"))    return 0x3b; /* Japanese Long Env #4 (chou4) */
+      if (!strcmp(name,"w155h244"))    return 0x41; /* Business/Credit Card 54mm x 86mm */
+      /* if (!strcmp(name,"A4"))       return 0x42; */ /* FineArt A4 35mm border --- iP7100: gap is 18 */
+      /* if (!strcmp(name,"A3"))       return 0x43; */ /* FineArt A3 35mm border --- iP7100: gap is 18 */
+      /* if (!strcmp(name,"Letter"))   return 0x44; */ /* FineArt Letter 35mm border --- iP7100: gap is 18 */
       if (!strcmp(name,"w288h576"))    return 0x46; /* US4x8 */
       if (!strcmp(name,"w1008h1224J")) return 0x47; /* HanKire --- 14in x 17in */
       if (!strcmp(name,"720h864J"))    return 0x48; /* YonKire --- 10in x 12 in*/
       if (!strcmp(name,"c8x10J"))      return 0x49; /* RokuKire --- same size as 8x10 */
+      /* if (!strcmp(name,"A4"))       return 0x4d; */ /* ArtA4 35mm border */
+      /* if (!strcmp(name,"A3"))       return 0x4e; */ /* ArtA3 35mm border */
+      /* if (!strcmp(name,"Letter"))   return 0x4f; */ /* ArtLetter 35mm border */
       if (!strcmp(name,"w288h512"))    return 0x52; /* Wide101.6x180.6 */
+      /* w283h566 Wide postcard 148mm x 200mm */
+
+      /* media size codes for CD (and other media depending on printer model */
+      if (!strcmp(name,"CD5Inch"))    return 0x53; /* CD --- arbitrary choice here, modify in ESC (P command */
+      /* similar needed for FineArt media which have common sizes but different codes */
+
       /* custom */
 
       stp_deprintf(STP_DBG_CANON,"canon: Unknown paper size '%s' - using custom\n",name);
@@ -582,9 +2558,21 @@ canon_size_type(const stp_vars_t *v, const canon_cap_t * caps)
 static void
 canon_describe_resolution(const stp_vars_t *v, int *x, int *y)
 {
-    const canon_mode_t* mode = canon_get_current_mode(v);
+  const canon_mode_t* mode = NULL;
+  const canon_cap_t * caps = canon_get_model_capabilities(v);
+ 
+  /* if mode is not yet set, it remains NULL */
+  if (ERRPRINT)
+    stp_eprintf(v,"Calling get_current_parameter from canon_describe_resolution");
+  mode = canon_get_current_mode(v);
+
+  if(!mode)
+    mode = &caps->modelist->modes[caps->modelist->default_mode];
+
+  if (mode) {
     *x = mode->xdpi;
     *y = mode->ydpi;
+  }
 }
 
 static const char *
@@ -596,6 +2584,9 @@ canon_describe_output(const stp_vars_t *v)
     return "CMYK";
   if(ink_type & CANON_INK_CMY_MASK)
     return "CMY";
+  /* Gernot added */
+  /*if(ink_type & CANON_INK_cmy_MASK)
+    return "cmy";*/
   return "Grayscale";
 }
 
@@ -619,7 +2610,7 @@ static void
 canon_parameters(const stp_vars_t *v, const char *name,
 		 stp_parameter_t *description)
 {
-  int		i;
+  int		i,j;
 
   const canon_cap_t * caps=
     canon_get_model_capabilities(v);
@@ -631,6 +2622,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
+	/* presumably need to return the maximum number of inks the printer can handle */
 	unsigned int ink_type = canon_printhead_colors(v);
 
 	stp_fill_parameter_settings(description,
@@ -739,7 +2731,9 @@ canon_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "Resolution") == 0)
   {
+#if 0
     const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+#endif
     description->bounds.str= stp_string_list_create();
     description->deflt.str = NULL;
     for(i=0;i<caps->modelist->count;i++){
@@ -747,32 +2741,68 @@ canon_parameters(const stp_vars_t *v, const char *name,
 	if(!(input_slot && !strcmp(input_slot,"CD") && !(caps->modelist->modes[i].flags & MODE_FLAG_CD)))
 #endif
           stp_string_list_add_string(description->bounds.str,
-                                        caps->modelist->modes[i].name, gettext(caps->modelist->modes[i].text));
+				     caps->modelist->modes[i].name, gettext(caps->modelist->modes[i].text));
         stp_deprintf(STP_DBG_CANON,"supports mode '%s'\n",
-                      caps->modelist->modes[i].name);
+		     caps->modelist->modes[i].name);
         if(i == caps->modelist->default_mode)
-            description->deflt.str=caps->modelist->modes[i].name;
-
-
+	  description->deflt.str=caps->modelist->modes[i].name;
     }
   }
   else if (strcmp(name, "InkType") == 0)
   {
-    const canon_mode_t* mode = canon_get_current_mode(v);
+    const canon_mode_t* mode = NULL;
+
+    if (ERRPRINT)
+      stp_eprintf(v,"Calling get_current_parameter from InkType block in canon_parameters");
+    mode=canon_get_current_mode(v);
+
     description->bounds.str= stp_string_list_create();
-    for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
-      if(mode->ink_types & canon_inktypes[i].ink_type){
+    if (mode) {
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	if(mode->ink_types & canon_inktypes[i].ink_type){
           stp_string_list_add_string(description->bounds.str,canon_inktypes[i].name,_(canon_inktypes[i].text));
+	  stp_dprintf(STP_DBG_CANON, v," mode known --- Added InkType %s(%s) for mode %s (inktype %u)\n",canon_inktypes[i].name,canon_inktypes[i].text,mode->name,mode->ink_types);
+	  if (ERRPRINT)
+	    stp_eprintf(v,"mode known --- Added InkType %s(%s) for mode %s (inktype %u)\n",canon_inktypes[i].name,canon_inktypes[i].text,mode->name,mode->ink_types);
+	}
+      }
+      description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;
+    }
+    /* mode not defined yet --- needed for PPD generation */
+    else {
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	for(j=0;j<caps->modelist->count;j++){
+	  if(caps->modelist->modes[j].ink_types & canon_inktypes[i].ink_type){
+	    stp_string_list_add_string(description->bounds.str,canon_inktypes[i].name,_(canon_inktypes[i].text));
+	    stp_dprintf(STP_DBG_CANON, v," no mode --- Added InkType %s(%s) for mode (%s) inktypes %u\n",canon_inktypes[i].name,canon_inktypes[i].text,caps->modelist->modes[j].name,caps->modelist->modes[j].ink_types);
+	    if (ERRPRINT)
+	      stp_eprintf(v,"no mode --- Added InkType %s(%s) for mode (%s) inktypes %u\n",canon_inktypes[i].name,canon_inktypes[i].text,caps->modelist->modes[j].name,caps->modelist->modes[j].ink_types);
+	    break;
+	  }      
+	}
+      }
+      /* default type must be deduced from the default mode */
+      /* use color if available, so break after first (color) is found, since inkt types ordered with gray last */
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	if(caps->modelist->modes[caps->modelist->default_mode].ink_types & canon_inktypes[i].ink_type){
+	  description->deflt.str = canon_inktypes[i].name;
+	  break;
+	}      
       }
     }
-    description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;
+    /* default type must be deduced from the default mode */
+    /*description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;*/
   }
   else if (strcmp(name, "InkChannels") == 0)
     {
       unsigned int ink_type = canon_printhead_colors(v);
       for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
-          if(ink_type == canon_inktypes[i].ink_type)
+	if(ink_type == canon_inktypes[i].ink_type){
               description->deflt.integer = canon_inktypes[i].num_channels;
+	      stp_dprintf(STP_DBG_CANON, v,"Added %d InkChannels\n",canon_inktypes[i].num_channels);
+	      if (ERRPRINT)
+		stp_eprintf(v,"Added %d InkChannels\n",canon_inktypes[i].num_channels);
+	}
       }
       description->bounds.integer.lower = -1;
       description->bounds.integer.upper = -1;
@@ -784,10 +2814,13 @@ canon_parameters(const stp_vars_t *v, const char *name,
     description->bounds.str= stp_string_list_create();
     description->deflt.str= canon_paper_list[0].name;
 
-    for (i = 0; i < count; i ++)
+    for (i = 0; i < count; i ++) {
       stp_string_list_add_string(description->bounds.str,
 				canon_paper_list[i].name,
 				gettext(canon_paper_list[i].text));
+
+      stp_dprintf(STP_DBG_CANON, v,"DEBUG: Gutenprint:  Added Media Type: '%s'\n",canon_paper_list[i].name);
+    }
   }
   else if (strcmp(name, "InputSlot") == 0)
   {
@@ -803,16 +2836,158 @@ canon_parameters(const stp_vars_t *v, const char *name,
   }
   else if (strcmp(name, "PrintingMode") == 0)
   {
-    const canon_mode_t* mode = canon_get_current_mode(v);
+    int found_color, found_mono;
+    const canon_mode_t* mode = NULL;
+    /* mode remains NULL if not yet set */
+    
+    if (ERRPRINT)
+      stp_eprintf(v,"Calling get_current_mode from PrintingMode block in canon_parameter");
+    mode = canon_get_current_mode(v);
+    
+    /* If mode is not set need to search ink types for all modes and
+       see whether we have any color there
+     */
+
+    if (ERRPRINT)
+      stp_eprintf(v,"PrintingMode---entered enumeration block in canon_printers\n");
+
     description->bounds.str = stp_string_list_create();
-    if (mode->ink_types != CANON_INK_K)
+
+    if (ERRPRINT)
+      stp_eprintf(v,"PrintingMode---created list\n");
+
+    if (mode) {
+      if (ERRPRINT)
+	stp_eprintf(v,"PrintingMode: (mode known) what is the current mode inktype value: %i\n",mode->ink_types);
+      /* e.g., ink_types is 21 = 16 + 4 + 1 */
+      if (mode->ink_types > 1) {
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
+	if (ERRPRINT)
+	  stp_eprintf(v,"PrintingMode: (mode known) added Color\n");
+      }
+      if (mode->ink_types & CANON_INK_K) {
+	stp_string_list_add_string
+	  (description->bounds.str, "BW", _("Black and White"));
+	if (ERRPRINT)
+	  stp_eprintf(v,"PrintingMode: (mode known) added BW\n");
+      }
+    }
+#if 0
+      /* original code */
+      if (mode)
+	if (mode->ink_types != CANON_INK_K) {
+	  stp_string_list_add_string
+	    (description->bounds.str, "Color", _("Color"));
+	  if (ERRPRINT)
+	    stp_eprintf(v,"PrintingMode: (mode known) added Color\n");
+	}
+#endif
+
+    else { /* mode not known yet --- needed for PPD generation */
+      if (ERRPRINT)
+	stp_eprintf(v,"PrintingMode: entered mode not known conditional block\n");
+      /* add code to find color inks */
+      /* default type must be deduced from the default mode */
+      /* use color if available, so break after first (color) is found, since ink types ordered with gray last */
+      found_color=0;
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	for(j=0;j<caps->modelist->count;j++){
+	  if(caps->modelist->modes[j].ink_types > 1){
+	    stp_string_list_add_string
+	      (description->bounds.str, "Color", _("Color"));
+	    found_color=1;
+	    if (ERRPRINT)
+	      stp_eprintf(v,"PrintingMode: (mode not known) added Color\n");
+	    break;
+	  }
+	}
+	if (found_color==1)
+	  break;
+      }
+      found_mono=0;
+      for(i=0;i<sizeof(canon_inktypes)/sizeof(canon_inktypes[0]);i++){
+	for(j=0;j<caps->modelist->count;j++){
+	  if(caps->modelist->modes[j].ink_types & CANON_INK_K){
+	    stp_string_list_add_string
+	      (description->bounds.str, "BW", _("Black and White"));
+	    found_mono=1;
+	    if (ERRPRINT)
+	      stp_eprintf(v,"PrintingMode: (mode not known) added BW\n");
+	    break;
+	  }
+	}
+	if (found_mono==1)
+	  break;
+      }
+
+#if 0
+      /* ink types for default mode*/
+      if(caps->modelist->modes[caps->modelist->default_mode].ink_types > 1){
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
+	if (ERRPRINT)
+	  stp_eprintf(v,"PrintingMode: (mode not known) added Color\n");
+      }
+      if(caps->modelist->modes[caps->modelist->default_mode].ink_types & CANON_INK_K){
+	stp_string_list_add_string
+	(description->bounds.str, "BW", _("Black and White"));
+	if (ERRPRINT)
+	  stp_eprintf(v,"PrintingMode: (mode not known) added BW\n");	
+      }
+#endif
+#if 0
+      /* original code */
       stp_string_list_add_string
-	(description->bounds.str, "Color", _("Color"));
-    stp_string_list_add_string
-      (description->bounds.str, "BW", _("Black and White"));
+	(description->bounds.str, "BW", _("Black and White"));
+      if (ERRPRINT)
+	stp_eprintf(v,"PrintingMode: added BW\n");
+#endif
+    }
+    
+    /* original code --- fine as is */
     description->deflt.str =
       stp_string_list_param(description->bounds.str, 0)->name;
   } 
+  else if (strcmp(name, "InkSet") == 0)
+    {
+      description->bounds.str= stp_string_list_create();
+      if (caps->features & CANON_CAP_T) {
+	stp_string_list_add_string
+	  (description->bounds.str, "Both", _("Both"));
+	if (!(caps->features & CANON_CAP_NOBLACK)) {
+	    stp_string_list_add_string
+	      (description->bounds.str, "Black", _("Black"));
+	}
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
+      } /* mutually exclusive */
+      else if (caps->features & CANON_CAP_cart) {
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
+	stp_string_list_add_string
+	  (description->bounds.str, "Black", _("Black"));
+	stp_string_list_add_string
+	  (description->bounds.str, "Photo", _("Photo"));
+      } else {
+	/* make sure to have at least a default value: no choice */
+	stp_string_list_add_string
+	  (description->bounds.str, "None", _("None"));
+      }
+      description->deflt.str =
+	stp_string_list_param(description->bounds.str, 0)->name;
+    }
+  /* Test implementation of borderless printing */
+  else if (strcmp(name, "FullBleed") == 0)
+    {
+      const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+      if (input_slot && !strcmp(input_slot,"CD"))
+	description->is_active = 0;
+      else if (caps->features & CANON_CAP_BORDERLESS)
+	description->deflt.boolean = 0;
+      else
+	description->is_active = 0;
+    }
   else if (strcmp(name, "Duplex") == 0)
   {
     int offer_duplex=0;
@@ -845,7 +3020,9 @@ canon_parameters(const stp_vars_t *v, const char *name,
   }
   else if (strcmp(name, "Quality") == 0)
   {
+#if 0
     int has_standard_quality = 0;
+#endif
     description->bounds.str = stp_string_list_create();
     stp_string_list_add_string(description->bounds.str, "None",
 			       _("Manual Control"));
@@ -856,7 +3033,9 @@ canon_parameters(const stp_vars_t *v, const char *name,
   /* Cartridge selection for those printers that have it */
   else if (strcmp(name, "Cartridge") == 0)
   {
+#if 0
     int offer_cartridge_selection = 0;
+#endif
     description->bounds.str = stp_string_list_create();
     stp_string_list_add_string(description->bounds.str, "Both",
 			       _("Both"));
@@ -887,49 +3066,129 @@ canon_parameters(const stp_vars_t *v, const char *name,
 static void
 internal_imageable_area(const stp_vars_t *v,   /* I */
 			int  use_paper_margins,
+			int use_maximum_area,
 			int  *left,	/* O - Left position in points */
 			int  *right,	/* O - Right position in points */
 			int  *bottom,	/* O - Bottom position in points */
 			int  *top)	/* O - Top position in points */
 {
-  int	width, length;			/* Size of page */
+  int width, length;			/* Size of page */
+  int cd = 0;                           /* CD selected */
+  const char *media_size = stp_get_string_parameter(v, "PageSize");
   int left_margin = 0;
   int right_margin = 0;
   int bottom_margin = 0;
   int top_margin = 0;
-  int cd = 0;
-
-  const canon_cap_t * caps= canon_get_model_capabilities(v);
-  const char *media_size = stp_get_string_parameter(v, "PageSize");
   const stp_papersize_t *pt = NULL;
   const char* input_slot = stp_get_string_parameter(v, "InputSlot");
 
-  if(input_slot && !strcmp(input_slot,"CD"))
-    cd = 1;
+  const canon_cap_t * caps= canon_get_model_capabilities(v);
 
-  if (media_size && use_paper_margins)
+  if (media_size)
     pt = stp_get_papersize_by_name(media_size);
 
+  if(input_slot && !strcmp(input_slot,"CD"))
+    cd = 1;
+
   stp_default_media_size(v, &width, &length);
-  if (pt)
-    {
+  if (cd) {
+    /* ignore printer margins for the cd print, margins get adjusted in do_print for now */
+    if (pt) {
+      /* move code from do_print here */
+    }
+    else {
+      /* move code from do_print here */
+    }
+  }
+  /* non-CD media */
+  else {
+    if (pt && use_paper_margins) {
       left_margin = pt->left;
       right_margin = pt->right;
       bottom_margin = pt->bottom;
       top_margin = pt->top;
     }
-  /* ignore printer margins for the cd print, margins get adjusted in do_print */
-  if(!cd){
+    /* limit to printer capabilities---without fullbleed */
     left_margin = MAX(left_margin, caps->border_left);
     right_margin = MAX(right_margin, caps->border_right);
     top_margin = MAX(top_margin, caps->border_top);
     bottom_margin = MAX(bottom_margin, caps->border_bottom);
   }
 
+  /* temporarily limit to non-CD media until page size code moved here from do_print */
+  /* Note: written beloe code to handle CD case as well */
+  if(!cd){
+    if (ERRPRINT) {
+      stp_eprintf(v,"internal_imageable_area: about to enter the borderless condition block\n");
+      stp_eprintf(v,"internal_imageable_area: is borderless available? %016lx\n",caps->features & CANON_CAP_BORDERLESS);
+      stp_eprintf(v,"internal_imageable_area: is borderless selected? %d\n",stp_get_boolean_parameter(v, "FullBleed"));
+    }
+    
+    if ( (caps->features & CANON_CAP_BORDERLESS) &&
+	 (use_maximum_area || (!cd && stp_get_boolean_parameter(v, "FullBleed")))) {
+      
+      if (ERRPRINT)
+	stp_eprintf(v,"internal_imageable_area: entered borderless condition\n");
+      
+      if (pt) {
+	
+	if (ERRPRINT)
+	  stp_eprintf(v,"internal_imageable_area: entered pt condition\n");
+	
+	if (pt->left <= 0 && pt->right <= 0 && pt->top <= 0 && pt->bottom <= 0) {
+	  
+	  if (ERRPRINT)
+	    stp_eprintf(v,"internal_imageable_area: enetered margin<=0 condition\n");
+	  
+	  if (use_paper_margins) {
+	    unsigned width_limit = caps->max_width;
+	    left_margin = -8;
+	    right_margin = -8;
+	    if (width - right_margin - 3 > width_limit)
+	      right_margin = width - width_limit - 3;
+	    top_margin = -6;
+	    bottom_margin = -15;
+	    
+	    if (ERRPRINT)
+	      stp_eprintf(v,"internal_imageable_area: use_paper_margins so set margins all to -7\n");
+
+	  }
+	  else {
+	    left_margin = 0;
+	    right_margin = 0;
+	    top_margin = 0;
+	    bottom_margin = 0;
+	    
+	    if (ERRPRINT)
+	      stp_eprintf(v,"internal_imageable_area: does not use paper margins so set margins all to 0\n");
+
+	  }
+	}
+      }
+    }
+  }
+
+  if (ERRPRINT) 
+    {
+      stp_eprintf(v,"internal_imageable_area: left_margin %d\n",left_margin);
+      stp_eprintf(v,"internal_imageable_area: right_margin %d\n",right_margin);
+      stp_eprintf(v,"internal_imageable_area: top_margin %d\n",top_margin);
+      stp_eprintf(v,"internal_imageable_area: bottom_margin %d\n",bottom_margin);
+    }
+
   *left =	left_margin;
   *right =	width - right_margin;
   *top =	top_margin;
   *bottom =	length - bottom_margin;
+
+  if (ERRPRINT) 
+    {
+      stp_eprintf(v,"internal_imageable_area: page_left %d\n",*left);
+      stp_eprintf(v,"internal_imageable_area: page_right %d\n",*right);
+      stp_eprintf(v,"internal_imageable_area: page_top %d\n",*top);
+      stp_eprintf(v,"internal_imageable_area: page_bottom %d\n",*bottom);
+    }
+
 }
 
 static void
@@ -939,7 +3198,17 @@ canon_imageable_area(const stp_vars_t *v,   /* I */
                      int  *bottom,	/* O - Bottom position in points */
                      int  *top)		/* O - Top position in points */
 {
-  internal_imageable_area(v, 1, left, right, bottom, top);
+  internal_imageable_area(v, 1, 0, left, right, bottom, top);
+}
+
+static void
+canon_maximum_imageable_area(const stp_vars_t *v,   /* I */
+                     int  *left,	/* O - Left position in points */
+                     int  *right,	/* O - Right position in points */
+                     int  *bottom,	/* O - Bottom position in points */
+                     int  *top)		/* O - Top position in points */
+{
+  internal_imageable_area(v, 1, 1, left, right, bottom, top);
 }
 
 static void
@@ -1031,8 +3300,15 @@ canon_init_setDuplex(const stp_vars_t *v, const canon_privdata_t *init)
 {
   if (!(init->caps->features & CANON_CAP_DUPLEX))
     return;
-  if (strncmp(init->duplex_str, "Duplex", 6)) 
-    return;
+  if (strncmp(init->duplex_str, "Duplex", 6)) {
+    if ( !(strcmp(init->caps->name,"i860")) || !(strcmp(init->caps->name,"i865")) || !(strcmp(init->caps->name,"i950")) || !(strcmp(init->caps->name,"i960")) || !(strcmp(init->caps->name,"i990")) ) {
+      /* i860, i865, i950, i960, i990 use ESC ($ command even for simplex mode */
+      canon_cmd(v,ESC28,0x24,9,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00);
+      return;
+    }
+    else
+      return;
+  }
   /* The same command seems to be needed for both Duplex and DuplexTumble
      no idea about the meanings of the single bytes */
   canon_cmd(v,ESC28,0x24,9,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x02);
@@ -1115,6 +3391,12 @@ canon_init_setColor(const stp_vars_t *v, const canon_privdata_t *init)
                            arg_63[4] = 1;
                        }
                    }
+		 else if (!strcmp(init->caps->name,"4550")) /* BJC-4550 */
+		    {
+		      numargs = 3;
+		      arg_63[2] = 0; /* not used in Black and Color, no idea about PhotoColor yet */
+		      arg_63[1] = init->quality;     /* hardcode to whatever this means for now; quality, apparently */
+		    }
                  else
                    arg_63[2] = init->quality;        /* hardcode to whatever this means for now; quality, apparently */
 
@@ -1184,7 +3466,8 @@ canon_init_setTray(const stp_vars_t *v, const canon_privdata_t *init)
 {
   unsigned char
     arg_6c_1 = 0x00,
-    arg_6c_2 = 0x00; /* plain paper */
+    arg_6c_2 = 0x00, /* plain paper */
+    arg_6c_3 = 0x00; /* special cases like iP7100 to be handled */
 
   if (!(init->caps->features & CANON_CAP_l))
     return;
@@ -1193,10 +3476,17 @@ canon_init_setTray(const stp_vars_t *v, const canon_privdata_t *init)
 
   arg_6c_1|= (init->slot->code & 0x0f);
 
-  if (init->pt) arg_6c_2= init->pt->media_code_l;
-  if(init->caps->model_id >= 3)
-    canon_cmd(v,ESC28,0x6c, 3, arg_6c_1, arg_6c_2, 0);
-  else
+  /* set gap for MP710/740 if thick media selected */
+  if (!strcmp(init->slot->name,"AutoThick"))
+    if ( (!strcmp(init->caps->name,"PIXMA MP710")) || (!strcmp(init->caps->name,"PIXMA MP740")) ) 
+      arg_6c_3 = 0x10;
+
+  if (init->pt) arg_6c_2 = init->pt->media_code_l;
+  /* select between length 2 and 3 byte variations of command */
+  /*if(init->caps->model_id >= 3)*/
+  if(init->caps->ESC_l_len == 3)
+    canon_cmd(v,ESC28,0x6c, 3, arg_6c_1, arg_6c_2, arg_6c_3); /* 3rd arg is "gap" */
+  else /* else 2 bytes---no other option for now */
     canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
 }
 
@@ -1241,104 +3531,465 @@ canon_init_setPrintMode(const stp_vars_t *v, const canon_privdata_t *init)
 	    arg_6d_a,arg_6d_b,arg_6d_2,0x00,arg_6d_3);
 }
 
+/* ESC (M -- 0x4d --  -- :
+ */
+static void
+canon_init_setESC_M(const stp_vars_t *v, const canon_privdata_t *init)
+{
+  if (!(init->caps->features & CANON_CAP_M))
+    return;
+
+  canon_cmd(v,ESC28,0x4d, 3, 0x00, 0x00, 0x00);
+}
+
 /* ESC (p -- 0x70 -- cmdSetPageMargins2 --:
  */
 static void
 canon_init_setPageMargins2(const stp_vars_t *v, const canon_privdata_t *init)
 {
+  unsigned char arg_70_1,arg_70_2,arg_70_3,arg_70_4;
+
+  int border_left,border_right,border_top,border_bottom;
+  int border_left2,border_top2;
+  int border_right2;
+  int border_bottom2;
+  int area_right,area_top;
+
   /* TOFIX: what exactly is to be sent?
    * Is it the printable length or the bottom border?
    * Is is the printable width or the right border?
    */
+
+  int unit = 600;
   int printable_width=  (init->page_width + 1)*5/6;
   int printable_length= (init->page_height + 1)*5/6;
 
-  unsigned char arg_70_1= (printable_length >> 8) & 0xff;
-  unsigned char arg_70_2= (printable_length) & 0xff;
-  unsigned char arg_70_3= (printable_width >> 8) & 0xff;
-  unsigned char arg_70_4= (printable_width) & 0xff;
-  const char* input_slot = stp_get_string_parameter(v, "InputSlot");
+  const char* input_slot = stp_get_string_parameter(v, "InputSlot");  
+  int print_cd= (input_slot && (!strcmp(input_slot, "CD")));
+
+  if (ERRPRINT) {
+    stp_eprintf(v,"canon_init_setPageMargins2: borderless capability? %016lx\n", init->caps->features & CANON_CAP_BORDERLESS);
+    stp_eprintf(v,"canon_init_setPageMargins2: borderless active? %d\n", stp_get_boolean_parameter(v, "FullBleed"));
+  }
+
+  if ( (init->caps->features & CANON_CAP_BORDERLESS) && 
+       !(print_cd) && stp_get_boolean_parameter(v, "FullBleed") ) 
+    {
+      if (ERRPRINT)
+	stp_eprintf(v,"canon_init_setPageMargins2: for borderless set printable length and width to 0\n");
+      /* set to 0 for borderless */
+      printable_width = 0;
+      printable_length = 0;
+    }
+
+  arg_70_1= (printable_length >> 8) & 0xff;
+  arg_70_2= (printable_length) & 0xff;
+  arg_70_3= (printable_width >> 8) & 0xff;
+  arg_70_4= (printable_width) & 0xff;
 
   if (!(init->caps->features & CANON_CAP_px) && !(init->caps->features & CANON_CAP_p))
 	return;
 
-  if ((init->caps->features & CANON_CAP_px) && !(input_slot && !strcmp(input_slot,"CD")))
-  {
-    unsigned int unit = 600;
-    stp_zfwrite(ESC28,2,1,v); /* ESC( */
-    stp_putc(0x70,v);         /* p    */
-    stp_put16_le(46, v);      /* len  */
-    stp_put16_be(printable_length,v);
-    stp_put16_be(0,v);
-    stp_put16_be(printable_width,v);
-    stp_put16_be(0,v);
-    stp_put32_be(0,v);
-    stp_put16_be(unit,v);
-    
-    stp_put32_be(init->caps->border_left * unit / 72,v); /* area_right */
-    stp_put32_be(init->caps->border_top * unit / 72,v);  /* area_top */
-    stp_put32_be(init->page_width  * unit / 72,v); /* area_width */
-    stp_put32_be(init->page_height * unit / 72,v); /* area_length */
-    stp_put32_be(0,v); /* paper_right */
-    stp_put32_be(0,v); /* paper_top */
-    stp_put32_be((init->page_width + init->caps->border_left + init->caps->border_right) * unit / 72,v); /* paper_width */
-    stp_put32_be((init->page_height + init->caps->border_top + init->caps->border_bottom) * unit / 72,v); /* paper_height */
-    return;
-  }
+  if ((init->caps->features & CANON_CAP_px) ) {
+    /* workaround for CD writing that uses CANON_CAP_px --- fix with capabilities */
+    if ( !(input_slot && !strcmp(input_slot,"CD")) || !(strcmp(init->caps->name,"PIXMA iP4600")) || !(strcmp(init->caps->name,"PIXMA iP4700")) || !(strcmp(init->caps->name,"PIXMA iP4800")) || !(strcmp(init->caps->name,"PIXMA iP4900")) || !(strcmp(init->caps->name,"PIXMA MP980")) || !(strcmp(init->caps->name,"PIXMA MP990")) || !(strcmp(init->caps->name,"PIXMA MG5200")) || !(strcmp(init->caps->name,"PIXMA MG5300")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG6200")) || !(strcmp(init->caps->name,"PIXMA MG8100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) )
+      {
+
+	/* original borders */
+	border_left=init->caps->border_left;
+	border_right=init->caps->border_right;
+	border_top=init->caps->border_top;
+	border_bottom=init->caps->border_bottom;
+
+	if (print_cd) {
+	  border_top=9;
+	  border_bottom=9;
+	}
+
+	/* modified borders */
+	border_left2=border_left;
+	border_top2=border_top;
+	border_right2=border_right;
+	border_bottom2=border_bottom;
+
+	area_right = border_left2 * unit / 72;
+	area_top = border_top2 * unit / 72;
+
+	if ( (init->caps->features & CANON_CAP_BORDERLESS) && 
+	     !(print_cd) && stp_get_boolean_parameter(v, "FullBleed") ) {
+	  border_left2=-8; /* -8 mini series -6 */
+	  border_right2=-8; /* -8 */
+	  border_top2=-6; /* -6 standard */
+	  border_bottom2=-15; /* -15 standard */
+	  area_right = border_left2 * unit / 72;
+	  area_top = border_top2 * unit / 72;
+	}
 
+	if (ERRPRINT) {
+	  stp_eprintf(v,"setPageMargins2: init->page_height = %d\n",init->page_height);
+	  stp_eprintf(v,"setPageMargins2: printable_length = %d\n",printable_length);
+	  stp_eprintf(v,"setPageMargins2: paper_height = %d\n",(init->page_height + border_top + border_bottom) * unit / 72);
+	}
+
+
+	stp_zfwrite(ESC28,2,1,v); /* ESC( */
+	stp_putc(0x70,v);         /* p    */
+	stp_put16_le(46, v);      /* len  */
+	/* 0 for borderless, calculated otherwise */
+	stp_put16_be(printable_length,v); /* Windows 698, gutenprint 570 */
+	stp_put16_be(0,v);
+	/* 0 for borderless, calculated otherwise */
+	stp_put16_be(printable_width,v); /* Windows 352, gutenprint 342 */
+	stp_put16_be(0,v);
+	stp_put32_be(0,v);
+	stp_put16_be(unit,v);
+	
+	/* depends on borderless or not: uses modified borders */
+	stp_put32_be(area_right,v); /* area_right : Windows seems to use 9.6, gutenprint uses 10 */
+	stp_put32_be(area_top,v);  /* area_top : Windows seems to use 8.4, gutenprint uses 15 */
+	/* calculated depending on borderless or not: uses modified borders */
+	stp_put32_be((init->page_width + (border_left - border_left2) + (border_right - border_right2) ) * unit / 72,v); /* area_width : Windows seems to use 352 for Tray G, gutenprint uses 340.92 */
+	stp_put32_be((init->page_height + (border_top - border_top2) + (border_bottom - border_bottom2) ) * unit / 72,v); /* area_length : Windows seems to use 698.28 for Tray G, gutenprint uses 570 */
+	/* 0 under all currently known circumstances */
+	stp_put32_be(0,v); /* paper_right : Windows also 0 here for all Trays */
+	stp_put32_be(0,v); /* paper_top : Windows also 0 here for all Trays */
+	/* standard paper sizes, unchanged for borderless so use original borders */
+	stp_put32_be((init->page_width + border_left + border_right) * unit / 72,v); /* paper_width : Windows 371.4, gutenprint 360.96 */
+	stp_put32_be((init->page_height + border_top + border_bottom) * unit / 72,v); /* paper_height : Windows 720.96, gutenprint 600 */
+	return;
+      }
+  }
   canon_cmd(v,ESC28,0x70, 8,
    	      arg_70_1, arg_70_2, 0x00, 0x00,
 	      arg_70_3, arg_70_4, 0x00, 0x00);
 }
 
 /* ESC (P -- 0x50 -- unknown -- :
+    pt = stp_get_papersize_by_name(media_size);
    seems to set media and page information. Different byte lengths depending on printer model. */
 static void
 canon_init_setESC_P(const stp_vars_t *v, const canon_privdata_t *init)
 {
-  unsigned char arg_ESCP_2;
+  unsigned char arg_ESCP_1, arg_ESCP_2;
   if(!(init->caps->features & CANON_CAP_P))
     return;
 
+  arg_ESCP_1 = (init->pt) ? canon_size_type(v,init->caps): 0x03;
   arg_ESCP_2 = (init->pt) ? init->pt->media_code_P: 0x00;
 
-  /* models that add two more bytes "1 0" to the end of the usual 4-byte sequence: */
-  /* iP2700 */
-  /* MX340 */
-  /* MX350 --- same driver as MX340 */
-  /* MX360 */
-  /* MX410 --- same driver as MX360 */
-  /* MX420 */
-  /* MX870 */
-  /* MX880 */
-  /* MP493 */
-  /* MP550 */
-  /* MP640 */
-  /* iX6500 */
-  /* iX7000 */
-  if ( (!strcmp(init->caps->name,"iP2700")) || (!strcmp(init->caps->name,"MX340")) || (!strcmp(init->caps->name,"MX360")) || (!strcmp(init->caps->name,"MX410")) || (!strcmp(init->caps->name,"MX420")) || (!strcmp(init->caps->name,"MX870"))  || (!strcmp(init->caps->name,"MX880"))  || (!strcmp(init->caps->name,"MP550")) || (!strcmp(init->caps->name,"MP493")) || (!strcmp(init->caps->name,"MP640")) || (!strcmp(init->caps->name,"iX6500")) || (!strcmp(init->caps->name,"iX7000")) || (!strcmp(init->caps->name,"iP4700")) || (!strcmp(init->caps->name,"iP4800")) )
- /* add a lot more here: try if(init->caps->model_id >= 3) how to guess for 4 bytes or more */
+  /* workaround for CD media */
+
+  if ( (arg_ESCP_2 == 0x1f) || ( arg_ESCP_2 == 0x20) ) {
+    if ( arg_ESCP_1 == 0x53 ) {
+      /* Tray G as default */
+      arg_ESCP_1 = 0x53;
+      /* Custom CD tray */
+      if ( !(strcmp(init->caps->name,"i865")) || !(strcmp(init->caps->name,"PIXMA MP710")) || !(strcmp(init->caps->name,"PIXMA MP740")) || !(strcmp(init->caps->name,"PIXMA MP900")) ) {
+	arg_ESCP_1 = 0x35;
+      }
+      /* Tray A */
+      if ( !(strcmp(init->caps->name,"PIXMA iP9910")) ) {
+	arg_ESCP_1 = 0x3f;
+      }
+      /* Tray B */
+      if ( !(strcmp(init->caps->name,"PIXMA MP750")) || !(strcmp(init->caps->name,"PIXMA MP760")) || !(strcmp(init->caps->name,"PIXMA MP770")) || !(strcmp(init->caps->name,"PIXMA MP780")) || !(strcmp(init->caps->name,"PIXMA MP790")) || !(strcmp(init->caps->name,"PIXMA iP3000")) || !(strcmp(init->caps->name,"PIXMA iP3100")) || !(strcmp(init->caps->name,"PIXMA iP4000")) || !(strcmp(init->caps->name,"PIXMA iP4100")) || !(strcmp(init->caps->name,"PIXMA iP5000")) || !(strcmp(init->caps->name,"PIXMA iP6000")) || !(strcmp(init->caps->name,"PIXMA iP6100")) || !(strcmp(init->caps->name,"PIXMA iP7100")) || !(strcmp(init->caps->name,"PIXMA iP8100")) || !(strcmp(init->caps->name,"PIXMA iP8500")) || !(strcmp(init->caps->name,"PIXMA iP8600")) ) {
+	arg_ESCP_1 = 0x40;
+      }
+      /* Tray C */
+      if ( !(strcmp(init->caps->name,"PIXMA MP950")) || !(strcmp(init->caps->name,"PIXMA iP4200")) || !(strcmp(init->caps->name,"PIXMA iP5200")) || !(strcmp(init->caps->name,"PIXMA iP6700")) || !(strcmp(init->caps->name,"PIXMA iP7500")) ) {
+	arg_ESCP_1 = 0x4a;
+      }
+      /* Tray D */
+      if ( !(strcmp(init->caps->name,"PIXMA MP500")) || !(strcmp(init->caps->name,"PIXMA MP530")) || !(strcmp(init->caps->name,"PIXMA MP800")) || !(strcmp(init->caps->name,"PIXMA MP830")) ) {
+	arg_ESCP_1 = 0x4b;
+      }
+      /* Tray E */
+      if ( !(strcmp(init->caps->name,"PIXMA Pro9000")) || !(strcmp(init->caps->name,"PIXMA Pro9002")) || !(strcmp(init->caps->name,"PIXMA Pro9500")) || !(strcmp(init->caps->name,"PIXMA Pro95002")) ) {
+	arg_ESCP_1 = 0x4c;
+      }
+      /* Tray F */
+      if ( !(strcmp(init->caps->name,"PIXMA MP600")) || !(strcmp(init->caps->name,"PIXMA MP610")) || !(strcmp(init->caps->name,"PIXMA MP810")) || !(strcmp(init->caps->name,"PIXMA MP960")) || !(strcmp(init->caps->name,"PIXMA MP970")) || !(strcmp(init->caps->name,"PIXMA MX850")) || !(strcmp(init->caps->name,"PIXMA iP4300")) || !(strcmp(init->caps->name,"PIXMA iP4500")) || !(strcmp(init->caps->name,"PIXMA iP5300")) ) {
+	arg_ESCP_1 = 0x51;
+      }
+      /* Tray G from iP4800 onwards */
+      if ( !(strcmp(init->caps->name,"PIXMA iP4800")) || !(strcmp(init->caps->name,"PIXMA iP4900")) || !(strcmp(init->caps->name,"PIXMA MG5200")) || !(strcmp(init->caps->name,"PIXMA MG5300")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG6200")) || !(strcmp(init->caps->name,"PIXMA MG8100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) ) {
+	arg_ESCP_1 = 0x56;
+      }
+    }
+  }
+      /*  850i:  CD Tray custom: none --- no ESC (P */
+      /*  865i:  CD Tray custom: 0x35               */
+      /* MP500:  CD Tray D     : 0x4b               */
+      /* MP530:  CD Tray D     : 0x4b               */
+      /* MP600:  CD Tray F     : 0x51               */
+      /* MP610:  CD Tray F     : 0x51               */
+      /* MP630:  CD Tray G     : 0x53               */
+      /* MP640:  CD Tray G     : 0x53               */
+      /* MP700:  CD tray custom: none --- no ESC (P */
+      /* MP710:  CD tray custom: 0x35               */
+      /* MP730:  CD tray custom: none --- no ESC (P */
+      /* MP740:  CD tray custom: 0x35               */
+      /* MP750:  CD Tray B     : 0x40               */
+      /* MP760:  CD Tray B     : 0x40               */
+      /* MP770:  CD Tray B     : 0x40               */
+      /* MP780:  CD Tray B     : 0x40               */
+      /* MP790:  CD Tray B     : 0x40               */
+      /* MP800:  CD Tray D     : 0x4b               */
+      /* MP810:  CD Tray F     : 0x51               */
+      /* MP830:  CD Tray D     : 0x4b               */
+      /* MP900:  CD Tray custom: 0x35               */
+      /* MP950:  CD Tray C     : 0x4a               */
+      /* MP960:  CD Tray F     : 0x51               */
+      /* MP970:  CD Tray F     : 0x51               */
+      /* MP980:  CD Tray G     : 0x53               */
+      /* MP990:  CD Tray G     : 0x53               */
+      /* MX850:  CD Tray F     : 0x51               */
+      /* iP3000: CD Tray B     : 0x40               */
+      /* iP3100: CD Tray B     : 0x40               */
+      /* iP4000: CD Tray B     : 0x40               */
+      /* iP4100: CD Tray B     : 0x40               */
+      /* iP4200: CD Tray C     : 0x4a               */
+      /* iP4300: CD Tray F     : 0x51               */
+      /* iP4500: CD Tray F     : 0x51               */
+      /* iP4600: CD Tray G     : 0x53               */
+      /* iP4700: CD Tray G     : 0x53               */
+      /* iP4800: CD Tray G     : 0x56               */
+      /* iP4900: CD Tray G     : 0x56               */
+      /* iP5000: CD Tray B     : 0x40               */
+      /* iP5200: CD Tray C     : 0x4a               */
+      /* iP5300: CD Tray F     : 0x51               */
+      /* iP6000D:CD Tray B     : 0x40               */
+      /* iP6100D:CD Tray B     : 0x40               */
+      /* iP6700D:CD Tray C     : 0x4a               */
+      /* iP7100: CD Tray B     : 0x40               */
+      /* iP7500: CD Tray C     : 0x4a               */
+      /* iP8100: CD Tray B     : 0x40               */
+      /* iP8500 :CD Tray B     : 0x40               */
+      /* iP8600: CD Tray B     : 0x40               */
+      /* iP9910: CD Tray A     : 0x3f               */
+      /* MG5200: CD Tray G     : 0x56               */
+      /* MG5300: CD Tray G     : 0x56               */
+      /* MG6100: CD Tray G     : 0x56               */
+      /* MG6200: CD Tray G     : 0x56               */
+      /* MG8100: CD Tray G     : 0x56               */
+      /* MG8200: CD Tray G     : 0x56               */
+      /* pro9000:CD Tray E     : 0x4c               */
+      /* pro9000mk2:CD Tray E  : 0x4c               */
+      /* pro9500:CD Tray E     : 0x4c               */
+      /* pro9500mk2:CD Tray E  : 0x4c               */
+      /* PRO-1:  CD Tray H     : 0x57               */
+
+
+
+  /* workaround for FineArt media having same size as non-FineArt media */
+
+      /* MP950:  FineArtA4     : 0x42               */
+      /* MP960:  FineArtA4     : 0x42               */
+      /* MP970:  FineArtA4     : 0x42               */
+      /* MP980:  FineArtA4     : 0x42               */
+      /* MP990:  FineArtA4     : 0x42               */
+      /* MX7600: FineArtA4     : 0x42               */
+      /* iP6700D:FineArtA4     : 0x42               */
+      /* iP7100: FineArtA4     : 0x42               */
+      /* iP7500: FineArtA4     : 0x42               */
+      /* iP8100: FineArtA4     : 0x42               */
+      /* iP8600: FineArtA4     : 0x42               */
+      /* iP9910: FineArtA4     : 0x42               */
+      /* iX7000: FineArtA4     : 0x42               */
+      /* MG6100: FineArtA4     : 0x42               */
+      /* MG6200: FineArtA4     : 0x42               */
+      /* MG8100: FineArtA4     : 0x42               */
+      /* MG8200: FineArtA4     : 0x42               */
+      /* pro9000:FineArtA4     : 0x4d               */
+      /* pro9000mk2:FineArtA4  : 0x4d               */
+      /* pro9500:FineArtA4     : 0x4d               */
+      /* pro9500mk2:FineArtA4  : 0x4d               */
+      /* PRO-1:  FineArtA4     : 0x4d               */
+
+  /* iP7100 is an exception needing yet another papersize code */
+  if ( (arg_ESCP_2 == 0x28) || ( arg_ESCP_2 == 0x29) || (arg_ESCP_2 ==  0x2c) || (arg_ESCP_2 == 0x31) ) {
+    /* A4 */
+    if ( arg_ESCP_1 == 0x03 ) {
+      /* default */
+      arg_ESCP_1 = 0x4d;
+      if ( !(strcmp(init->caps->name,"PIXMA MP950")) || !(strcmp(init->caps->name,"PIXMA MP960")) || !(strcmp(init->caps->name,"PIXMA MP970")) || !(strcmp(init->caps->name,"PIXMA MP980")) || !(strcmp(init->caps->name,"PIXMA MP990")) || !(strcmp(init->caps->name,"PIXMA MX7600")) || !(strcmp(init->caps->name,"PIXMA iP6700")) || !(strcmp(init->caps->name,"PIXMA iP7100")) || !(strcmp(init->caps->name,"PIXMA iP7500")) || !(strcmp(init->caps->name,"PIXMA iP8100")) || !(strcmp(init->caps->name,"PIXMA iP8600")) || !(strcmp(init->caps->name,"PIXMA iP9910")) || !(strcmp(init->caps->name,"PIXMA iX7000")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) || !(strcmp(init->caps->name,"PIXMA MG8100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) ) {
+	arg_ESCP_1 = 0x42;
+      }
+    }
+    /* A3 */
+    if ( arg_ESCP_1 == 0x05 ) {
+      arg_ESCP_1 = 0x4e;
+      if ( !(strcmp(init->caps->name,"PIXMA MP950")) || !(strcmp(init->caps->name,"PIXMA MP960")) || !(strcmp(init->caps->name,"PIXMA MP970")) || !(strcmp(init->caps->name,"PIXMA MP980")) || !(strcmp(init->caps->name,"PIXMA MP990")) || !(strcmp(init->caps->name,"PIXMA MX7600")) || !(strcmp(init->caps->name,"PIXMA iP6700")) || !(strcmp(init->caps->name,"PIXMA iP7100")) || !(strcmp(init->caps->name,"PIXMA iP7500")) || !(strcmp(init->caps->name,"PIXMA iP8100")) || !(strcmp(init->caps->name,"PIXMA iP8600")) || !(strcmp(init->caps->name,"PIXMA iP9910")) || !(strcmp(init->caps->name,"PIXMA iX7000")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) || !(strcmp(init->caps->name,"PIXMA MG8100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) ) {
+	arg_ESCP_1 = 0x43;
+      }
+    }
+    /* Letter */
+    if ( arg_ESCP_1 == 0x0d ) {
+      arg_ESCP_1 = 0x4f;
+      if ( !(strcmp(init->caps->name,"PIXMA MP950")) || !(strcmp(init->caps->name,"PIXMA MP960")) || !(strcmp(init->caps->name,"PIXMA MP970")) || !(strcmp(init->caps->name,"PIXMA MP980")) || !(strcmp(init->caps->name,"PIXMA MP990")) || !(strcmp(init->caps->name,"PIXMA MX7600")) || !(strcmp(init->caps->name,"PIXMA iP6700")) || !(strcmp(init->caps->name,"PIXMA iP7100")) || !(strcmp(init->caps->name,"PIXMA iP7500")) || !(strcmp(init->caps->name,"PIXMA iP8100")) || !(strcmp(init->caps->name,"PIXMA iP8600")) || !(strcmp(init->caps->name,"PIXMA iP9910")) || !(strcmp(init->caps->name,"PIXMA iX7000")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) || !(strcmp(init->caps->name,"PIXMA MG8100")) || !(strcmp(init->caps->name,"PIXMA MG8200")) ) {
+	arg_ESCP_1 = 0x44;
+      }
+    }
+  }
+
+  if ( init->caps->ESC_P_len == 8 ) /* support for new devices from 2012. TODO: check if XML contents are identical to 6-byte devices */
+    {/* the 4th of the 6 bytes is the media type. 2nd byte is media size. Both read from canon-media array. */
+
+      /* arg_ESCP_1 = 0x03; */ /* A4 size */
+      /* arg_ESCP_2 = 0x00; */ /* plain media */
+      /*                             size                media             */
+      canon_cmd( v,ESC28,0x50,8,0x00,arg_ESCP_1,0x00,arg_ESCP_2,0x01,0x00,0x01,0x00);
+    }
+  else if ( init->caps->ESC_P_len == 6 ) /* first devices with XML header and ender */
     {/* the 4th of the 6 bytes is the media type. 2nd byte is media size. Both read from canon-media array. */
 
       /* arg_ESCP_1 = 0x03; */ /* A4 size */
       /* arg_ESCP_2 = 0x00; */ /* plain media */
-      /*                             size      media                */
-      canon_cmd( v,ESC28,0x50,6,0x00,0x03,0x00,arg_ESCP_2,0x01,0x00);
+      /*                             size                media             */
+      canon_cmd( v,ESC28,0x50,6,0x00,arg_ESCP_1,0x00,arg_ESCP_2,0x01,0x00);
     }
-  else 
-    /*                             size      media       */
-    canon_cmd( v,ESC28,0x50,4,0x00,0x03,0x00,arg_ESCP_2 );
+  else if ( init->caps->ESC_P_len == 4 )  {/* 4 bytes */
+    /*                             size            media       */
+    canon_cmd( v,ESC28,0x50,4,0x00,arg_ESCP_1,0x00,arg_ESCP_2 );
+  }
+  else if ( init->caps->ESC_P_len == 2 )  {
+    /* 2 bytes only */
+      canon_cmd( v,ESC28,0x50,2,0x00,arg_ESCP_1 );
+    }	
+  else /* error in definition */
+    stp_deprintf(STP_DBG_CANON,"SEVERE BUG IN print-canon.c::canon_init_setESC_P() "
+		 "ESC_P_len=%d!!\n",init->caps->ESC_P_len);
 }
 
+/* ESC (S -- 0x53 -- unknown -- :
+   Required by iP90/iP90v and iP100 printers.
+ */
+static void
+canon_init_setESC_S(const stp_vars_t *v, const canon_privdata_t *init)
+{
+  unsigned char arg_ESCS_01,arg_ESCS_04,arg_ESCS_09,arg_ESCS_11;
+
+  if (!(init->caps->features & CANON_CAP_S))
+    return;
+
+  if (!(init->mode->flags & MODE_FLAG_S))
+    return;
+
+  /* iP90 defaults: based on non-photo media */
+  arg_ESCS_01 = 0x01;
+  arg_ESCS_04 = 0xff;
+  arg_ESCS_09 = 0x1a;
+  arg_ESCS_11 = 0x68;
+  
+  /* hard-coded for different media, color and  quality settings */
+  /* iP90 bytes 1,4,9 and 11 vary */
+  if ( !(strcmp(init->caps->name,"PIXMA iP90")) ) {
+    if ( !strcmp(init->mode->name,"600x600dpi_high2") || !strcmp(init->mode->name,"600x600dpi_high4") ) {
+      /* if inkset is color then set special bytes, else leave default.
+	 Note: in this case the mode only has CMYK, mono is a different mode.
+      */
+      if (init->used_inks == CANON_INK_CMYK) {
+	arg_ESCS_01 = 0xc1;
+	arg_ESCS_04 = 0xf1;
+	arg_ESCS_09 = 0x50;
+	arg_ESCS_11 = 0x28;
+      }
+    } else if ( !strcmp(init->mode->name,"300x300dpi_draft") ) {
+      /* set regardless of inkset */
+      arg_ESCS_09 = 0x02;
+      arg_ESCS_11 = 0x08;
+    } else if ( !strcmp(init->mode->name,"600x600dpi_draft2") ) {
+      /* if inkset is color then set special bytes, else leave default */
+      if (init->used_inks == CANON_INK_CMYK) {
+	arg_ESCS_09 = 0x0a;
+	arg_ESCS_11 = 0x28;
+      }
+    } else if ( !strcmp(init->mode->name,"600x600dpi_photohigh") || !strcmp(init->mode->name,"600x600dpi_photo") || !strcmp(init->mode->name,"600x600dpi_photodraft") ) {
+      /* almost all photo media need (same) changes from defaults */
+      /* exception: "600x600dpi_photohigh2" no ESC (S command */
+      /* exception: "600x600dpi_tshirt" no ESC (S command */
+      arg_ESCS_01 = 0xc1;
+      arg_ESCS_04 = 0xf0;
+      arg_ESCS_09 = 0x50;
+      arg_ESCS_11 = 0x28;
+    }
+  }
+  else if ( !(strcmp(init->caps->name,"PIXMA iP100")) ) {
+    /* iP100 bytes 9 and 11 vary */       
+    if ( !strcmp(init->mode->name,"300x300dpi_draft") ) {
+      /* set regardless of inkset */
+      arg_ESCS_09 = 0x02;
+      arg_ESCS_11 = 0x08;
+    } else if  ( !strcmp(init->mode->name,"600x600dpi_photohigh2") || !strcmp(init->mode->name,"600x600dpi_photohigh") || !strcmp(init->mode->name,"600x600dpi_photo2") || !strcmp(init->mode->name,"600x600dpi_photo") || !strcmp(init->mode->name,"600x600dpi_tshirt") ) {
+      /* all photo media need (same) changes from defaults */
+      arg_ESCS_09 = 0x0a;
+      arg_ESCS_11 = 0x28;
+    }
+  }
+
+      canon_cmd(v,ESC28,0x53,54,arg_ESCS_01,0x02,0xff,arg_ESCS_04,0x41,0x02,0x00,0x01,arg_ESCS_09,0x00,arg_ESCS_11,0x00,0x01,0x01,0x03,0x02,0x01,0x01,0x01,0x03,0x02,0x00,0x07,0x06,0x02,0x01,0x02,0x04,0x04,0x04,0x05,0x06,0x08,0x08,0x08,0x0a,0x0a,0x09,0x00,0x03,0x02,0x01,0x01,0x01,0x01,0x01,0x06,0x02,0x02,0x02,0x03,0x04,0x05,0x06);
+
+}
+
+
 /* ESC (T -- 0x54 -- setCartridge -- :
  */
 static void
 canon_init_setCartridge(const stp_vars_t *v, const canon_privdata_t *init)
 {
+  const char *ink_set;
+
   if (!(init->caps->features & CANON_CAP_T))
     return;
 
-  canon_cmd(v,ESC28,0x54,3,0x03,0x04,0x04); /* default: both cartridges */
+  ink_set = stp_get_string_parameter(v, "InkSet");
+
+  if (ink_set && !(strcmp(ink_set,"Both"))) {
+    if ( !(strcmp(init->caps->name,"PIXMA iP90")) || !(strcmp(init->caps->name,"PIXMA iP100")) ) {
+      canon_cmd(v,ESC28,0x54,3,0x02,0x00,0x00); /* default for iP90, iP100 */
+    } 
+    else if ( !(strcmp(init->caps->name,"PIXMA iP6210")) ) {
+      canon_cmd(v,ESC28,0x54,3,0x03,0x06,0x06); /* default for iP6210D, iP6220D, iP6310D */
+      /* both:  0x3 0x6 0x6 */
+      /* color: 0x3 0x1 0x1 */
+    }
+    else {
+      canon_cmd(v,ESC28,0x54,3,0x03,0x04,0x04); /* default: both cartridges */
+    }
+  }
+  else if (ink_set && !(strcmp(ink_set,"Black"))) {
+    if ( !(strcmp(init->caps->name,"PIXMA iP90")) || !(strcmp(init->caps->name,"PIXMA iP100")) ) {
+      canon_cmd(v,ESC28,0x54,3,0x02,0x00,0x00); /* default for iP90, iP100 */
+    } 
+    else if ( !(strcmp(init->caps->name,"PIXMA iP6210")) ) {
+	canon_cmd(v,ESC28,0x54,3,0x03,0x06,0x06); /* default for iP6210D, iP6220D, iP6310D */
+	/* both:  0x3 0x6 0x6 */
+	/* color: 0x3 0x1 0x1 */
+	/* workaround since does not have black option */
+    }
+    else {
+      canon_cmd(v,ESC28,0x54,3,0x03,0x02,0x02); /* default: black cartridge */
+    }
+  }
+  else if (ink_set && !(strcmp(ink_set,"Color"))) {
+    if ( !(strcmp(init->caps->name,"PIXMA iP90")) || !(strcmp(init->caps->name,"PIXMA iP100")) ) {
+      canon_cmd(v,ESC28,0x54,3,0x02,0x00,0x01); /* composite for iP90, iP100 */
+      /* black save     : 2 1 0 for selected plain (600dpi std) modes, rest remain 2 0 0 */
+      /* composite black: 2 0 1 for selected plain (600dpi std & draft) modes, rest remain 2 0 0 */
+      /* both above set : AND of bytes above */
+    } 
+    else if ( !(strcmp(init->caps->name,"PIXMA iP6210")) ) {
+      canon_cmd(v,ESC28,0x54,3,0x03,0x01,0x01); /* default for iP6210D, iP6220D, iP6310D */
+      /* both:  0x3 0x6 0x6 */
+      /* color: 0x3 0x1 0x1 */
+    }
+    else {
+      canon_cmd(v,ESC28,0x54,3,0x03,0x01,0x01); /* default: color cartridges */
+    }
+  }
+  else {
+    canon_cmd(v,ESC28,0x54,3,0x03,0x04,0x04); /* default: both cartridges */
+  }
 }
 
 /* ESC (q -- 0x71 -- setPageID -- :
@@ -1363,10 +4014,30 @@ canon_init_setX72(const stp_vars_t *v, const canon_privdata_t *init)
 
   if ( (init->caps->features & CANON_CAP_r)
        || (init->caps->features & CANON_CAP_rr) )
+    if  (init->caps->ESC_r_arg != 0) /* only output arg if non-zero */
       canon_cmd(v,ESC28,0x72, 1, init->caps->ESC_r_arg); /* whatever for - 8200/S200 need it */
-  if (init->caps->features & CANON_CAP_rr)
+  if (init->caps->features & CANON_CAP_rr) {
+    if ( !(strcmp(init->caps->name,"S200")) ) {
       canon_cmd(v,ESC28,0x72, 3, 0x63, 1, 0); /* whatever for - S200 needs it */
       /* probably to set the print direction of the head */
+    }
+    else if ( !(strcmp(init->caps->name,"S820")) || !(strcmp(init->caps->name,"S900")) || !(strcmp(init->caps->name,"i950")) || !(strcmp(init->caps->name,"i960")) || !(strcmp(init->caps->name,"i9100")) || !(strcmp(init->caps->name,"i9900")) || !(strcmp(init->caps->name,"PIXMA iP7100")) || !(strcmp(init->caps->name,"PIXMA iP8100")) || !(strcmp(init->caps->name,"PIXMA iP8500")) || !(strcmp(init->caps->name,"PIXMA iP8600")) || !(strcmp(init->caps->name,"PIXMA iP9910")) || !(strcmp(init->caps->name,"PIXMA MP900")) || !(strcmp(init->caps->name,"PIXMA Pro9000")) || !(strcmp(init->caps->name,"PIXMA Pro9002")) || !(strcmp(init->caps->name,"PIXMA Pro9500")) || !(strcmp(init->caps->name,"PIXMA Pro9502")) ) {
+      canon_cmd(v,ESC28,0x72, 2, 0x62, 0); /* 2 bytes */
+    }
+    /* CD mode only */
+    else if ( (init->mode->flags & MODE_FLAG_CD) && (!(strcmp(init->caps->name,"PIXMA iP4600")) || !(strcmp(init->caps->name,"PIXMA iP4700")) || !(strcmp(init->caps->name,"PIXMA MP980")) || !(strcmp(init->caps->name,"PIXMA MP990")) ) ) {
+      canon_cmd(v,ESC28,0x72, 1, 0x65);
+    }
+    /* CD mode only */
+    else if ( (init->mode->flags & MODE_FLAG_CD) && ( !(strcmp(init->caps->name,"PIXMA iP4800")) || !(strcmp(init->caps->name,"PIXMA MG6100")) || !(strcmp(init->caps->name,"PIXMA MG8100")) ) ) {
+      canon_cmd(v,ESC28,0x72, 1, 0x68);
+    }
+    /* CD mode only -- no ESC (r at all otherwise */
+    else if ( (init->mode->flags & MODE_FLAG_CD) && ( !(strcmp(init->caps->name,"PIXMA iP4900")) || !(strcmp(init->caps->name,"PIXMA MG5200")) || !(strcmp(init->caps->name,"PIXMA MG5300")) || !(strcmp(init->caps->name,"PIXMA MG6200")) || !(strcmp(init->caps->name,"PIXMA MG8200")) ) ) {
+      canon_cmd(v,ESC28,0x72, 1, 0x68);
+    }
+    /* other cases here */
+  }
 }
 
 /* ESC (r -- 0x72 -- ??? set direction ??? -- :
@@ -1402,12 +4073,18 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
     }else if(init->mode->flags & MODE_FLAG_IP8500){
     	buf[1]=0x00;
     	buf[2]=0x01;
+    }else if(init->mode->flags & MODE_FLAG_MP130){
+    	buf[1]=0x04;
+    	buf[2]=0x01;
+    }else if(init->mode->flags & MODE_FLAG_MP360){
+    	buf[1]=0x84;
+    	buf[2]=0x01;
     }else{
     	buf[1]=0x80;
     	buf[2]=0x01;
     }
     for(i=0;i<init->mode->num_inks;i++){
-        if(init->mode->inks[i].ink){
+        if(init->mode->inks[i].channel != 0){ /* 0 means ink is used in gutenprint for sub-channel setup but not intended for printer */
           if(init->mode->inks[i].ink->flags & INK_FLAG_5pixel_in_1byte)
             buf[3+i*3+0]=(1<<5)|init->mode->inks[i].ink->bits; /*info*/
            /*else if(init->mode->inks[i].ink->flags & INK_FLAG_lowresmode)
@@ -1425,7 +4102,8 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
             buf[3+i*3+2] = 0x04;*/
           /*else if (init->mode->inks[i].ink->bits == 1)
             buf[3+i*3+2] = 0x02;*/
-          buf[3+i*3+2]= init->mode->inks[i].ink->numsizes+1;/*level*/
+	  /*else*/ /* normal operation */
+	    buf[3+i*3+2]= init->mode->inks[i].ink->numsizes+1;/*level*/
           /*else
             buf[3+i*3+2] = 0x00;*/
           /* this should show that there is an error */
@@ -1456,8 +4134,25 @@ canon_init_setImage(const stp_vars_t *v, const canon_privdata_t *init)
   if (init->mode->inks[0].ink->bits>1) {
     arg_74_1= 0x02;
     arg_74_2= 0x80;
-    arg_74_3= 0x09;
+    arg_74_3= 0x09; /* default for most media */
+    /* FIXME: (Gernot) below must be corrected I think, since CMY is
+       not a function of the cartridge but of the driver selection of
+       which logical inks get sent to the printer. So here the
+       printers that use this should be enumerated, rather than a
+       generic condition based on CANON_INK_CMY */
     if (init->used_inks == CANON_INK_CMY) arg_74_3= 0x02; /* for BC-06 cartridge!!! */
+    /* example of better way: for BJC-3000 series */
+    if  (!strcmp(init->caps->name,"3000") || !strcmp(init->caps->name,"4300")) {
+      /* but if photo cartridge selection, set differently again */
+      if (init->mode->flags & MODE_FLAG_PHOTO)
+	arg_74_3= 0x0a;
+      /* T-Shirt (3), Backprint Film (3) or Transparencies (2) */
+      else if ((init->pt->media_code_c==2) || (init->pt->media_code_c==3))
+	arg_74_3= 0x01;
+      else
+	/* other media */
+	arg_74_3= 0x09; /* return to default after broken code above */
+    }
   }
 
   /* workaround for the bjc8200 in 6color mode - not really understood */
@@ -1490,31 +4185,77 @@ canon_init_setMultiRaster(const stp_vars_t *v, const canon_privdata_t *init){
 	return;
 
   canon_cmd(v,ESC28,0x49, 1, 0x1);  /* enable MultiLine Raster? */
-  canon_cmd(v,ESC28,0x4a, 1, init->caps->raster_lines_per_block);    /* set number of lines per raster block */
+  /* canon_cmd(v,ESC28,0x4a, 1, init->caps->raster_lines_per_block); */
+  canon_cmd(v,ESC28,0x4a, 1, init->mode->raster_lines_per_block);    /* set number of lines per raster block */
  
   /* set the color sequence */ 
   stp_zfwrite("\033(L", 3, 1, v);
   stp_put16_le(init->num_channels, v);
   /* add an exception here to add 0x60 of cmy channels for those printers/modes that require it */
   raster_channel_order=init->channel_order;
-  /*  if (!strcmp(init->caps->name,"MP450"))*/
+  if ( !(strcmp(init->caps->name,"PIXMA MP140")) || !(strcmp(init->caps->name,"PIXMA MP150")) || !(strcmp(init->caps->name,"PIXMA MP160")) || !(strcmp(init->caps->name,"PIXMA MP170")) || !(strcmp(init->caps->name,"PIXMA MP180")) || !(strcmp(init->caps->name,"PIXMA MP190")) || !(strcmp(init->caps->name,"PIXMA MP210")) || !(strcmp(init->caps->name,"PIXMA MP220")) || !(strcmp(init->caps->name,"PIXMA MP240")) || !(strcmp(init->caps->name,"PIXMA MP250")) || !(strcmp(init->caps->name,"PIXMA MP270")) || !(strcmp(init->caps->name,"PIXMA MP280")) || !(strcmp(init->caps->name,"PIXMA MP450")) || !(strcmp(init->caps->name,"PIXMA MP460")) || !(strcmp(init->caps->name,"PIXMA MP470")) || !(strcmp(init->caps->name,"PIXMA MP480")) || !(strcmp(init->caps->name,"PIXMA MP490")) || !(strcmp(init->caps->name,"PIXMA MP495")) || !(strcmp(init->caps->name,"PIXMA MX300")) || !(strcmp(init->caps->name,"PIXMA MX310")) || !(strcmp(init->caps->name,"PIXMA MX330")) || !(strcmp(init->caps->name,"PIXMA MX340")) || !(strcmp(init->caps->name,"PIXMA MX350")) || !(strcmp(init->caps->name,"PIXMA MX360"))  || !(strcmp(init->caps->name,"PIXMA MX370")) || !(strcmp(init->caps->name,"PIXMA MX410")) || !(strcmp(init->caps->name,"PIXMA MX510")) || !(strcmp(init->caps->name,"PIXMA iP2700")) || !(strcmp(init->caps->name,"PIXMA MG2100")) )
     {
-      /* if cmy there, add 0x60 to each --- this is not yet correct, some modes do not require it! */
-      /*      if (init->num_channels==7) {*/
-	for(i=0;i<init->num_channels;i++){
-	  switch(init->channel_order[i]){
-	    /* case 'c':raster_channel_order[i]+=0x60; break;;*/
-	    /* case 'm':raster_channel_order[i]+=0x60; break;;*/
-	    /* case 'y':raster_channel_order[i]+=0x60; break;;*/
-	  }
+      /* if cmy there, add 0x60 to each --- all modes using cmy require it */
+      for(i=0;i<init->num_channels;i++){
+	switch(init->channel_order[i]){
+	case 'c':raster_channel_order[i]+=0x60; break;;
+	case 'm':raster_channel_order[i]+=0x60; break;;
+	case 'y':raster_channel_order[i]+=0x60; break;;
 	}
-	/*}*/
+      }
+      /* Gernot: debug */
+      /* if CMY there, add 0x80 to each to change to cmy+0x60 */
+      /*     for(i=0;i<init->num_channels;i++){
+	switch(init->channel_order[i]){
+	case 'C':raster_channel_order[i]+=0x80; break;;
+	case 'M':raster_channel_order[i]+=0x80; break;;
+	case 'Y':raster_channel_order[i]+=0x80; break;;
+	}
+	}*/
       stp_zfwrite((const char *)raster_channel_order,init->num_channels, 1, v);
     }
-    /*  else
+  /* note these names are from canon-printers.h, only separate driver strings are required */
+  else if ( !(strcmp(init->caps->name,"PIXMA iP6210")) ) {
+    /* if cmy there, add 0x60 to each --- only some modes using cmy require it */
+    /* case one: all modes with only cmy */
+    if (init->num_channels==3) {
+      for(i=0;i<init->num_channels;i++){
+	switch(init->channel_order[i]){
+	case 'c':raster_channel_order[i]+=0x60; break;;
+	case 'm':raster_channel_order[i]+=0x60; break;;
+	case 'y':raster_channel_order[i]+=0x60; break;;
+	}
+      }
+    }
+    /* case two: CMYcmy modes, but not CMYkcm modes */
+    else if ( (init->num_channels==6) && (init->used_inks==CANON_INK_CMY) ) {
+      for(i=0;i<init->num_channels;i++){
+	switch(init->channel_order[i]){
+	case 'c':raster_channel_order[i]+=0x60; break;;
+	case 'm':raster_channel_order[i]+=0x60; break;;
+	case 'y':raster_channel_order[i]+=0x60; break;;
+	}
+      }
+    }
+    /* case three: CMYkm modes with 0x80 to subtract from all inks with 2 or 8 bits */
+    else if ( (init->num_channels==6) && (init->used_inks==CANON_INK_CcMmYK) && ((init->mode->inks[0].ink->bits==2) || (init->mode->inks[0].ink->bits==8)) ) {
+      for(i=0;i<init->num_channels;i++){
+	switch(init->channel_order[i]){
+	case 'C':raster_channel_order[i]+=0x80; break;;
+	case 'M':raster_channel_order[i]+=0x80; break;;
+	case 'Y':raster_channel_order[i]+=0x80; break;;
+	case 'c':raster_channel_order[i]+=0x80; break;;
+	case 'm':raster_channel_order[i]+=0x80; break;;
+	case 'k':raster_channel_order[i]+=0x80; break;;
+	}
+      }
+    }
+    stp_zfwrite((const char *)raster_channel_order,init->num_channels, 1, v);
+  }
+  else
     {
       stp_zfwrite((const char *)init->channel_order,init->num_channels, 1, v);
-      }*/
+    }
 }
 
 
@@ -1527,6 +4268,7 @@ canon_init_printer(const stp_vars_t *v, const canon_privdata_t *init)
   /* init printer */
   if (init->is_first_page) {
     canon_init_resetPrinter(v,init);       /* ESC [K */
+    canon_init_setESC_M(v,init);           /* ESC (M */
     canon_init_setDuplex(v,init);          /* ESC ($ */
   }
   canon_init_setPageMode(v,init);        /* ESC (a */
@@ -1540,6 +4282,7 @@ canon_init_printer(const stp_vars_t *v, const canon_privdata_t *init)
   canon_init_setPageMargins2(v,init);    /* ESC (p */
   canon_init_setESC_P(v,init);           /* ESC (P */
   canon_init_setCartridge(v,init);       /* ESC (T */
+  canon_init_setESC_S(v,init);           /* ESC (S */
   canon_init_setTray(v,init);            /* ESC (l */
   canon_init_setX72(v,init);             /* ESC (r */
   canon_init_setMultiRaster(v,init);     /* ESC (I (J (L */
@@ -1549,7 +4292,8 @@ canon_init_printer(const stp_vars_t *v, const canon_privdata_t *init)
   mytop= (init->top*init->mode->ydpi)/72;
 
   if(init->caps->features & CANON_CAP_I)
-    mytop /= init->caps->raster_lines_per_block;
+    /* mytop /= init->caps->raster_lines_per_block; */
+    mytop /= init->mode->raster_lines_per_block;
 
   if(mytop)
     canon_cmd(v,ESC28,0x65, 2, (mytop >> 8 ),(mytop & 255));
@@ -1700,16 +4444,21 @@ static int canon_setup_channel(stp_vars_t *v,canon_privdata_t* privdata,int chan
     if(ink->channel && ink->density > 0.0){
         int delay = canon_get_delay(privdata,ink->channel);
         canon_channel_t* current;
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: (start) privdata->num_channels %d\n", privdata->num_channels);
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: (start) privdata->channel_order %s\n", privdata->channel_order);
         /* create a new channel */
         privdata->channels = stp_realloc(privdata->channels,sizeof(canon_channel_t) * (privdata->num_channels + 1));
         privdata->channel_order = stp_realloc(privdata->channel_order,privdata->num_channels + 2);
         /* update channel order */
         privdata->channel_order[privdata->num_channels]=ink->channel;
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: ink->channel %c\n", ink->channel);
         privdata->channel_order[privdata->num_channels+1]='\0';
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: (terminated)privdata->channel_order %s\n", privdata->channel_order);
         current = &(privdata->channels[privdata->num_channels]);
         ++privdata->num_channels;
         /* fill ink properties */
         current->name = ink->channel;
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: current->name %c\n", current->name);
         current->props = ink->ink;
         current->delay = delay;
         /* calculate buffer length */
@@ -1726,9 +4475,14 @@ static int canon_setup_channel(stp_vars_t *v,canon_privdata_t* privdata,int chan
         *shades = stp_realloc(*shades,(subchannel + 1) * sizeof(stp_shade_t));
 	/* move previous shades up one position as set_inks_full expects the subchannels first */
 	if(subchannel)
-		memcpy(*shades + 1,*shades,sizeof(stp_shade_t) * subchannel);
+		memmove(*shades + 1,*shades,sizeof(stp_shade_t) * subchannel);
         (*shades)[0].value = ink->density;
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channel: ink->density %.3f\n", ink->density);
         (*shades)[0].numsizes = ink->ink->numsizes;
+	/* test for 4-4 inket with 8 levels spaced every 2nd */
+	/*if (ink->ink->bits == 4)
+	  (*shades)[0].numsizes = 8;*/
+
         (*shades)[0].dot_sizes = ink->ink->dot_sizes;
         return 1;
     } 
@@ -1770,19 +4524,34 @@ static void canon_setup_channels(stp_vars_t *v,canon_privdata_t* privdata){
         stp_shade_t* shades = NULL;
 	int is_black_channel = 0;
         channel = channel_order[channel_idx];
+	stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: channel %d\n", channel);
         if(channel == STP_ECOLOR_K && privdata->used_inks & CANON_INK_K_MASK){ /* black channel */
             /* find K and k inks */
             for(i=0;i<privdata->mode->num_inks;i++){
                 const canon_inkset_t* ink = &privdata->mode->inks[i];
-                if(ink->channel == primary[channel] || ink->channel == secondary[channel])
+                if(ink->channel == primary[channel] || ink->channel == secondary[channel]) {
                     subchannel += canon_setup_channel(v,privdata,channel,subchannel,ink,&shades);
+		    /* Gernot: add */
+		    stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: got a black channel\n");
+		}
             }
 	    is_black_channel = 1;
+	    /* adding cmy channels */
+	    /*}else if(channel != STP_ECOLOR_K && privdata->used_inks & (CANON_INK_CMY_MASK | CANON_INK_cmy_MASK)){ */ /* color channels */
         }else if(channel != STP_ECOLOR_K && privdata->used_inks & CANON_INK_CMY_MASK){  /* color channels */
             for(i=0;i<privdata->mode->num_inks;i++){
                 const canon_inkset_t* ink = &privdata->mode->inks[i];
-                if(ink->channel == primary[channel] || ((privdata->used_inks & CANON_INK_CcMmYyKk_MASK) && (ink->channel == secondary[channel])))
-                    subchannel += canon_setup_channel(v,privdata,channel,subchannel,ink,&shades);
+		stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: loop non-K inks %d\n", i);
+                /*if(ink->channel == primary[channel] || ((privdata->used_inks & (CANON_INK_CcMmYyKk_MASK | CANON_INK_cmy_MASK)) && (ink->channel == secondary[channel]))) {*/
+                if(ink->channel == primary[channel] || ((privdata->used_inks & (CANON_INK_CcMmYyKk_MASK|CANON_INK_CMY_MASK)) && (ink->channel == secondary[channel]))) {
+		/* Gernot: see if this works: use the masks that includes secondary channels */
+                /* if(ink->channel == primary[channel] || ((privdata->used_inks & CANON_INK_CMYKk_MASK ) && (ink->channel == secondary[channel]))) {*/
+		  subchannel += canon_setup_channel(v,privdata,channel,subchannel,ink,&shades);
+		  stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: adding subchannel\n");
+		}
+		else {
+		  stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: not creating subchannel\n"); 
+		}
             } 
         }
 
@@ -1791,6 +4560,7 @@ static void canon_setup_channels(stp_vars_t *v,canon_privdata_t* privdata){
           stp_dither_set_inks_full(v,channel, subchannel, shades, 1.0, ink_darkness[channel]);
           for(i=0;i<subchannel;i++){
             double density = get_double_param(v, primary_density_control[channel]) * get_double_param(v, "Density");
+	    stp_dprintf(STP_DBG_CANON, v, "canon_setup_channels: loop subchannels for shades %d\n", i);
             if(i > 0 && secondary_density_control[channel])
               density *= get_double_param(v, secondary_density_control[channel]);
             stp_channel_set_density_adjustment(v,channel,subchannel,density);
@@ -1844,10 +4614,17 @@ static void setup_page(stp_vars_t* v,canon_privdata_t* privdata){
 
   privdata->top = stp_get_top(v);
   privdata->left = stp_get_left(v);
-  privdata->out_width = stp_get_width(v);
-  privdata->out_height = stp_get_height(v);
+  privdata->out_width = stp_get_width(v); /* check Epson: page_true_width */
+  privdata->out_height = stp_get_height(v); /* check Epson: page_true_height */
 
-  internal_imageable_area(v, 0, &page_left, &page_right,
+  stp_deprintf(STP_DBG_CANON,"stp_get_width: privdata->out_width is %i\n",privdata->out_width);
+  stp_deprintf(STP_DBG_CANON,"stp_get_height: privdata->out_height is %i\n",privdata->out_height);
+
+  /* Don't use full bleed mode if the paper itself has a margin */
+  if (privdata->left > 0 || privdata->top > 0)
+    stp_set_boolean_parameter(v, "FullBleed", 0);
+
+  internal_imageable_area(v, 0, 0, &page_left, &page_right,
                           &page_bottom, &page_top);
   if (print_cd) {
     privdata->cd_inner_radius = hub_size / 2;
@@ -1858,11 +4635,34 @@ static void setup_page(stp_vars_t* v,canon_privdata_t* privdata){
     privdata->page_height = privdata->top + privdata->out_height;
   } else {
     privdata->left -= page_left;
-    privdata->top -= page_top;
-    privdata->page_width = page_right - page_left;
-    privdata->page_height = page_bottom - page_top;
-  }
+    privdata->top -= page_top; /* checked in Epson: matches */
+    privdata->page_width = page_right - page_left; /* checked in Epson: matches */
+    privdata->page_height = page_bottom - page_top; /* checked in Epson: matches */
+
+    if (ERRPRINT) {
+      stp_eprintf(v,"============================set_imageable_area========================\n");
+      stp_eprintf(v,"setup_page page_top = %i\n",page_top);
+      stp_eprintf(v,"setup_page page_bottom = %i\n",page_bottom);
+      stp_eprintf(v,"setup_page page_left = %i\n",page_left);
+      stp_eprintf(v,"setup_page page_right = %i\n",page_right);
+      stp_eprintf(v,"setup_page top = %i\n",privdata->top);
+      stp_eprintf(v,"setup_page left = %i\n",privdata->left);
+      stp_eprintf(v,"setup_page out_height = %i\n",privdata->out_height);
+      stp_eprintf(v,"setup_page page_height = %i\n",privdata->page_height);
+      stp_eprintf(v,"setup_page page_width = %i\n",privdata->page_width);
+    }
+
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_top = %i\n",page_top);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_bottom = %i\n",page_bottom);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_left = %i\n",page_left);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_right = %i\n",page_right);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page top = %i\n",privdata->top);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page left = %i\n",privdata->left);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page out_height = %i\n",privdata->out_height);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_height = %i\n",privdata->page_height);
+    stp_dprintf(STP_DBG_CANON, v, "setup_page page_width = %i\n",privdata->page_width);
 
+  }
 }
 
 
@@ -1930,27 +4730,40 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   int i;
   int		status = 1;
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
+  const char    *ink_type = stp_get_string_parameter(v, "InkType");
   const char    *duplex_mode =stp_get_string_parameter(v, "Duplex");
   int           page_number = stp_get_int_parameter(v, "PageNumber");
   const canon_cap_t * caps= canon_get_model_capabilities(v);
-  int		y;		/* Looping vars */
+  const canon_modeuselist_t* mlist = caps->modeuselist;
+#if 0
+  const canon_modeuse_t* muse;
+#endif
+  /*  int monocheck = 0;
+      int colcheck = 0; */
+  int		x,y;		/* Looping vars */
   canon_privdata_t privdata;
   int		errdiv,		/* Error dividend */
 		errmod,		/* Error modulus */
 		errval,		/* Current error value */
 		errline,	/* Current raster line */
-		errlast,	/* Last raster line loaded */
+                errlast;	/* Last raster line loaded */
+#if 0
 		out_channels;	/* Output bytes per pixel */
+#endif
   unsigned	zero_mask;
   int           print_cd= (media_source && (!strcmp(media_source, "CD")));
-  int           image_height,
-                image_width;
+  int           image_height;
+#if 0
+  int           image_width;
+#endif
   double        k_upper, k_lower;
   unsigned char *cd_mask = NULL;
   double outer_r_sq = 0;
   double inner_r_sq = 0;
   unsigned char* weave_cols[4] ; /* TODO clean up weaving code to be more generic */
 
+  stp_dprintf(STP_DBG_CANON, v, "Entering canon_do_print\n");
+
   if (!stp_verify(v))
     {
       stp_eprintf(v, "Print options not verified; cannot print.\n");
@@ -1970,37 +4783,142 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   memset(&privdata,0,sizeof(canon_privdata_t));
   privdata.caps = caps;
 
-  /* find the wanted print mode */
+  /* find the wanted media type */
+  /* - media type has priority
+     - then we select source
+     - then inkset (cartridge selection)
+     - then we select duplex
+     - after that we compare if mode is compatible with media
+     - if not, we replace it using closest quality setting
+     - then we decide on printhead colors based on actual mode to use
+   */
+
+  privdata.pt = get_media_type(caps,stp_get_string_parameter(v, "MediaType"));
+  privdata.slot = canon_source_type(media_source,caps);
+
+  /* ---  make adjustment to InkSet based on Media --- */
+
+  /* cartridge selection if any: default is Both---but should change to NULL if CANON_CAP_T is not available */
+  /* check if InkSet chosen is possible for this Media */
+  /* - if Black, check if modes for selected media have a black flag */
+  /*   else, set InkSet to "Both" for now */
+
+  /* scroll through modeuse list to find media */
+  for(i=0;i<mlist->count;i++){
+    if(!strcmp(privdata.pt->name,mlist->modeuses[i].name)){
+#if 0
+      muse = &mlist->modeuses[i];
+#endif
+      break;
+    }
+  }
+
+  if ( !strcmp(stp_get_string_parameter(v, "InkSet"),"Black")) {
+    /* check if there is any mode for that media with K-only inktype */
+    /* if not, change it to "Both" */
+    /* NOTE: User cannot force monochrome printing here, since that would require changing the Color Model */
+    if (!(mlist->modeuses[i].use_flags & INKSET_BLACK_SUPPORT)) {
+      stp_set_string_parameter(v, "InkSet", "Both");	
+    }
+  }
+  /* Color-only */
+  else if ( !strcmp(stp_get_string_parameter(v, "InkSet"),"Color") && (caps->features & CANON_CAP_T) ) {
+    /* check if there is any mode for that media with no K in the inkset at all */
+    /* if not, change it to "Both" */
+    if (!(mlist->modeuses[i].use_flags & INKSET_COLOR_SUPPORT)) {
+      stp_set_string_parameter(v, "InkSet", "Both");	
+    }
+  }
+  /* no restriction for "Both" (non-BJC) or "Color" (BJC) or "Photo" yet */
+
+  /* get InkSet after adjustment */
+  privdata.ink_set = stp_get_string_parameter(v, "InkSet");
+
+  /* --- no current restrictions for Duplex setting --- */
+
+  /* in particular, we do not constraint duplex printing to certain media */
+  privdata.duplex_str = duplex_mode;
+
+  /* ---  make adjustment to InkType to comply with InkSet --- */
+
+  /*  although InSet adjustment is pre-supposed, even if InkSet is not
+      adjusted, the InkType adjustment will be validated against mode
+      later */
+  if (!strcmp(privdata.ink_set,"Black")) {
+    if (strcmp(ink_type,"Gray")) {/* if ink_type is NOT set to Gray yet */
+      stp_dprintf(STP_DBG_CANON, v, "canon_do_print: InkSet Black, so InkType set to Gray\n");
+      stp_set_string_parameter(v, "InkType", "Gray");
+    }
+  } /* Color-only */
+  else if ( !strcmp(privdata.ink_set,"Color") && (caps->features & CANON_CAP_T) ) {
+    if (strcmp(ink_type,"RGB")) {/* if ink_type is NOT set to RGB (CMY) yet */
+      stp_dprintf(STP_DBG_CANON, v, "canon_do_print: InkSet Color, so InkType changed to RGB (CMY)\n");
+      stp_set_string_parameter(v, "InkType", "RGB");
+    }
+  } /* no restriction for InkSet set to "Both" or "Photo" */
+
+  /* --- make adjustments to mode --- */
+
+  /* find the wanted print mode: NULL if not yet set */
+  if (ERRPRINT)
+    stp_eprintf(v,"Calling get_current_parameter from canon_do_print routine (before default set)");
+  stp_dprintf(STP_DBG_CANON, v, "canon_do_print: calling canon_get_current_mode\n");
   privdata.mode = canon_get_current_mode(v);
 
+  if(!privdata.mode) {
+    privdata.mode = &caps->modelist->modes[caps->modelist->default_mode];
+  }
+  
+  /* then call get_current_mode again to sort out the correct matching of parameters and mode selection */
+  if (ERRPRINT)
+    stp_eprintf(v,"Calling cannon_check_current_parameter from canon_do_print routine (after default set)");
+  
+  stp_dprintf(STP_DBG_CANON, v, "canon_do_print: calling canon_check_current_mode\n");
+
+  privdata.mode = canon_check_current_mode(v);
+
+  /* --- completed all adjustments: options should be consistent --- */
+
   /* set quality */
   privdata.quality = privdata.mode->quality;
 
+
   /* force grayscale if image is grayscale
    *                 or single black cartridge installed
    */
   privdata.used_inks = canon_printhead_colors(v);
   if (privdata.used_inks == CANON_INK_K)
       stp_set_string_parameter(v, "PrintingMode", "BW");
+  else
+    stp_set_string_parameter(v, "PrintingMode", "Color");
 
   setup_page(v,&privdata);
 
   image_height = stp_image_height(image);
+
+#if 0
   image_width = stp_image_width(image);
+#endif
 
-  privdata.pt = get_media_type(caps,stp_get_string_parameter(v, "MediaType"));
-  privdata.slot = canon_source_type(media_source,caps);
-  privdata.duplex_str = duplex_mode;
   privdata.is_first_page = (page_number == 0);
 
  /*
   * Convert image size to printer resolution...
   */
+#if 0
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: unused image_width is %i pts(?)\n",image_width);
+#endif
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.out_width is %i pts\n",privdata.out_width);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.out_height is %i pts\n",privdata.out_height);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.left is %i pts\n",privdata.left);
 
   privdata.out_width  = privdata.mode->xdpi * privdata.out_width / 72;
   privdata.out_height = privdata.mode->ydpi * privdata.out_height / 72;
+  privdata.left       = privdata.mode->xdpi * privdata.left / 72;
 
-  privdata.left = privdata.mode->xdpi * privdata.left / 72;
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.out_width is %i dots\n",privdata.out_width);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.out_height is %i dots\n",privdata.out_height);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.left is %i dots\n",privdata.left);
 
   stp_deprintf(STP_DBG_CANON,"density is %f\n",
                stp_get_float_parameter(v, "Density"));
@@ -2033,22 +4951,37 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     stp_set_string_parameter(v, "STPIOutputType", "KCMY");
   else if(privdata.used_inks & CANON_INK_CMY_MASK)
     stp_set_string_parameter(v, "STPIOutputType", "CMY");
+  /* Gernot: addition */
+  /*else if(privdata.used_inks & CANON_INK_cmy_MASK)
+    stp_set_string_parameter(v, "STPIOutputType", "cmy");*/
   else
     stp_set_string_parameter(v, "STPIOutputType", "Grayscale");
 
   privdata.length = (privdata.out_width + 7) / 8;
 
+  stp_deprintf(STP_DBG_CANON,"privdata.length is %i\n",privdata.length);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.num_channels is %i\n",privdata.num_channels);
+
   stp_dither_init(v, image, privdata.out_width, privdata.mode->xdpi, privdata.mode->ydpi);
 
+
+  stp_deprintf(STP_DBG_CANON,"privdata.out_width is %i (after stp_dither_init)\n",privdata.out_width);
+  stp_deprintf(STP_DBG_CANON,"privdata.length is %i (after stp_dither_init)\n",privdata.length);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.num_channels is %i (after stp_dither_init)\n",privdata.num_channels);
+
   canon_setup_channels(v,&privdata);
 
+  stp_deprintf(STP_DBG_CANON,"privdata.out_width is %i (after canon_setup_channels)\n",privdata.out_width);
+  stp_deprintf(STP_DBG_CANON,"privdata.length is %i (after canon_setup_channels)\n",privdata.length);
+  stp_deprintf(STP_DBG_CANON,"canon_do_print: privdata.num_channels is %i (after canon_setup_channels)\n",privdata.num_channels);
 
   stp_deprintf(STP_DBG_CANON,
 	       "canon: driver will use colors %s\n",privdata.channel_order);
 
   /* Allocate compression buffer */
   if(caps->features & CANON_CAP_I)
-      privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2 * caps->raster_lines_per_block * privdata.num_channels); /* for multiraster we need to buffer 8 lines for every color */
+    /*privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2 * caps->raster_lines_per_block * privdata.num_channels); */
+      privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2 * privdata.mode->raster_lines_per_block * privdata.num_channels); /* for multiraster we need to buffer 8 lines for every color */
   else
       privdata.comp_buf = stp_zalloc(privdata.buf_length_max * 2);
   /* Allocate fold buffer */
@@ -2096,7 +5029,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 
        privdata.ncolors = 4;
        privdata.head_offset = stp_zalloc(sizeof(int) * privdata.ncolors);
-       memset(privdata.head_offset, 0, sizeof(privdata.head_offset));
+       memset(privdata.head_offset, 0, sizeof(*privdata.head_offset));
 
        if ( privdata.used_inks == CANON_INK_K )
            privdata.nozzles = 64; /* black nozzles */
@@ -2121,6 +5054,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
          }
        else  /* colormode == CMY */
          {
+           privdata.ncolors = 3;
            privdata.head_offset[0] = 0; /* K starts at 0 */
            privdata.head_offset[1] = 0 ;/* how far C starts after K */
            privdata.head_offset[2] = 64;/* how far M starts after K */
@@ -2163,13 +5097,30 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
                                 stp_compute_uncompressed_linewidth);
        privdata.last_pass_offset = 0;
 
+       if (ERRPRINT) {
+	 for(x=0;x<4;x++){
+	   stp_eprintf(v, "DEBUG print-canon weave: weave_color_order[%d]: %u\n",
+		       x, (unsigned int)weave_color_order[x]);
+	 }
+	 for(x=0;x<privdata.num_channels;x++){
+	   stp_eprintf(v, "DEBUG print-canon weave: channel_order[%d]: %u\n",
+		       x, (unsigned int)privdata.channel_order[x]);
+	 }
+       }
+
+       for(i=0;i<4;i++){/* need all 4 channels for weave_cols, but not for privdata.num_channels! */
+	   /* see if it helps to initialize to zero */
+	   weave_cols[i] = 0;
+	   privdata.weave_bits[i] = 0;
 
-       for(i=0;i<4;i++){
-           int x;
            for(x=0;x<privdata.num_channels;x++){
-               if(weave_color_order[i] == privdata.channel_order[x])
-                   weave_cols[i] = privdata.channels[x].buf;
-                   privdata.weave_bits[i] = privdata.channels[x].props->bits;
+	     if(weave_color_order[i] == privdata.channel_order[x]){
+	       weave_cols[i] = privdata.channels[x].buf;
+	       privdata.weave_bits[i] = privdata.channels[x].props->bits;
+	       if (ERRPRINT)
+		 stp_eprintf(v, "DEBUG print-canon weave: set weave_cols[%d] to privdata.channels[%d].buf\n",
+			     i, x);
+	     }
            }
        }
   }
@@ -2186,7 +5137,10 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   canon_set_curve_parameter(v,"LumMap",STP_CURVE_COMPOSE_MULTIPLY,caps->lum_adjustment,privdata.pt->lum_adjustment,privdata.mode->lum_adjustment);
   canon_set_curve_parameter(v,"SatMap",STP_CURVE_COMPOSE_MULTIPLY,caps->sat_adjustment,privdata.pt->sat_adjustment,privdata.mode->sat_adjustment);
 
+#if 0
   out_channels = stp_color_init(v, image, 65536);
+#endif
+  (void) stp_color_init(v, image, 65536);
   stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
 
   privdata.emptylines = 0;
@@ -2325,7 +5279,7 @@ static const stp_printfuncs_t print_canon_printfuncs =
   canon_parameters,
   stp_default_media_size,
   canon_imageable_area,
-  canon_imageable_area,
+  canon_maximum_imageable_area,
   canon_limit,
   canon_print,
   canon_describe_resolution,
@@ -2358,21 +5312,22 @@ static int canon_compress(stp_vars_t *v, canon_privdata_t *pd, unsigned char* li
   int offset2,bitoffset;
 
   /* Don't send blank lines... */
-
+  
   if (line[0] == 0 && memcmp(line, line + 1, (length * bits)  - 1) == 0)
     return 0;
-
+  
+  /* if no modulation: 1 bit per pixel */
+  
   offset2 = offset / 8;
   bitoffset = offset % 8;
-
+  
   /* fold lsb/msb pairs if drop modulation is active */
-
-
+  
   if (bits==2) {
     int pixels_per_byte = 4;
     if(ink_flags & INK_FLAG_5pixel_in_1byte)
       pixels_per_byte = 5;
-
+    
     stp_fold(line,length,pd->fold_buf);
     in_ptr= pd->fold_buf;
     length= (length*8/4); /* 4 pixels in 8bit */
@@ -2402,10 +5357,18 @@ static int canon_compress(stp_vars_t *v, canon_privdata_t *pd, unsigned char* li
     offset2 = offset / 2; 
     bitoffset= offset % 2;
   }
+  else if (bits==8) {
+    stp_fold_8bit(line,length,pd->fold_buf);
+    in_ptr= pd->fold_buf;
+    length    = length*8; /* 1 pixel per 8 bits */
+    offset2   = offset;
+    bitoffset = 0;
+  }
     
   /* pack left border rounded to multiples of 8 dots */
 
   comp_data= comp_buf;
+
   while (offset2>0) {
     unsigned char toffset = offset2 > 127 ? 127 : offset2;
     comp_data[0] = 1 - toffset;
@@ -2415,25 +5378,25 @@ static int canon_compress(stp_vars_t *v, canon_privdata_t *pd, unsigned char* li
   }
   if (bitoffset) {
     if (bitoffset<8)
-    {
-       in_ptr[ length++ ] = 0;
-       canon_shift_buffer(in_ptr,length,bitoffset);
-    }
+      {
+	in_ptr[ length++ ] = 0;
+	canon_shift_buffer(in_ptr,length,bitoffset);
+      }
     else if (bitoffset == 8)
-    {
-      memmove(in_ptr + 1,in_ptr,length++);
-      in_ptr[0] = 0;
-    }
+      {
+	memmove(in_ptr + 1,in_ptr,length++);
+	in_ptr[0] = 0;
+      }
     else
       stp_deprintf(STP_DBG_CANON,"SEVERE BUG IN print-canon.c::canon_write() "
-	      "bitoffset=%d!!\n",bitoffset);
+		   "bitoffset=%d!!\n",bitoffset);
   }
-
-    if(ink_flags & INK_FLAG_5pixel_in_1byte)
-       length = pack_pixels(in_ptr,length);
-
+  
+  if(ink_flags & INK_FLAG_5pixel_in_1byte)
+    length = pack_pixels(in_ptr,length);
+  
   stp_pack_tiff(v, in_ptr, length, comp_data, &comp_ptr, NULL, NULL);
-
+  
   return comp_ptr - comp_buf;
 }
 
@@ -2497,7 +5460,7 @@ canon_write_line(stp_vars_t *v)
 
       /* TODO optimize => move reorder code to do_print */
       for(x=0;x < pd->num_channels; x++){
-          if(pd->channels[x].name == write_sequence[i]){
+	if(pd->channels[x].name == write_sequence[i]){
               channel = &(pd->channels[x]);
               break;
           }
@@ -2530,7 +5493,8 @@ static void canon_write_block(stp_vars_t* v,canon_privdata_t* pd,unsigned char*
 
 static void canon_write_multiraster(stp_vars_t *v,canon_privdata_t* pd,int y){
     int i;
-    int raster_lines_per_block = pd->caps->raster_lines_per_block;
+    /*int raster_lines_per_block = pd->caps->raster_lines_per_block;*/
+    int raster_lines_per_block = pd->mode->raster_lines_per_block;
     unsigned int max_length = 2*pd->buf_length_max * raster_lines_per_block;
     /* a new raster block begins */
     if(!(y % raster_lines_per_block)){
diff --git a/src/main/print-canon.h b/src/main/print-canon.h
index 26607ed..3baeb2c 100644
--- a/src/main/print-canon.h
+++ b/src/main/print-canon.h
@@ -35,13 +35,21 @@
 #define CANON_INK_K           1
 #define CANON_INK_CMY         2
 #define CANON_INK_CMYK        4
-#define CANON_INK_CcMmYK      8
-#define CANON_INK_CcMmYyK    16
+#define CANON_INK_CMYKk       8
+#define CANON_INK_CcMmYK     16
+#define CANON_INK_CcMmYKk    32
+#define CANON_INK_CcMmYyK    64
+#define CANON_INK_CcMmYyKk   128
+#define CANON_INK_cmy        256
+#define CANON_INK_CcMmYy     512
 
-#define CANON_INK_CcMmYyKk_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYyK)     /* Ink is CcMmYyKk */
-#define CANON_INK_CMYK_MASK     (CANON_INK_CMYK|CANON_INK_CcMmYyKk_MASK) /* Ink is CMYK */
-#define CANON_INK_CMY_MASK      (CANON_INK_CMY|CANON_INK_CMYK_MASK)      /* Ink is CMY */
-#define CANON_INK_K_MASK        (CANON_INK_K|CANON_INK_CMYK_MASK)        /* Ink is K */
+#define CANON_INK_CcMmYyKk_MASK (CANON_INK_CcMmYK|CANON_INK_CcMmYKk|CANON_INK_CcMmYyK|CANON_INK_CcMmYyKk) /* Ink is CcMmYyKk */
+#define CANON_INK_CMYKk_MASK    (CANON_INK_CMYKk|CANON_INK_CcMmYyKk_MASK) /* Ink is CMYKk */
+#define CANON_INK_CMYK_MASK     (CANON_INK_CMYK|CANON_INK_CMYKk_MASK)     /* Ink is CMYK */
+#define CANON_INK_CMY_MASK      (CANON_INK_CMY|CANON_INK_CMYK_MASK|CANON_INK_CcMmYy|CANON_INK_cmy) /* Ink is CMY --- or CMYcmy */
+#define CANON_INK_K_MASK        (CANON_INK_K|CANON_INK_CMYK_MASK)         /* Ink is K */
+/* completely different inks */
+/*#define CANON_INK_cmy_MASK      (CANON_INK_cmy)  */                         /* Ink is cmy */
 
 
 
@@ -55,8 +63,11 @@ static struct canon_inktype_s {
     const char* name;
     const char* text;
 } canon_inktypes[] = {
+    {CANON_INK_CcMmYyKk,8,"PhotoCMYKk","Photo CcMmYyKk Color"},  /* Gernot: inserted */
     {CANON_INK_CcMmYyK,7,"PhotoCMYK","Photo CcMmYyK Color"},
+    {CANON_INK_CcMmYKk,7,"PhotoCMYKk","Photo CcMmYKk Color"},  /* Gernot: inserted */
     {CANON_INK_CcMmYK,6,"PhotoCMY", "Photo CcMmYK Color"},
+    {CANON_INK_CMYKk,5,"CMYKk","CMYKk Color"}, /* Gernot: inserted */
     {CANON_INK_CMYK,4,"CMYK","CMYK Color"},
     {CANON_INK_CMY,3,"RGB","CMY Color"},
     {CANON_INK_K,1,"Gray","Black"}
diff --git a/src/main/print-color.c b/src/main/print-color.c
index e663420..e7d5f4f 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.143 2011/03/08 13:03:05 rlk Exp $"
+ * "$Id: print-color.c,v 1.145 2012/01/19 13:25:40 m0m Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -831,7 +831,7 @@ compute_gcr_curve(const stp_vars_t *vars)
       }
   curve = stp_curve_create(STP_CURVE_WRAP_NONE);
   stp_curve_set_bounds(curve, 0, 65535);
-  STPI_ASSERT(stp_curve_set_data(curve, lut->steps, tmp_data), v);
+  STPI_ASSERT(stp_curve_set_data(curve, lut->steps, tmp_data), vars);
   stp_free(tmp_data);
   return curve;
 }
@@ -1575,7 +1575,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 		description->is_active = 1;
 	      else
 		description->is_active = 0;
-	      if (param->color_only &&
+	      if (param->color_only && color_description &&
 		  !(color_description->channels & ~CMASK_K))
 		description->is_active = 0;
 	    }
@@ -1698,7 +1698,7 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 		description->is_active = 1;
 	      else
 		description->is_active = 0;
-	      if (param->color_only &&
+	      if (param->color_only && color_description &&
 		  !(color_description->channels & ~CMASK_K))
 		description->is_active = 0;
 	    }
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 2fd9083..3c95d8e 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.433 2010/12/11 22:04:07 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.438 2012/01/19 13:26:28 m0m Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -899,6 +899,14 @@ static const float_param_t float_parameters[] =
   },
   {
     {
+      "SubchannelCutoff", N_("Subchannel Cutoff"), "Color=Yes,Category=Advanced Output Control",
+      N_("Upper limit for using light ink"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
+    }, 0.0, 1.0, 1.0, 1
+  },
+  {
+    {
       "PageDryTime", N_("Drying Time Per Page"), "Color=No,Category=Advanced Printer Functionality",
       N_("Set drying time per page"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_FEATURE,
@@ -1673,15 +1681,18 @@ get_inktype(const stp_vars_t *v)
    * This may mean duplicate work, but that's cheap enough.
    */
   ink_type = get_default_inktype(v);
-  for (i = 0; i < ink_list->n_inks; i++)
+  if (ink_type && ink_list)
     {
-      if (strcmp(ink_type, ink_list->inknames[i].name) == 0)
-	return &(ink_list->inknames[i]);
+      for (i = 0; i < ink_list->n_inks; i++)
+        {
+          if (strcmp(ink_type, ink_list->inknames[i].name) == 0)
+	    return &(ink_list->inknames[i]);
+        }
     }
   /*
    * If even *that* doesn't work, try using the first ink type on the list.
    */
-  return &(ink_list->inknames[0]);
+  return (ink_list) ? &(ink_list->inknames[0]) : NULL;
 }
 
 static const inkname_t *
@@ -2160,6 +2171,8 @@ escp2_parameters(const stp_vars_t *v, const char *name,
   if (name == NULL)
     return;
 
+  memset(&description->deflt, 0, sizeof(description->deflt));
+
   for (i = 0; i < float_parameter_count; i++)
     if (strcmp(name, float_parameters[i].param.name) == 0)
       {
@@ -2194,7 +2207,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	break;
       }
 
-  description->deflt.str = NULL;
   if (strcmp(name, "AutoMode") == 0)
     {
       description->bounds.str = stp_string_list_create();
@@ -2366,14 +2378,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       description->bounds.str = stp_string_list_create();
       if (ninklists > 1)
 	{
-	  int has_default_choice = 0;
 	  for (i = 0; i < ninklists; i++)
 	    {
 	      stp_string_list_add_string(description->bounds.str,
 					 inks->inklists[i].name,
 					 gettext(inks->inklists[i].text));
-	      if (strcmp(inks->inklists[i].name, "None") == 0)
-		has_default_choice = 1;
 	    }
 	  description->deflt.str =
 	    stp_string_list_param(description->bounds.str, 0)->name;
@@ -3363,7 +3372,6 @@ setup_inks(stp_vars_t *v)
   escp2_dropsize_t *drops;
   const inkname_t *ink_type = pd->inkname;
   const stp_vars_t *pv = pd->paper_type->v;
-  int gloss_channel = -1;
   double gloss_scale = get_double_param(v, "Density");
 
   drops = escp2_copy_dropsizes(v);
@@ -3409,7 +3417,6 @@ setup_inks(stp_vars_t *v)
 	      else if (strcmp(param, "GlossDensity") == 0)
 		{
 		  gloss_scale *= get_double_param(v, param);
-		  gloss_channel = i;
 		}
 	    }
 	  for (j = 0; j < channel->n_subchannels; j++)
@@ -4301,7 +4308,6 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
 {
   int status;
   escp2_privdata_t *pd = get_privdata(v);
-  int out_channels;		/* Output bytes per pixel */
   int line_width = (pd->image_printed_width + 7) / 8 * pd->bitwidth;
   int weave_pattern = STP_WEAVE_ZIGZAG;
   if (stp_check_string_parameter(v, "Weave", STP_PARAMETER_ACTIVE))
@@ -4351,7 +4357,7 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
 		  pd->res->printed_vres);
   allocate_channels(v, line_width);
   adjust_print_quality(v);
-  out_channels = stp_color_init(v, image, 65536);
+  (void) stp_color_init(v, image, 65536);
 
 /*  stpi_dither_set_expansion(v, pd->res->hres / pd->res->printed_hres); */
 
@@ -4396,7 +4402,7 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
   stp_allocate_component_data(v, "Driver", NULL, NULL, pd);
 
   pd->inkname = get_inktype(v);
-  if (pd->inkname->inkset != INKSET_EXTENDED &&
+  if (pd->inkname && pd->inkname->inkset != INKSET_EXTENDED &&
       stp_check_boolean_parameter(v, "UseGloss", STP_PARAMETER_ACTIVE) &&
       stp_get_boolean_parameter(v, "UseGloss"))
     pd->use_aux_channels = 1;
diff --git a/src/main/print-lexmark.c b/src/main/print-lexmark.c
index b92242e..e43d9b4 100644
--- a/src/main/print-lexmark.c
+++ b/src/main/print-lexmark.c
@@ -1,6 +1,6 @@
 
 /*
- * "$Id: print-lexmark.c,v 1.160 2010/12/05 21:38:14 rlk Exp $"
+ * "$Id: print-lexmark.c,v 1.161 2012/01/19 13:25:51 m0m Exp $"
  *
  *   Print plug-in Lexmark driver for the GIMP.
  *
@@ -1409,6 +1409,8 @@ lexmark_init_printer(const stp_vars_t *v, const lexmark_cap_t * caps,
 #ifdef DEBUG
 			lex_write_tmp_file(dbgfileprn, (void *)startHeader_z52, LXM_Z52_STARTSIZE);
 #endif
+			break;
+
 		case m_z42:
 			stp_zfwrite((const char *) startHeader_z42,
 				    LXM_Z42_STARTSIZE,1,v);
diff --git a/src/main/print-list.c b/src/main/print-list.c
index 64ddf8e..16c24bc 100644
--- a/src/main/print-list.c
+++ b/src/main/print-list.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-list.c,v 1.25 2010/08/04 00:33:57 rlk Exp $"
+ * "$Id: print-list.c,v 1.26 2012/01/19 13:25:40 m0m Exp $"
  *
  *   Gutenprint list functions.  A doubly-linked list implementation,
  *   with callbacks for freeing, sorting, and retrieving nodes by name
@@ -346,10 +346,10 @@ stp_list_get_item_by_name(const stp_list_t *list, const char *name)
   stp_list_t *ulist = deconst_list(list);
   check_list(list);
 
-  if (!list->namefunc)
+  if (!list->namefunc || !name)
     return NULL;
 
-  if (list->name_cache && name && list->name_cache_node)
+  if (list->name_cache && list->name_cache_node)
     {
       const char *new_name;
       node = list->name_cache_node;
@@ -420,10 +420,10 @@ stp_list_get_item_by_long_name(const stp_list_t *list, const char *long_name)
   stp_list_t *ulist = deconst_list(list);
   check_list(list);
 
-  if (!list->long_namefunc)
+  if (!list->long_namefunc || !long_name)
     return NULL;
 
-  if (list->long_name_cache && long_name && list->long_name_cache_node)
+  if (list->long_name_cache && list->long_name_cache_node)
     {
       const char *new_long_name;
       node = list->long_name_cache_node;
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 6b6b747..a98fea4 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.97 2010/12/05 21:38:15 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.99 2011/07/06 23:16:23 gernot2270 Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -771,7 +771,7 @@ static void cpx00_printer_init_func(stp_vars_t *v)
 		(strcmp(privdata.pagesize, "w155h244") == 0 ? 
 			(strcmp(stp_get_driver(v),"canon-cp10") == 0 ?
 				'\0' : '\3' ) :
-		(strcmp(privdata.pagesize, "w283h566") == 0 ? '\4' : 
+		(strcmp(privdata.pagesize, "w283h566") == 0 ? '\4' :
 		 '\1' ))));
 
   stp_put16_be(0x4000, v);
@@ -783,7 +783,8 @@ static void cpx00_printer_init_func(stp_vars_t *v)
 static void cpx00_plane_init_func(stp_vars_t *v)
 {
   stp_put16_be(0x4001, v);
-  stp_put16_le(3 - privdata.plane, v);
+  stp_putc(3 - privdata.plane, v);
+  stp_putc('\0', v);
   stp_put32_le(privdata.w_size * privdata.h_size, v);
   dyesub_nputc(v, '\0', 4);
 }
@@ -851,53 +852,40 @@ 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); 
+  cpx00_printer_init_func(v);
   /* 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)
+/* Canon SELPHY CP-790 */
+static void cp790_printer_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 */
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? '\0' :
+		(strcmp(privdata.pagesize, "w253h337") == 0 ? '\1' :
+		(strcmp(privdata.pagesize, "w155h244") == 0 ? '\2' :
+		(strcmp(privdata.pagesize, "w283h566") == 0 ? '\3' : 
+		 '\0' ))));
+
+  stp_put16_be(0x4000, v);
+  stp_putc(pg, v);
   stp_putc('\0', v);
+  dyesub_nputc(v, '\0', 8);
   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)
 {
   char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? 0x11 :
-	     (strcmp(privdata.pagesize, "w253h337") == 0 ? '\2' :
-	      (strcmp(privdata.pagesize, "w155h244") == 0 ? '\3' : 0x11 )));
-
-  /*
-   differs from cp-220 in that after the 0x4000, the next character
-   seems to be 0x01 instead of 0x00, and the P card size code is 
-   '0x11' instead of '0x1'
-   codes for other paper types are unknown.
-  */
+	     (strcmp(privdata.pagesize, "w253h337") == 0 ? 0x12 :
+	      (strcmp(privdata.pagesize, "w155h244") == 0 ? 0x13 : 0x11)));
 
   stp_put16_be(0x4000, v);
-  stp_putc(0x10, v);
+  stp_putc(0x10, v);  /* 0x20 for P-BW */
   stp_putc(pg, v);
   dyesub_nputc(v, '\0', 8);
 }
@@ -919,12 +907,80 @@ static void es1_plane_init_func(stp_vars_t *v)
   }
 
   stp_put16_be(0x4001, v);
-  stp_putc(0x1, v);
+  stp_putc(0x1, v); /* 0x02 for P-BW */
   stp_putc(plane, v);
   stp_put32_le(privdata.w_size * privdata.h_size, v);
   dyesub_nputc(v, '\0', 4);
 }
 
+static void es2_printer_init_func(stp_vars_t *v)
+{
+  char pg2 = 0x0;
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? 0x1:
+	     (strcmp(privdata.pagesize, "w253h337") == 0 ? 0x2 :
+	      (strcmp(privdata.pagesize, "w155h244") == 0 ? 0x3 : 0x1)));
+
+  if (pg == 0x03)
+    pg2 = 0x01;
+
+  stp_put16_be(0x4000, v);
+  stp_putc(pg, v);
+  stp_putc(0x0, v);
+
+  stp_putc(0x2, v);
+  dyesub_nputc(v, 0x0, 2);
+  stp_putc(0x0, v);  /*  0x1 for P-BW */
+
+  dyesub_nputc(v, 0x0, 3);
+  stp_putc(pg2, v);
+  stp_put32_le(privdata.w_size * privdata.h_size, v);
+}
+
+static void es2_plane_init_func(stp_vars_t *v)
+{
+  stp_put16_be(0x4001, v);
+  stp_putc(4 - privdata.plane, v);  
+  stp_putc(0x0, v);
+  dyesub_nputc(v, '\0', 8);
+}
+
+static void es3_printer_init_func(stp_vars_t *v)
+{
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? 0x1:
+	     (strcmp(privdata.pagesize, "w253h337") == 0 ? 0x2 :
+	      (strcmp(privdata.pagesize, "w155h244") == 0 ? 0x3 : 0x1)));
+
+    /* We also have Pg and Ps  (Gold/Silver) papers on the ES3/30/40 */
+
+  stp_put16_be(0x4000, v);
+  stp_putc(pg, v);
+  stp_putc(0x0, v);  /* 0x1 for P-BW */
+  dyesub_nputc(v, 0x0, 8);
+  stp_put32_le(privdata.w_size * privdata.h_size, v);
+}
+
+static void es3_printer_end_func(stp_vars_t *v)
+{
+  stp_put16_be(0x4020, v);
+  dyesub_nputc(v, 0x0, 10);
+}
+
+static void es40_printer_init_func(stp_vars_t *v)
+{
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? 0x0:
+	     (strcmp(privdata.pagesize, "w253h337") == 0 ? 0x1 :
+	      (strcmp(privdata.pagesize, "w155h244") == 0 ? 0x2 : 0x0)));
+
+    /* We also have Pg and Ps  (Gold/Silver) papers on the ES3/30/40 */
+
+  stp_put16_be(0x4000, v);
+  stp_putc(pg, v);
+  stp_putc(0x0, v);  /*  0x1 for P-BW */
+  dyesub_nputc(v, 0x0, 8);
+
+  stp_put32_le(privdata.w_size * privdata.h_size, v);
+}
+
 /* Sony DPP-EX5, DPP-EX7 */
 static const dyesub_resolution_t res_403dpi[] =
 {
@@ -1646,7 +1702,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
   },
   { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-510,
        SELPHY CP-600, SELPHY CP-710, SELPHY CP-720, SELPHY CP-730,
-       SELPHY CP-740, SELPHY CP-750 */
+       SELPHY CP-760, SELPHY CP-770, SELPHY CP-780 */
     1001,
     &ymc_ink_list,
     &res_300dpi_list,
@@ -1662,7 +1718,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
-  { /* Canon CP-520, SELPHY CP-530 */
+  { /* Canon CP-520, SELPHY CP-530, SELPHY CP-740, SELPHY CP-750 */
     1004,
     &ymc_ink_list,
     &res_300dpi_list,
@@ -1673,12 +1729,12 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
       | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
       | DYESUB_FEATURE_PLANE_INTERLACE,
     &cp520_printer_init_func, NULL,
-    &cp520_plane_init_func, NULL,
+    &cpx00_plane_init_func, NULL,
     NULL, NULL,
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
-  { /* Canon SELPHY ES1, ES2, ES20 (!experimental) */
+  { /* Canon SELPHY ES1 (!experimental) */
     1003,
     &ymc_ink_list,
     &res_300dpi_list,
@@ -1694,6 +1750,87 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
+  { /* Canon SELPHY ES2, ES20 (!experimental) */
+    1005,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cpx00_page_list,
+    &cpx00_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &es2_printer_init_func, NULL,
+    &es2_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
+  { /* Canon SELPHY ES3, ES30 (!experimental) */
+    1006,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cpx00_page_list,
+    &cpx00_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &es3_printer_init_func, &es3_printer_end_func,
+    &es2_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
+  { /* Canon SELPHY ES40 (!experimental) */
+    1007,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cpx00_page_list,
+    &cpx00_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &es40_printer_init_func, &es3_printer_end_func,
+    &es2_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
+  { /* Canon SELPHY CP790 (!experimental) */
+    1008,
+    &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,
+    &cp790_printer_init_func, &es3_printer_end_func,
+    &es2_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
+  { /* Canon SELPHY CP-800 */
+    1009,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cpx00_page_list,
+    &cpx00_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &cp520_printer_init_func, NULL,
+    &cpx00_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
+
   { /* Sony DPP-EX5, DPP-EX7 */
     2002,
     &rgb_ink_list,
diff --git a/src/main/print-papers.c b/src/main/print-papers.c
index 48ae5f8..ed1438a 100644
--- a/src/main/print-papers.c
+++ b/src/main/print-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-papers.c,v 1.41 2008/07/13 18:05:16 rlk Exp $"
+ * "$Id: print-papers.c,v 1.42 2011/12/22 03:07:45 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -284,10 +284,6 @@ stp_xml_process_paper(stp_mxml_node_t *paper) /* The paper node */
     name = 0,			/* Check name is present */
     height = 0,			/* Check height is present */
     width = 0,			/* Check width is present */
-    left = 0,			/* Check left is present */
-    right = 0,			/* Check right is present */
-    bottom = 0,			/* Check bottom is present */
-    top = 0,			/* Check top is present */
     unit = 0;			/* Check unit is present */
 
   if (stp_get_debug_level() & STP_DBG_XML)
@@ -346,25 +342,21 @@ stp_xml_process_paper(stp_mxml_node_t *paper) /* The paper node */
 	    {
 	      stmp = stp_mxmlElementGetAttr(prop, "value");
 	      outpaper->left = stp_xmlstrtoul(stmp);
-	      left = 1;
 	    }
 	  if (!strcmp(prop_name, "right"))
 	    {
 	      stmp = stp_mxmlElementGetAttr(prop, "value");
 	      outpaper->right = stp_xmlstrtoul(stmp);
-	      right = 1;
 	    }
 	  if (!strcmp(prop_name, "bottom"))
 	    {
 	      stmp = stp_mxmlElementGetAttr(prop, "value");
 	      outpaper->bottom = stp_xmlstrtoul(stmp);
-	      bottom = 1;
 	    }
 	  if (!strcmp(prop_name, "top"))
 	    {
 	      stmp = stp_mxmlElementGetAttr(prop, "value");
 	      outpaper->top = stp_xmlstrtoul(stmp);
-	      top = 1;
 	    }
 	  if (!strcmp(prop_name, "unit"))
 	    {
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 298a976..d969596 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.104 2011/03/04 13:05:08 rlk Exp $"
+ * "$Id: print-ps.c,v 1.105 2012/01/19 13:25:40 m0m Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -821,9 +821,9 @@ ps_print_device_settings(stp_vars_t *v)
 			if(node)
 			  {
 			    node=stp_mxmlFindElement(node,node, "choice", "name", val, STP_MXML_DESCEND);
-			    if(node)
+			    if(node && node->child)
 			      {
-				if(node->child && node->child->value.opaque && (strlen(node->child->value.opaque)>1))
+				if(node->child->value.opaque && (strlen(node->child->value.opaque)>1))
 				  {
 				    /* If we have opaque data for the child, we use %%BeginFeature and copy the code verbatim. */
 				    stp_puts("[{\n", v);
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index 218474f..1a5cf5c 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-vars.c,v 1.91 2010/12/05 21:38:15 rlk Exp $"
+ * "$Id: print-vars.c,v 1.94 2012/01/19 13:26:02 m0m Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -1454,6 +1454,88 @@ stp_vars_copy(stp_vars_t *vd, const stp_vars_t *vs)
 }
 
 void
+stpi_vars_print_error(const stp_vars_t *v, const char *prefix)
+{
+  int i;
+  char *cptr;
+  static const char *data_types[] = {
+    "String",
+    "Int",
+    "Bool",
+    "Double",
+    "Curve",
+    "File",
+    "Raw",
+    "Array",
+    "Dimension",
+    "(Inactive)"
+  };
+  stp_erprintf("%s: Gutenprint: === BEGIN GUTENPRINT SETTINGS ===\n", prefix);
+  stp_erprintf("%s: Gutenprint:     Driver: %s\n", prefix, stp_get_driver(v));
+  stp_erprintf("%s: Gutenprint:     L: %d  T: %d  W: %d  H: %d\n", prefix, stp_get_left(v),
+	       stp_get_top(v), stp_get_width(v), stp_get_height(v));
+  stp_erprintf("%s: Gutenprint:     Page: %dx%d\n", prefix, stp_get_page_width(v),
+	       stp_get_page_height(v));
+  stp_erprintf("%s: Gutenprint:     Conversion: %s\n", prefix, stp_get_color_conversion(v));
+  for (i = 0; i < STP_PARAMETER_TYPE_INVALID; i++)
+    {
+      const stp_list_item_t *item =
+	stp_list_get_start((const stp_list_t *) v->params[i]);
+      while (item)
+	{
+	  char *crep;
+	  const value_t *val = (const value_t *) stp_list_item_get_data(item);
+	  switch (val->typ)
+	    {
+	    case STP_PARAMETER_TYPE_CURVE:
+	      crep = stp_curve_write_string(val->value.cval);
+	      cptr = crep;
+	      while (cptr && *cptr)
+		{
+		  if (*cptr == '\n')
+		    *cptr = ' ';
+		  cptr++;
+		}
+	      stp_erprintf("%s: Gutenprint:         (%s) (%i) (%s) [%s]\n", prefix,
+			   val->name, val->active, data_types[val->typ],
+			   crep ? crep : "NULL");
+	      if (crep)
+		stp_free(crep);
+	      break;
+	    case STP_PARAMETER_TYPE_ARRAY:
+	      break;
+	    case STP_PARAMETER_TYPE_STRING_LIST:
+	    case STP_PARAMETER_TYPE_FILE:
+	    case STP_PARAMETER_TYPE_RAW:
+	      crep = stp_rawtoxmlstr(&(val->value.rval));
+	      stp_erprintf("%s: Gutenprint:         (%s) (%i) (%s) [%s]\n", prefix,
+			   val->name, val->active, data_types[val->typ],
+			   crep ? crep : "NULL");
+	      if (crep)
+		stp_free(crep);
+	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	    case STP_PARAMETER_TYPE_DIMENSION:
+	    case STP_PARAMETER_TYPE_BOOLEAN:
+	      stp_erprintf("%s: Gutenprint:         (%s) (%i) (%s) [%d]\n", prefix,
+			   val->name, val->active, data_types[val->typ],
+			   val->value.ival);
+	      break;
+	    case STP_PARAMETER_TYPE_DOUBLE:
+	      stp_erprintf("%s: Gutenprint:         (%s) (%i) (%s) [%f]\n", prefix,
+			   val->name, val->active, data_types[val->typ],
+			   val->value.dval);
+	      break;
+	    default:
+	      break;
+	    }
+	  item = stp_list_item_next(item);
+	}
+    }
+  stp_erprintf("%s: Gutenprint: === END GUTENPRINT SETTINGS ===\n", prefix);
+}
+
+void
 stp_prune_inactive_options(stp_vars_t *v)
 {
   stp_parameter_list_t params = stp_get_parameter_list(v);
@@ -1712,7 +1794,6 @@ stp_parameter_has_category_value(const stp_vars_t *v,
 				 const stp_parameter_t *desc,
 				 const char *category, const char *value)
 {
-  const char *dptr;
   char *cptr;
   int answer = 0;
   if (!v || !desc || !category)
@@ -1757,11 +1838,16 @@ const stp_parameter_t *
 stp_parameter_list_param(stp_const_parameter_list_t list, size_t item)
 {
   const stp_list_t *ilist = (const stp_list_t *)list;
+  stp_list_item_t *i = NULL;
   if (item >= stp_list_get_length(ilist))
     return NULL;
   else
-    return (const stp_parameter_t *)
-      stp_list_item_get_data(stp_list_get_item_by_index(ilist, item));
+    {
+      i = stp_list_get_item_by_index(ilist, item);
+      if (i == NULL)
+        return NULL;
+      return (const stp_parameter_t *) stp_list_item_get_data(i);
+    }
 }
 
 void
@@ -1796,6 +1882,57 @@ stp_parameter_list_append(stp_parameter_list_t list,
     }
 }
 
+void
+stp_copy_vars_from(stp_vars_t *to, const stp_vars_t *from)
+{
+  int i;
+  if (!from || !to)
+    return;
+  for (i = 0; i < STP_PARAMETER_TYPE_INVALID; i++)
+    {
+      const stp_list_item_t *item =
+	stp_list_get_start((const stp_list_t *) from->params[i]);
+      while (item)
+	{
+	  const value_t *val = (const value_t *) stp_list_item_get_data(item);
+	  switch (val->typ)
+	    {
+	    case STP_PARAMETER_TYPE_CURVE:
+	      stp_set_curve_parameter(to, val->name, val->value.cval);
+	      break;
+	    case STP_PARAMETER_TYPE_ARRAY:
+	      stp_set_array_parameter(to, val->name, val->value.aval);
+	      break;
+	    case STP_PARAMETER_TYPE_STRING_LIST:
+	      stp_set_string_parameter(to, val->name, val->value.rval.data);
+	      break;
+	    case STP_PARAMETER_TYPE_FILE:
+	      stp_set_file_parameter(to, val->name, val->value.rval.data);
+	      break;
+	    case STP_PARAMETER_TYPE_RAW:
+	      stp_set_raw_parameter(to, val->name, val->value.rval.data,
+				    val->value.rval.bytes);
+	      break;
+	    case STP_PARAMETER_TYPE_INT:
+	      stp_set_int_parameter(to, val->name, val->value.ival);
+	      break;
+	    case STP_PARAMETER_TYPE_DIMENSION:
+	      stp_set_dimension_parameter(to, val->name, val->value.ival);
+	      break;
+	    case STP_PARAMETER_TYPE_BOOLEAN:
+	      stp_set_boolean_parameter(to, val->name, val->value.bval);
+	      break;
+	    case STP_PARAMETER_TYPE_DOUBLE:
+	      stp_set_float_parameter(to, val->name, val->value.dval);
+	      break;
+	    default:
+	      break;
+	    }
+	  item = stp_list_item_next(item);
+	}
+    }
+}
+
 static void
 fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
 		       stp_vars_t *v)
@@ -1804,10 +1941,13 @@ fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
   char *locale = stp_strdup(setlocale(LC_ALL, NULL));
   setlocale(LC_ALL, "C");
 #endif
+  stp_deprintf(STP_DBG_XML, "Enter fill_vars_from_xmltree()\n");
   while (prop)
     {
+      stp_deprintf(STP_DBG_XML, "Property type %d (%s)\n", prop->type,
+		   prop->type == STP_MXML_ELEMENT ? prop->value.element.name :
+		   (prop->type == STP_MXML_TEXT ? prop->value.text.string : "(nil)"));
       if (prop->type == STP_MXML_ELEMENT &&
-	  !strcmp(prop->value.element.name, "parameter") &&
 	  (prop->child || stp_mxmlElementGetAttr(prop, "name")))
 	{
 	  stp_mxml_node_t *child = prop->child;
@@ -1975,6 +2115,9 @@ fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
 	    }
 	  else if (child->type == STP_MXML_TEXT)
 	    {
+	      stp_deprintf(STP_DBG_XML, "  Set property %s ('%s')\n",
+			   prop_name, child->value.text.string ?
+			   child->value.text.string : "(nil)");
 	      if (!strcmp(prop_name, "driver"))
 		stp_set_driver(v, child->value.text.string);
 	      else if (!strcmp(prop_name, "color_conversion"))
@@ -1993,8 +2136,15 @@ fill_vars_from_xmltree(stp_mxml_node_t *prop, stp_mxml_node_t *root,
 		stp_set_page_height(v, stp_xmlstrtol(child->value.text.string));
 	    }
 	}
+      else
+	{
+	  if (prop->type == STP_MXML_ELEMENT)
+	    stp_deprintf(STP_DBG_XML, "Unexpected node type %d name %s\n",
+			 prop->type, prop->value.element.name);
+	}
       prop = prop->next;
     }
+  stp_deprintf(STP_DBG_XML, "End fill_vars_from_xmltree()\n");
 #ifdef HAVE_LOCALE_H
   setlocale(LC_ALL, locale);
   stp_free(locale);
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index ce47715..c17a367 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.76 2010/08/04 00:33:57 rlk Exp $"
+ * "$Id: print-weave.c,v 1.81 2012/05/26 16:03:19 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1473,8 +1473,8 @@ initialize_row(stp_vars_t *v, stpi_softweave_t *sw,
 }
 
 static void
-add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
-	   size_t nbytes, int color, int setactive, int h_pass)
+add_to_row_1(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
+	     size_t nbytes, int color, int setactive, int h_pass)
 {
   const stp_linebufs_t *bufs =
     stpi_get_linebases(v, sw, sw->lineno, h_pass, sw->head_offset[color]);
@@ -1535,6 +1535,19 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
 }
 
 static void
+add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
+	   size_t nbytes, int color, int setactive, int h_pass)
+{
+  if (!sw->head_offset)
+    {
+      stp_eprintf(v, "ERROR: %s\n", _("Fatal error!"));
+      stp_eprintf(v, "ERROR: add_to_row: sw->head_offset == NULL\n");
+      return;
+    }
+  add_to_row_1(v, sw, row, buf, nbytes, color, setactive, h_pass);
+}
+
+static void
 stpi_flush_passes(stp_vars_t *v, int flushall)
 {
   stpi_softweave_t *sw = get_sw(v);
@@ -1592,11 +1605,7 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
 {
   stpi_softweave_t *sw = get_sw(v);
   int length = (sw->linewidth + 7) / 8;
-  stp_lineoff_t *lineoffs[STP_MAX_WEAVE];
-  stp_lineactive_t *lineactives[STP_MAX_WEAVE];
-  stp_linecount_t *linecounts[STP_MAX_WEAVE];
   stp_linebounds_t *linebounds[STP_MAX_WEAVE];
-  const stp_linebufs_t *bufs[STP_MAX_WEAVE];
   int xlength = (length + sw->horizontal_weave - 1) / sw->horizontal_weave;
   int ylength = xlength * sw->horizontal_weave;
   unsigned char *comp_ptr;
@@ -1640,16 +1649,8 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
 	      if (!sw->s[i])
 		sw->s[i] = stp_zalloc(sw->bitwidth *
 				      (sw->compute_linewidth)(v, ylength));
-	      lineoffs[i] =
-		stpi_get_lineoffsets(v, sw, sw->lineno, pass, offset);
-	      linecounts[i] =
-		stpi_get_linecount(v, sw, sw->lineno, pass, offset);
-	      lineactives[i] =
-		stpi_get_lineactive(v, sw, sw->lineno, pass,offset);
 	      linebounds[i] =
 		stpi_get_linebounds(v, sw, sw->lineno, pass, offset);
-	      bufs[i] =
-		stpi_get_linebases(v, sw, sw->lineno, pass, offset);
 	    }
 
 	  if (sw->bitwidth == 2)
diff --git a/src/main/xmlppd.c b/src/main/xmlppd.c
index 60f4365..0ee9dc9 100644
--- a/src/main/xmlppd.c
+++ b/src/main/xmlppd.c
@@ -214,7 +214,6 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
   int		option_count;
   int		order_length;
   char		*order_list;
-  int		in_comment;
   stp_string_list_t *ialist = stp_string_list_create();
   stp_string_list_t *pdlist = stp_string_list_create();
 
@@ -281,7 +280,6 @@ stpi_xmlppd_read_ppd_file(const char *filename)	/* I - PPD file */
       bufptr    = buffer + 1;
       inquote   = 0;
       sawcolon  = 0;
-      in_comment = 0;
       if (ch == '*')
 	{
 	  if ((ch = getc(fp)) == '%')
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index 6b1b6cc..9b39a29 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -156,6 +156,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -232,6 +233,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -252,6 +254,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -275,6 +279,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -321,7 +326,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/testpattern/printer_options.c b/src/testpattern/printer_options.c
index ec03a1e..e0f1bf2 100644
--- a/src/testpattern/printer_options.c
+++ b/src/testpattern/printer_options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printer_options.c,v 1.5 2008/06/07 22:47:35 rlk Exp $"
+ * "$Id: printer_options.c,v 1.6 2012/05/26 15:56:03 rlk Exp $"
  *
  *   Dump the per-printer options for the OpenPrinting database
  *
@@ -146,6 +146,7 @@ main(int argc, char **argv)
 					 driver, "y_resolution", param->name, y);
 				}
 			    }
+			  stp_clear_string_parameter(pv, "Resolution");
 			}
 		    }
 		}
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index 6d0302c..79e1466 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -36,6 +36,7 @@ my %stpdata = ();
 my %models_found = ();
 my %models;
 my %families;
+my %defaults;
 my $skip_duplicate_printers = 0;
 my $std_pages = 1;
 my $duplex_pages = 4;
@@ -43,6 +44,9 @@ my $skip_resolutions = 0;
 my $quiet = 0;
 my $single = 0;
 my $rerun = 0;
+my $list_printers = 0;
+my $list_options = 0;
+my $verbose = 0;
 
 my @default_options = ();
 my %base_settings = ("DitherAlgorithm" => "Fast");
@@ -74,6 +78,9 @@ GetOptions("v+"  => \$valgrind,
 	   "m:s" => \$calc_md5_dir,
 	   "M:s" => \$calc_md5_file,
 	   "X"   => \$rerun,
+	   "l"   => \$list_printers,
+	   "L"   => \$list_options,
+	   "V"   => \$verbose,
 	   "h"   => \$help);
 
 sub print_help_and_exit() {
@@ -126,6 +133,9 @@ Usage: run-testpattern-2 [opts] [model ...]
                     -vv   Additional leak checking
                     -vvv  Show reachable data also
                     -vvvv Minimal checks only
+    -l              List available printers
+    -L              List available options for specified printer
+    -V              List available values for each option
 EOF
 exit 1;
 }
@@ -636,7 +646,46 @@ foreach my $printer (@printer_list) {
 }
 @printer_list = @nprinter_list;
 
-if ($dontrun) {
+if ($list_printers) {
+    print join("\n", sort @printer_list), "\n";
+    exit 0;
+} elsif ($list_options) {
+    if ($#printer_list > 0) {
+	die "-L must be used with one printer\n";
+    }
+    my ($printer) = $printer_list[0];
+    foreach my $opt (sort keys %{$stpdata{$printer}}) {
+	next if $opt eq "x_resolution";
+	next if $opt eq "y_resolution";
+	print "$opt\n";
+	if ($verbose) {
+	    if ($param_types{$printer}{$opt} == 3) {
+		print "    $stp_float_values{$printer}{'MINVAL'}{$opt}\n";
+		print "  =>$stp_float_values{$printer}{'DEFVAL'}{$opt}\n";
+		print "    $stp_float_values{$printer}{'MAXVAL'}{$opt}\n";
+	    } elsif ($param_types{$printer}{$opt} == 1) {
+		print "    $stp_int_values{$printer}{'MINVAL'}{$opt}\n";
+		print "    $stp_int_values{$printer}{'MAXVAL'}{$opt}\n";
+	    } elsif ($param_types{$printer}{$opt} == 2) {
+		if ($defaults{$printer}{$opt}) {
+		    print "    0\n";
+		    print "  =>1\n";
+		} else {
+		    print "  =>0\n";
+		    print "    1\n";
+		}
+	    } else {
+		foreach my $val (sort keys %{$stpdata{$printer}{$opt}}) {
+		    if ($val eq $defaults{$printer}{$opt}) {
+			print "  =>$val\n";
+		    } else {
+			print "    $val\n";
+		    }
+		}
+	    }
+	}
+    }
+} elsif ($dontrun) {
     map { do_printer($_, \*STDOUT) } @printer_list;
     exit 0;
 } else {
@@ -683,6 +732,7 @@ if ($dontrun) {
     my ($qopt) = $quiet ? "-q" : "";
     $testpattern_command = "$valgrind_command ./testpattern -y $suppress $qopt";
     if ($single) {
+	$SIG{PIPE} = sub() { die "\ntestpattern crashed!\n" };
 	foreach my $printer (@printer_list) {
 	    open TESTPATTERN, "|$testpattern_command" or
 		die "Can't run $testpattern_command: $!\n";
@@ -692,6 +742,7 @@ if ($dontrun) {
 	    last if ($? & 255);
 	}
     } else {
+	$SIG{PIPE} = sub() { die "\ntestpattern crashed!\n" };
 	open TESTPATTERN, "|$testpattern_command" or
 	    die "Can't run $testpattern_command: $!\n";
 	map { do_printer($_, \*TESTPATTERN) } @printer_list;
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index eb4bc23..e8ec86b 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -751,7 +751,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "testpatternl.l"
 /*
- * "$Id: testpatternl.l,v 1.26 2010/09/06 17:08:39 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.27 2012/05/11 13:16:12 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -786,6 +786,8 @@ char *yytext;
 
 int mylineno = 1;
 
+extern YYSTYPE yylval;
+
 static char *
 c_strstrip(char *s)
 {
@@ -811,7 +813,7 @@ do							\
  while (0)
 
 
-#line 815 "testpatternl.c"
+#line 817 "testpatternl.c"
 
 #define INITIAL 0
 
@@ -993,10 +995,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 77 "testpatternl.l"
+#line 79 "testpatternl.l"
 
 
-#line 1000 "testpatternl.c"
+#line 1002 "testpatternl.c"
 
 	if ( !(yy_init) )
 		{
@@ -1081,267 +1083,267 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 79 "testpatternl.l"
+#line 81 "testpatternl.l"
 DBG(GAMMA); return GAMMA;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 80 "testpatternl.l"
+#line 82 "testpatternl.l"
 DBG(LEVEL); return LEVEL;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 81 "testpatternl.l"
+#line 83 "testpatternl.l"
 DBG(STEPS); return STEPS;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 82 "testpatternl.l"
+#line 84 "testpatternl.l"
 DBG(INK_LIMIT); return INK_LIMIT;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 83 "testpatternl.l"
+#line 85 "testpatternl.l"
 DBG(PRINTER); return PRINTER;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 84 "testpatternl.l"
+#line 86 "testpatternl.l"
 DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 85 "testpatternl.l"
+#line 87 "testpatternl.l"
 DBG(PARAMETER_INT); return PARAMETER_INT;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 86 "testpatternl.l"
+#line 88 "testpatternl.l"
 DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 87 "testpatternl.l"
+#line 89 "testpatternl.l"
 DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 88 "testpatternl.l"
+#line 90 "testpatternl.l"
 DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 89 "testpatternl.l"
+#line 91 "testpatternl.l"
 DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 90 "testpatternl.l"
+#line 92 "testpatternl.l"
 DBG(DENSITY); return DENSITY;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 91 "testpatternl.l"
+#line 93 "testpatternl.l"
 DBG(TOP); return TOP;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 92 "testpatternl.l"
+#line 94 "testpatternl.l"
 DBG(LEFT); return LEFT;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 93 "testpatternl.l"
+#line 95 "testpatternl.l"
 DBG(SIZE_MODE); return SIZE_MODE;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 94 "testpatternl.l"
+#line 96 "testpatternl.l"
 DBG(RELATIVE); return RELATIVE;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 95 "testpatternl.l"
+#line 97 "testpatternl.l"
 DBG(PT); return PT;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 96 "testpatternl.l"
+#line 98 "testpatternl.l"
 DBG(IN); return IN;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 97 "testpatternl.l"
+#line 99 "testpatternl.l"
 DBG(MM); return MM;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 98 "testpatternl.l"
+#line 100 "testpatternl.l"
 DBG(HSIZE); return HSIZE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 99 "testpatternl.l"
+#line 101 "testpatternl.l"
 DBG(VSIZE); return VSIZE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 100 "testpatternl.l"
+#line 102 "testpatternl.l"
 DBG(BLACKLINE); return BLACKLINE;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 101 "testpatternl.l"
+#line 103 "testpatternl.l"
 DBG(PATTERN); return PATTERN;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 102 "testpatternl.l"
+#line 104 "testpatternl.l"
 DBG(XPATTERN); return XPATTERN;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 103 "testpatternl.l"
+#line 105 "testpatternl.l"
 DBG(IMAGE); return IMAGE;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 104 "testpatternl.l"
+#line 106 "testpatternl.l"
 DBG(EXTENDED); return EXTENDED;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 105 "testpatternl.l"
+#line 107 "testpatternl.l"
 DBG(GRID); return GRID;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 106 "testpatternl.l"
+#line 108 "testpatternl.l"
 DBG(CHANNEL); return CHANNEL;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 107 "testpatternl.l"
+#line 109 "testpatternl.l"
 DBG(PAGESIZE); return PAGESIZE;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 108 "testpatternl.l"
+#line 110 "testpatternl.l"
 DBG(SEMI); return SEMI;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 109 "testpatternl.l"
+#line 111 "testpatternl.l"
 DBG(MODE); return MODE;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 110 "testpatternl.l"
+#line 112 "testpatternl.l"
 yylval.ival = CMYK;DBG(CMYK); return CMYK;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 111 "testpatternl.l"
+#line 113 "testpatternl.l"
 yylval.ival = CMYK;DBG(KCMY); return KCMY;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 112 "testpatternl.l"
+#line 114 "testpatternl.l"
 yylval.ival = RGB;DBG(RGB); return RGB;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 113 "testpatternl.l"
+#line 115 "testpatternl.l"
 yylval.ival = RGB;DBG(CMY); return CMY;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 114 "testpatternl.l"
+#line 116 "testpatternl.l"
 yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 115 "testpatternl.l"
+#line 117 "testpatternl.l"
 yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 116 "testpatternl.l"
+#line 118 "testpatternl.l"
 yylval.ival = WHITE;DBG(WHITE); return WHITE;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 117 "testpatternl.l"
+#line 119 "testpatternl.l"
 DBG(OUTPUT); return OUTPUT;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 118 "testpatternl.l"
+#line 120 "testpatternl.l"
 DBG(MESSAGE); return MESSAGE;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 119 "testpatternl.l"
+#line 121 "testpatternl.l"
 DBG(NOSCALE); return NOSCALE;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 120 "testpatternl.l"
+#line 122 "testpatternl.l"
 DBG(START_JOB); return START_JOB;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 121 "testpatternl.l"
+#line 123 "testpatternl.l"
 DBG(END_JOB); return END_JOB;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 122 "testpatternl.l"
+#line 124 "testpatternl.l"
 DBG(END); return END;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 124 "testpatternl.l"
+#line 126 "testpatternl.l"
 yylval.sval = yytext;DBG(COLOR); return COLOR;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 125 "testpatternl.l"
+#line 127 "testpatternl.l"
 yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 126 "testpatternl.l"
+#line 128 "testpatternl.l"
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 48:
 /* rule 48 can match eol */
 YY_RULE_SETUP
-#line 127 "testpatternl.l"
+#line 129 "testpatternl.l"
 yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 128 "testpatternl.l"
+#line 130 "testpatternl.l"
 DBG(whitespace); 	/* Skip blanks/tabs */
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 129 "testpatternl.l"
+#line 131 "testpatternl.l"
 DBG(comment); 	/* Skip comments */
 	YY_BREAK
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-#line 130 "testpatternl.l"
+#line 132 "testpatternl.l"
 DBG(newline); mylineno++;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 131 "testpatternl.l"
+#line 133 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1345 "testpatternl.c"
+#line 1347 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2339,4 +2341,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 131 "testpatternl.l"
+#line 133 "testpatternl.l"
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index c2f5803..16cb38c 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatternl.l,v 1.26 2010/09/06 17:08:39 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.27 2012/05/11 13:16:12 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -35,6 +35,8 @@
 
 int mylineno = 1;
 
+extern YYSTYPE yylval;
+
 static char *
 c_strstrip(char *s)
 {
diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in
index f6f23da..530164f 100644
--- a/src/xml/Makefile.in
+++ b/src/xml/Makefile.in
@@ -171,6 +171,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -247,6 +248,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -267,6 +269,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -290,6 +294,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -336,7 +341,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in
index 2f786ec..56b3b34 100644
--- a/src/xml/escp2/Makefile.in
+++ b/src/xml/escp2/Makefile.in
@@ -128,6 +128,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -204,6 +205,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -224,6 +226,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -247,6 +251,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -293,7 +298,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index 3bd104f..0a2220e 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
index 1e93697..e092488 100644
--- a/src/xml/escp2/inputslots/Makefile.in
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
index 4025510..9e3f5d0 100644
--- a/src/xml/escp2/media/Makefile.in
+++ b/src/xml/escp2/media/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in
index 655767d..1ad4db8 100644
--- a/src/xml/escp2/mediasizes/Makefile.in
+++ b/src/xml/escp2/mediasizes/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index 44427f2..479267b 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.27 2011/03/05 18:49:13 rlk Exp $
+## $Id: Makefile.am,v 1.30 2011/12/14 03:02:58 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -141,7 +141,9 @@ pkgxmldata_DATA =				\
 	model_112.xml				\
 	model_113.xml				\
 	model_114.xml				\
-	model_115.xml
+	model_115.xml				\
+	model_116.xml				\
+	model_117.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	-rm -f $@ $@.tmp
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index aa4c874..c3994ba 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -412,7 +416,9 @@ pkgxmldata_DATA = \
 	model_112.xml				\
 	model_113.xml				\
 	model_114.xml				\
-	model_115.xml
+	model_115.xml				\
+	model_116.xml				\
+	model_117.xml
 
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/model_115.xml b/src/xml/escp2/model/model_115.xml
index bd5c3e1..a51af5c 100644
--- a/src/xml/escp2/model/model_115.xml
+++ b/src/xml/escp2/model/model_115.xml
@@ -66,8 +66,6 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <CDOffset>221 262</CDOffset>
  <CDMediaSize>595 842</CDMediaSize>
  <AlignmentChoices>4 15 0 0</AlignmentChoices>
- <ChannelNames>
- </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
    <physicalResolution>360 180</physicalResolution>
diff --git a/src/xml/escp2/model/model_116.xml b/src/xml/escp2/model/model_116.xml
new file mode 100644
index 0000000..f9b7725
--- /dev/null
+++ b/src/xml/escp2/model/model_116.xml
@@ -0,0 +1,139 @@
+<?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="116">
+ <media src="escp2/media/pro_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/prox900.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3v.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>1728 86400</maximumMediaSize>
+ <maximumImageableArea>1728 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <resolutions>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440mw" text="1440 x 720 DPI">
+   <physicalResolution>720 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/model/model_117.xml b/src/xml/escp2/model/model_117.xml
new file mode 100644
index 0000000..97b0ea7
--- /dev/null
+++ b/src/xml/escp2/model/model_117.xml
@@ -0,0 +1,139 @@
+<?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="117">
+ <media src="escp2/media/pro_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/pro_cutter_roll_feed.xml"/>
+ <qualityPresets src="escp2/qualitypresets/prox900.xml"/>
+ <inkGroup src="escp2/inks/pro_ultrachrome_k3v.xml"/>
+ <printerWeaves src="escp2/weaves/pro7600.xml"/>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>Pro</commandSet>
+ <borderless>HorizontalOnly</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Landscape</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>1</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>1</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>2880 2880</maximumResolution>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>43</zeroMarginOffset>
+ <microLeftMargin>5</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>3168 86400</maximumMediaSize>
+ <maximumImageableArea>3168 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 9 40</margins>
+ <margins interleave="printer" media="sheet">9 9 9 40</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <AlignmentChoices>3 15 0 0</AlignmentChoices>
+ <resolutions>
+  <resolution translate="text" name="360pro" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">5.000000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360mw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">2.520000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720mw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">1.260000</parameter>
+   <parameter type="integer" name="escp2_ink_type">17</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.290000</parameter>
+   <parameter type="float" name="DropSize2">0.630000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x1440mw" text="1440 x 720 DPI">
+   <physicalResolution>720 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.891000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440mw" text="1440 x 1440 DPI">
+   <physicalResolution>1440 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.446000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.275000</parameter>
+   <parameter type="float" name="DropSize2">0.450000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440mw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880mw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <printerWeave command="\033(i\001\000\001"/>
+   <parameter type="float" name="escp2_density">0.388000</parameter>
+   <parameter type="integer" name="escp2_ink_type">5</parameter>
+   <parameter type="integer" name="escp2_base_res">2880</parameter>
+   <parameter type="integer" name="escp2_bits">1</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 cc77328..8da6950 100644
--- a/src/xml/escp2/qualitypresets/Makefile.am
+++ b/src/xml/escp2/qualitypresets/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2009/05/30 14:10:32 rlk Exp $
+## $Id: Makefile.am,v 1.5 2011/12/14 03:02:58 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@ pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSI
 pkgxmldata_DATA =				\
 	p1_5.xml				\
 	picturemate.xml				\
+	prox900.xml				\
 	standard.xml				\
 	v2880.xml				\
 	wf40.xml
diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in
index 386aa44..3f23a6d 100644
--- a/src/xml/escp2/qualitypresets/Makefile.in
+++ b/src/xml/escp2/qualitypresets/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -299,6 +303,7 @@ pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSI
 pkgxmldata_DATA = \
 	p1_5.xml				\
 	picturemate.xml				\
+	prox900.xml				\
 	standard.xml				\
 	v2880.xml				\
 	wf40.xml
diff --git a/src/xml/escp2/qualitypresets/prox900.xml b/src/xml/escp2/qualitypresets/prox900.xml
new file mode 100644
index 0000000..35ab6e7
--- /dev/null
+++ b/src/xml/escp2/qualitypresets/prox900.xml
@@ -0,0 +1,70 @@
+<?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:QualityPresets name="standard">
+ <quality translate="text" name="FastEconomy" text="Fast Economy">
+  <minimumResolution>180 90</minimumResolution>
+  <maximumResolution>360 120</maximumResolution>
+  <desiredResolution>360 90</desiredResolution>
+ </quality>
+ <quality translate="text" name="Economy" text="Economy">
+  <minimumResolution>360 180</minimumResolution>
+  <maximumResolution>360 240</maximumResolution>
+  <desiredResolution>360 180</desiredResolution>
+ </quality>
+ <quality translate="text" name="Draft" text="Draft">
+  <minimumResolution>360 360</minimumResolution>
+  <maximumResolution>360 360</maximumResolution>
+  <desiredResolution>360 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="Standard" text="Standard">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 360</desiredResolution>
+ </quality>
+ <quality translate="text" name="High" text="High">
+  <minimumResolution>0 0</minimumResolution>
+  <maximumResolution>0 0</maximumResolution>
+  <desiredResolution>720 720</desiredResolution>
+ </quality>
+ <quality translate="text" name="Photo" text="Photo">
+  <minimumResolution>720 1440</minimumResolution>
+  <maximumResolution>720 2880</maximumResolution>
+  <desiredResolution>720 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="HighPhoto" text="Super Photo">
+  <minimumResolution>1440 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>1440 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="UltraPhoto" text="Ultra Photo">
+  <minimumResolution>2880 1440</minimumResolution>
+  <maximumResolution>2880 1440</maximumResolution>
+  <desiredResolution>2880 1440</desiredResolution>
+ </quality>
+ <quality translate="text" name="Best" text="Best">
+  <minimumResolution>720 360</minimumResolution>
+  <maximumResolution>0 1440</maximumResolution>
+  <desiredResolution>-1 -1</desiredResolution>
+ </quality>
+</escp2:QualityPresets>
+</gutenprint>
diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in
index d20c246..ab4ac94 100644
--- a/src/xml/escp2/weaves/Makefile.in
+++ b/src/xml/escp2/weaves/Makefile.in
@@ -112,6 +112,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -208,6 +210,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -231,6 +235,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -277,7 +282,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/src/xml/papers.xml b/src/xml/papers.xml
index b774529..86e2e5a 100644
--- a/src/xml/papers.xml
+++ b/src/xml/papers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: papers.xml,v 1.9 2010/11/16 13:51:55 gernot2270 Exp $"
+   "$Id: papers.xml,v 1.10 2011/11/06 06:21:15 gernot2270 Exp $"
 
    XML description of papers known to libgutenprint.
    You can add additional paper sizes here.
@@ -1159,6 +1159,34 @@
       <unit value="metric-extended"/>
       <type value="envelope"/>
     </paper>
+    <paper name="w297h666">
+      <description translate="value" value="Japanese Western-style envelope #4"/>
+      <width value="297"/>
+      <height value="666"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
+    <paper name="w297h666_l">
+      <description translate="value" value="Japanese Western-style envelope #4 landscape"/>
+      <width value="666"/>
+      <height value="297"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
+    <paper name="w277h538">
+      <description translate="value" value="Japanese Western-style envelope #6"/>
+      <width value="277"/>
+      <height value="538"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
+    <paper name="w277h538_l">
+      <description translate="value" value="Japanese Western-style envelope #6 landscape"/>
+      <width value="538"/>
+      <height value="277"/>
+      <unit value="metric-extended"/>
+      <type value="envelope"/>
+    </paper>
     <paper name="w680h941">
       <description translate="value" value="Japanese Kaku envelope #4"/>
       <width value="680"/>
@@ -1245,9 +1273,16 @@
       <height value="244"/>
       <unit value="metric-extended"/>
     </paper>
+    <paper name="w155h257">
+      <description translate="value" value="Card"/>
+      <comment value="55mm x 91mm"/>
+      <width value="155"/>
+      <height value="257"/>
+      <unit value="metric-extended"/>
+    </paper>
     <paper name="w283h566">
       <description translate="value" value="Wide Postcard"/>
-      <comment value="100mm x 200mm"/>
+      <comment value="148mm x 200mm"/>
       <width value="283"/>
       <height value="566"/>
       <unit value="english-extended"/>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index ed84699..d94996f 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: printers.xml,v 1.126 2011/05/01 15:36:25 gernot2270 Exp $"
+   "$Id: printers.xml,v 1.247 2012/05/27 15:11:29 gernot2270 Exp $"
 
    XML description of printers known to libgutenprint
    You can add additional printers here, but the underlying driver has
@@ -110,6 +110,7 @@
       <printer translate="name" name="Canon BJC-4000" driver="bjc-4000" manufacturer="Canon" model="4300" parameters="gamma_750_params" foomaticid="Canon-BJC-4000" />
       <printer translate="name" name="Canon BJC-4300" deviceid="MFG:Canon;MDL:BJC-4300;DES:Canon BJC-4300;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4300" manufacturer="Canon" model="4300" parameters="gamma_750_params" foomaticid="Canon-BJC-4300" />
       <printer translate="name" name="Canon BJC-4400" deviceid="MFG:Canon;MDL:BJC-4400;DES:Canon BJC-4400;CMD:BJ,LQ,BJL,BJRaster,BSCC;" driver="bjc-4400" manufacturer="Canon" model="4400" parameters="density_800_params" foomaticid="Canon-BJC-4400" />
+      <printer translate="name" name="Canon BJC-4550" driver="bjc-4550" manufacturer="Canon" model="4550" parameters="density_800_params" foomaticid="Canon-BJC-4550" />
       <printer translate="name" name="Canon BJC-5100" driver="bjc-5100" manufacturer="Canon" model="5100" parameters="density_800_params" foomaticid="Canon-BJC-5100" />
       <printer translate="name" name="Canon BJC-5500" driver="bjc-5500" manufacturer="Canon" model="5500" parameters="density_800_params" foomaticid="Canon-BJC-5500" />
       <printer translate="name" name="Canon BJC-6000" deviceid="MFG:Canon;MDL:BJC-6000;DES:Canon BJC-6000;CMD:BJL,BJRaster3,BSCC,TXT;" driver="bjc-6000" manufacturer="Canon" model="6000" parameters="gamma_750_params" foomaticid="Canon-BJC-6000" />
@@ -123,45 +124,66 @@
       <printer translate="name" name="Canon S100" deviceid="MFG:Canon;MDL:S100SP;DES:Canon S100SP;CMD:BJL,BJRaster,BSCC,TXT01;" driver="bjc-s100" manufacturer="Canon" model="4300" parameters="gamma_750_params" foomaticid="Canon-S100" />
       <printer translate="name" name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="1000200" parameters="gamma_8_density_900_params" foomaticid="Canon-S200" />
       <printer translate="name" name="Canon S300" driver="bjc-s300" manufacturer="Canon" model="1000300" parameters="density_800_params" foomaticid="Canon-S300" />
+      <printer translate="name" name="Canon S330" driver="bjc-s330" manufacturer="Canon" model="1000330" parameters="density_800_params" foomaticid="Canon-S330" />
       <printer translate="name" name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000" parameters="density_800_params" foomaticid="Canon-S400" />
       <printer translate="name" name="Canon S450" driver="bjc-s450" manufacturer="Canon" model="6200" parameters="gamma_750_params" foomaticid="Canon-S450" />
       <printer translate="name" name="Canon S500" driver="bjc-s500" manufacturer="Canon" model="1000500" parameters="density_800_params" foomaticid="Canon-S500" />
-      <printer translate="name" name="Canon S600" deviceid="MFG:Canon;MDL:S600;DES:Canon S600;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-s600" manufacturer="Canon" model="8200" parameters="density_800_params" foomaticid="Canon-S600" />
-      <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="8200" parameters="density_800_params" foomaticid="Canon-S630" />
-      <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="8200" parameters="density_800_params" foomaticid="Canon-S800" />
+      <printer translate="name" name="Canon S520" driver="bjc-s520" manufacturer="Canon" model="1000520" parameters="density_800_params" foomaticid="Canon-S520" />
+      <printer translate="name" name="Canon S530D" driver="bjc-s530D" manufacturer="Canon" model="1000520" parameters="density_800_params" foomaticid="Canon-S530D" />
+      <printer translate="name" name="Canon S600" deviceid="MFG:Canon;MDL:S600;DES:Canon S600;CMD:BJL,BJRaster3,BSCC,TXT01;" driver="bjc-s600" manufacturer="Canon" model="1000600" parameters="density_800_params" foomaticid="Canon-S600" />
+      <printer translate="name" name="Canon S630" driver="bjc-s630" manufacturer="Canon" model="1000600" parameters="density_800_params" foomaticid="Canon-S630" />
+      <printer translate="name" name="Canon S750" driver="bjc-s750" manufacturer="Canon" model="1000750" parameters="density_800_params" foomaticid="Canon-S750" />
+      <printer translate="name" name="Canon S800" driver="bjc-s800" manufacturer="Canon" model="1000800" parameters="density_800_params" foomaticid="Canon-S800" />
+      <printer translate="name" name="Canon S820" driver="bjc-s820" manufacturer="Canon" model="1000820" parameters="density_800_params" foomaticid="Canon-S820" />
+      <printer translate="name" name="Canon S830D" driver="bjc-s830" manufacturer="Canon" model="1000830" parameters="density_800_params" foomaticid="Canon-S830D" />
+      <printer translate="name" name="Canon S900" driver="bjc-s900" manufacturer="Canon" model="1000900" parameters="density_800_params" foomaticid="Canon-S900" />
+      <printer translate="name" name="Canon S9000" driver="bjc-s9000" manufacturer="Canon" model="1000900" parameters="density_800_params" foomaticid="Canon-S9000" />
       <printer translate="name" name="Canon S4500" driver="bjc-s4500" manufacturer="Canon" model="6500" parameters="gamma_750_params" foomaticid="Canon-S4500" />
-      <printer translate="name" name="Canon PIXMA iP1000" driver="bjc-PIXMA-iP1000" manufacturer="Canon" model="3001000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1000" />
-      <printer translate="name" name="Canon PIXMA iP1200" driver="bjc-PIXMA-iP1200" manufacturer="Canon" model="3001200" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1200" />
-      <printer translate="name" name="Canon PIXMA iP1300" driver="bjc-PIXMA-iP1200" manufacturer="Canon" model="3001200" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1300" />
-      <printer translate="name" name="Canon PIXMA iP1500" driver="bjc-PIXMA-iP1500" manufacturer="Canon" model="3001500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1500" />
-      <printer translate="name" name="Canon PIXMA iP1600" driver="bjc-PIXMA-iP1600" manufacturer="Canon" model="3001600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1600" />
-      <printer translate="name" name="Canon PIXMA iP1700" driver="bjc-PIXMA-iP1600" manufacturer="Canon" model="3001600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1700" />
-      <printer translate="name" name="Canon PIXMA iP1800" driver="bjc-PIXMA-iP1600" manufacturer="Canon" model="3001600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1800" />
-      <printer translate="name" name="Canon PIXMA iP1900" driver="bjc-PIXMA-iP1900" manufacturer="Canon" model="3001900" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP1900" />
+      <printer translate="name" name="Canon SELPHY DS700" driver="bjc-SELPHY-DS700" manufacturer="Canon" model="10000700" parameters="PIXMA_iP4000_params" foomaticid="Canon-SELPHY-DS700" />
+      <printer translate="name" name="Canon SELPHY DS810" driver="bjc-SELPHY-DS810" manufacturer="Canon" model="10000810" parameters="PIXMA_iP4000_params" foomaticid="Canon-SELPHY-DS810" />
+      <printer translate="name" name="Canon PIXMA mini220" driver="bjc-PIXMA-mini220" manufacturer="Canon" model="11000220" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-mini220" />
+      <printer translate="name" name="Canon PIXMA mini320" driver="bjc-PIXMA-mini320" manufacturer="Canon" model="11000320" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-mini320" />
+      <printer translate="name" name="Canon PIXMA mini360" driver="bjc-PIXMA-mini360" manufacturer="Canon" model="11000320" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-mini360" />
+      <printer translate="name" name="Canon PIXMA iP90" driver="bjc-PIXMA-iP90" manufacturer="Canon" model="3000090" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP90" />
+      <printer translate="name" name="Canon PIXMA iP90v" driver="bjc-PIXMA-iP90v" manufacturer="Canon" model="3000090" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP90v" />
+      <printer translate="name" name="Canon PIXMA iP100" driver="bjc-PIXMA-iP100" manufacturer="Canon" model="3000100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP100" />
       <printer translate="name" name="Canon PIXMA iP2000" driver="bjc-PIXMA-iP2000" manufacturer="Canon" model="3002000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2000" />
-      <printer translate="name" name="Canon PIXMA iP2200" driver="bjc-PIXMA-iP2200" manufacturer="Canon" model="3002200" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2200" />
-      <printer translate="name" name="Canon PIXMA iP2500" driver="bjc-PIXMA-iP2500" manufacturer="Canon" model="3002500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2500" />
-      <printer translate="name" name="Canon PIXMA iP2600" driver="bjc-PIXMA-iP2600" manufacturer="Canon" model="3002600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2600" />
-      <printer translate="name" name="Canon PIXUS iP2700" driver="bjc-PIXUS-iP2700" manufacturer="Canon" model="3002700" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP2700" />
+      <printer translate="name" name="Canon PIXMA iP2700" driver="bjc-PIXMA-iP2700" manufacturer="Canon" model="3002700" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP2700" />
       <printer translate="name" name="Canon PIXMA iP3000" driver="bjc-PIXMA-iP3000" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3000" />
-      <printer translate="name" name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3100" />
+      <printer translate="name" name="Canon PIXMA iP3100" driver="bjc-PIXMA-iP3100" manufacturer="Canon" model="3003100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3100" />
+      <printer translate="name" name="Canon PIXMA iP3300" driver="bjc-PIXMA-iP3300" manufacturer="Canon" model="3003300" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3300" />
+      <printer translate="name" name="Canon PIXMA iP3500" driver="bjc-PIXMA-iP3500" manufacturer="Canon" model="3003500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3500" />
+      <printer translate="name" name="Canon PIXMA iP3600" driver="bjc-PIXMA-iP3600" manufacturer="Canon" model="3003600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP3600" />
       <printer translate="name" name="Canon PIXMA iP4000" driver="bjc-iP4000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-iP4000" />
-      <printer translate="name" name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP4100" />
+      <printer translate="name" name="Canon PIXMA iP4000R" driver="bjc-PIXMA-iP4000R" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-iP4000R" />
+      <printer translate="name" name="Canon PIXMA iP4100" driver="bjc-PIXMA-iP4100" manufacturer="Canon" model="3004100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP4100" />
+      <printer translate="name" name="Canon PIXMA iP4100R" driver="bjc-PIXMA-iP4100R" manufacturer="Canon" model="3004100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP4100R" />
       <printer translate="name" name="Canon PIXMA iP4200" driver="bjc-PIXMA-iP4200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4200_params" foomaticid="Canon-PIXMA-iP4200" />
-      <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4300" />
+      <printer translate="name" name="Canon PIXMA iP4300" driver="bjc-PIXMA-iP4300" manufacturer="Canon" model="3004300" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4300" />
       <printer translate="name" name="Canon PIXMA iP4500" driver="bjc-PIXMA-iP4500" manufacturer="Canon" model="3004500" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4500" />
       <printer translate="name" name="Canon PIXMA iP4600" driver="bjc-PIXMA-iP4600" manufacturer="Canon" model="3004600" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4600" />
       <printer translate="name" name="Canon PIXMA iP4700" driver="bjc-PIXMA-iP4700" manufacturer="Canon" model="3004700" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4700" />
       <printer translate="name" name="Canon PIXMA iP4800" driver="bjc-PIXMA-iP4800" manufacturer="Canon" model="3004800" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4800" />
-      <printer translate="name" name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP5000" />
+      <printer translate="name" name="Canon PIXMA iP4900" driver="bjc-PIXMA-iP4900" manufacturer="Canon" model="3004900" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-iP4900" />
+      <printer translate="name" name="Canon PIXMA iP5000" driver="bjc-PIXMA-iP5000" manufacturer="Canon" model="3005000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP5000" />
       <printer translate="name" name="Canon PIXMA iP5200" driver="bjc-PIXMA-iP5200" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP5200" />
+      <printer translate="name" name="Canon PIXMA iP5200R" driver="bjc-PIXMA-iP5200R" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP5200R" />
       <printer translate="name" name="Canon PIXMA iP5300" driver="bjc-PIXMA-iP5300" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP5300" />
       <printer translate="name" name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6000D" />
       <printer translate="name" name="Canon PIXMA iP6100D" driver="bjc-PIXMA-iP6100D" manufacturer="Canon" model="3006100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6100D" />
+      <printer translate="name" name="Canon PIXMA iP6210D" driver="bjc-PIXMA-iP6210D" manufacturer="Canon" model="3006210" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6210D" />
+      <printer translate="name" name="Canon PIXMA iP6220D" driver="bjc-PIXMA-iP6220D" manufacturer="Canon" model="3006210" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6220D" />
+      <printer translate="name" name="Canon PIXMA iP6310D" driver="bjc-PIXMA-iP6310D" manufacturer="Canon" model="3006210" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6310D" />
+      <printer translate="name" name="Canon PIXMA iP6320D" driver="bjc-PIXMA-iP6320D" manufacturer="Canon" model="3006210" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6320D" />
       <printer translate="name" name="Canon PIXMA iP6600D" driver="bjc-PIXMA-iP6600D" manufacturer="Canon" model="3006600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6600D" />
       <printer translate="name" name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP6700" />
+      <printer translate="name" name="Canon PIXMA iP7100" driver="bjc-PIXMA-iP7100" manufacturer="Canon" model="3007100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP7100" />
+      <printer translate="name" name="Canon PIXMA iP7500" driver="bjc-PIXMA-iP7500" manufacturer="Canon" model="3007500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP7500" />
+      <printer translate="name" name="Canon PIXMA iP8100" driver="bjc-PIXMA-iP8100" manufacturer="Canon" model="3008100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP8100" />
       <printer translate="name" name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP8500" />
-      <printer translate="name" name="Canon PIXMA iX4000" driver="bjc-PIXMA-iX4000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" foomaticid="Canon-PIXMA-iX4000" />
+      <printer translate="name" name="Canon PIXMA iP8600" driver="bjc-PIXMA-iP8600" manufacturer="Canon" model="3008600" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP8600" />
+      <printer translate="name" name="Canon PIXMA iP9910" driver="bjc-PIXMA-iP9910" manufacturer="Canon" model="3009910" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-iP9910" />
+      <printer translate="name" name="Canon PIXMA iX4000" driver="bjc-PIXMA-iX4000" manufacturer="Canon" model="4004000" parameters="PIXMA_iX5000_params" foomaticid="Canon-PIXMA-iX4000" />
       <printer translate="name" name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" foomaticid="Canon-PIXMA-iX5000" />
       <printer translate="name" name="Canon PIXMA iX6500" driver="bjc-PIXMA-iX6500" manufacturer="Canon" model="4006500" parameters="PIXMA_iX5000_params" foomaticid="Canon-PIXMA-iX6500" />
       <printer translate="name" name="Canon PIXMA iX7000" driver="bjc-PIXMA-iX7000" manufacturer="Canon" model="4007000" parameters="PIXMA_iX5000_params" foomaticid="Canon-PIXMA-iX7000" />
@@ -169,74 +191,145 @@
       <printer translate="name" name="Canon PIXMA Pro9000mk2" driver="bjc-PIXMA-Pro9000mk2" manufacturer="Canon" model="7009002" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-Pro9000-Mk2" />
       <printer translate="name" name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-Pro9500" />
       <printer translate="name" name="Canon PIXMA Pro9500mk2" driver="bjc-PIXMA-Pro9500mk2" manufacturer="Canon" model="7009502" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXMA-Pro9500-Mk2" />
+      <printer translate="name" name="Canon PIXMA MP140" driver="bjc-MULTIPASS-MP140" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP140" />
       <printer translate="name" name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP150" />
       <printer translate="name" name="Canon PIXMA MP160" driver="bjc-MULTIPASS-MP160" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP160" />
-      <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000170" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP170" />
+      <printer translate="name" name="Canon PIXMA MP170" driver="bjc-MULTIPASS-MP170" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP170" />
       <printer translate="name" name="Canon PIXMA MP180" driver="bjc-MULTIPASS-MP180" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP180" />
-      <printer translate="name" name="Canon PIXMA MP220" driver="bjc-MULTIPASS-MP220" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP220" />
+      <printer translate="name" name="Canon PIXMA MP190" driver="bjc-MULTIPASS-MP190" manufacturer="Canon" model="5000190" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP190" />
+      <printer translate="name" name="Canon PIXMA MP210" driver="bjc-MULTIPASS-MP210" manufacturer="Canon" model="5000210" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP210" />
+      <printer translate="name" name="Canon PIXMA MP220" driver="bjc-MULTIPASS-MP220" manufacturer="Canon" model="5000210" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP220" />
+      <printer translate="name" name="Canon PIXMA MP240" driver="bjc-MULTIPASS-MP240" manufacturer="Canon" model="5000240" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP240" />
       <printer translate="name" name="Canon PIXMA MP250" driver="bjc-MULTIPASS-MP250" manufacturer="Canon" model="5000250" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP250" />
+      <printer translate="name" name="Canon PIXMA MP260" driver="bjc-MULTIPASS-MP260" manufacturer="Canon" model="5000240" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP260" />
       <printer translate="name" name="Canon PIXMA MP270" driver="bjc-MULTIPASS-MP270" manufacturer="Canon" model="5000270" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP270" />
       <printer translate="name" name="Canon PIXMA MP280" driver="bjc-MULTIPASS-MP280" manufacturer="Canon" model="5000280" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP280" />
-      <printer translate="name" name="Canon PIXMA MP360" driver="bjc-MULTIPASS-MP360" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP360" />
-      <printer translate="name" name="Canon PIXMA MP370" driver="bjc-MULTIPASS-MP370" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP370" />
-      <printer translate="name" name="Canon PIXMA MP390" driver="bjc-MULTIPASS-MP390" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP390" />
+      <printer translate="name" name="Canon PIXMA MP360" driver="bjc-MULTIPASS-MP360" manufacturer="Canon" model="5000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP360" />
+      <printer translate="name" name="Canon PIXMA MP370" driver="bjc-MULTIPASS-MP370" manufacturer="Canon" model="5000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP370" />
+      <printer translate="name" name="Canon PIXMA MP375R" driver="bjc-MULTIPASS-MP375R" manufacturer="Canon" model="5000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP375R" />
+      <printer translate="name" name="Canon PIXMA MP390" driver="bjc-MULTIPASS-MP390" manufacturer="Canon" model="5000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP390" />
       <printer translate="name" name="Canon PIXMA MP450" driver="bjc-MULTIPASS-MP450" manufacturer="Canon" model="5000450" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP450" />
       <printer translate="name" name="Canon PIXMA MP460" driver="bjc-MULTIPASS-MP460" manufacturer="Canon" model="5000450" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP460" />
+      <printer translate="name" name="Canon PIXMA MP470" driver="bjc-MULTIPASS-MP470" manufacturer="Canon" model="5000470" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP470" />
       <printer translate="name" name="Canon PIXMA MP480" driver="bjc-MULTIPASS-MP480" manufacturer="Canon" model="5000480" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP480" />
+      <printer translate="name" name="Canon PIXMA MP490" driver="bjc-MULTIPASS-MP490" manufacturer="Canon" model="5000490" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP490" />
       <printer translate="name" name="Canon PIXMA MP493" driver="bjc-MULTIPASS-MP493" manufacturer="Canon" model="5000493" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP493" />
       <printer translate="name" name="Canon PIXMA MP495" driver="bjc-MULTIPASS-MP495" manufacturer="Canon" model="5000495" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP495" />
       <printer translate="name" name="Canon PIXMA MP500" driver="bjc-MULTIPASS-MP500" manufacturer="Canon" model="3004200" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP500" />
       <printer translate="name" name="Canon PIXMA MP510" driver="bjc-MULTIPASS-MP510" manufacturer="Canon" model="5000510" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP510" />
       <printer translate="name" name="Canon PIXMA MP520" driver="bjc-MULTIPASS-MP520" manufacturer="Canon" model="5000520" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP520" />
+      <printer translate="name" name="Canon PIXMA MP530" driver="bjc-MULTIPASS-MP530" manufacturer="Canon" model="5000530" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP530" />
       <printer translate="name" name="Canon PIXMA MP540" driver="bjc-MULTIPASS-MP540" manufacturer="Canon" model="5000540" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP540" />
       <printer translate="name" name="Canon PIXMA MP550" driver="bjc-MULTIPASS-MP550" manufacturer="Canon" model="5000550" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP550" />
+      <printer translate="name" name="Canon PIXMA MP560" driver="bjc-MULTIPASS-MP560" manufacturer="Canon" model="5000560" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP560" />
       <printer translate="name" name="Canon PIXMA MP600" driver="bjc-MULTIPASS-MP600" manufacturer="Canon" model="5000600" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP600" />
-      <printer translate="name" name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="3005300" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP610" />
-      <printer translate="name" name="Canon PIXMA MP620" driver="bjc-MULTIPASS-MP620" manufacturer="Canon" model="5000540" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP620" />
+      <printer translate="name" name="Canon PIXMA MP600R" driver="bjc-MULTIPASS-MP600R" manufacturer="Canon" model="5000600" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP600R" />
+      <printer translate="name" name="Canon PIXMA MP610" driver="bjc-MULTIPASS-MP610" manufacturer="Canon" model="5000610" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP610" />
+      <printer translate="name" name="Canon PIXMA MP620" driver="bjc-MULTIPASS-MP620" manufacturer="Canon" model="5000620" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP620" />
       <printer translate="name" name="Canon PIXMA MP630" driver="bjc-MULTIPASS-MP630" manufacturer="Canon" model="5000630" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP630" />
       <printer translate="name" name="Canon PIXMA MP640" driver="bjc-MULTIPASS-MP640" manufacturer="Canon" model="5000640" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP640" />
-      <printer translate="name" name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP700" />
-      <printer translate="name" name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP710" />
-      <printer translate="name" name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP730" />
-      <printer translate="name" name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000740" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP740" />
-      <printer translate="name" name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP750" />
-      <printer translate="name" name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP760" />
-      <printer translate="name" name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP770" />
-      <printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP780" />
-      <printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP790" />
+      <printer translate="name" name="Canon PIXMA MP700" driver="bjc-MULTIPASS-MP700" manufacturer="Canon" model="5000700" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP700" />
+      <printer translate="name" name="Canon PIXMA MP710" driver="bjc-MULTIPASS-MP710" manufacturer="Canon" model="5000710" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP710" />
+      <printer translate="name" name="Canon PIXMA MP730" driver="bjc-MULTIPASS-MP730" manufacturer="Canon" model="5000700" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP730" />
+      <printer translate="name" name="Canon PIXMA MP740" driver="bjc-MULTIPASS-MP740" manufacturer="Canon" model="5000710" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP740" />
+      <printer translate="name" name="Canon PIXMA MP750" driver="bjc-MULTIPASS-MP750" manufacturer="Canon" model="5000750" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP750" />
+      <printer translate="name" name="Canon PIXMA MP760" driver="bjc-MULTIPASS-MP760" manufacturer="Canon" model="5000750" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP760" />
+      <printer translate="name" name="Canon PIXMA MP770" driver="bjc-MULTIPASS-MP770" manufacturer="Canon" model="5000750" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP770" />
+      <printer translate="name" name="Canon PIXMA MP780" driver="bjc-MULTIPASS-MP780" manufacturer="Canon" model="5000750" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP780" />
+      <printer translate="name" name="Canon PIXMA MP790" driver="bjc-MULTIPASS-MP790" manufacturer="Canon" model="5000750" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP790" />
       <printer translate="name" name="Canon PIXMA MP800" driver="bjc-MULTIPASS-MP800" manufacturer="Canon" model="5000800" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP800" />
+      <printer translate="name" name="Canon PIXMA MP800R" driver="bjc-MULTIPASS-MP800R" manufacturer="Canon" model="5000800" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP800R" />
       <printer translate="name" name="Canon PIXMA MP810" driver="bjc-MULTIPASS-MP810" manufacturer="Canon" model="5000810" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP810" />
       <printer translate="name" name="Canon PIXMA MP830" driver="bjc-MULTIPASS-MP830" manufacturer="Canon" model="5000830" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP830" />
+      <printer translate="name" name="Canon PIXMA MP900" driver="bjc-MULTIPASS-MP900" manufacturer="Canon" model="5000900" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP900" />
       <printer translate="name" name="Canon PIXMA MP950" driver="bjc-MULTIPASS-MP950" manufacturer="Canon" model="5000950" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP950" />
       <printer translate="name" name="Canon PIXMA MP960" driver="bjc-MULTIPASS-MP960" manufacturer="Canon" model="5000960" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP960" />
       <printer translate="name" name="Canon PIXMA MP970" driver="bjc-MULTIPASS-MP970" manufacturer="Canon" model="5000970" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP970" />
       <printer translate="name" name="Canon PIXMA MP980" driver="bjc-MULTIPASS-MP980" manufacturer="Canon" model="5000980" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP980" />
       <printer translate="name" name="Canon PIXMA MP990" driver="bjc-MULTIPASS-MP990" manufacturer="Canon" model="5000990" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MP990" />
-      <printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP3100" />
-      <printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP4100" />
+      <printer translate="name" name="Canon PIXUS iP2700" driver="bjc-PIXUS-iP2700" manufacturer="Canon" model="3002700" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP2700" />
+      <printer translate="name" name="Canon PIXUS iP3100" driver="bjc-PIXUS-iP3100" manufacturer="Canon" model="3003100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP3100" />
+      <printer translate="name" name="Canon PIXUS iP4100" driver="bjc-PIXUS-iP4100" manufacturer="Canon" model="3004100" parameters="PIXMA_iP4000_params" foomaticid="Canon-PIXUS-iP4100" />
+      <printer translate="name" name="Canon PIXMA MG2100" driver="bjc-PIXMA-MG2100" manufacturer="Canon" model="8002100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG2100" />
+      <printer translate="name" name="Canon PIXMA MG3100" driver="bjc-PIXMA-MG3100" manufacturer="Canon" model="8003100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG3100" />
+      <printer translate="name" name="Canon PIXMA MG4100" driver="bjc-PIXMA-MG4100" manufacturer="Canon" model="8003100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG4100" />
       <printer translate="name" name="Canon PIXMA MG5100" driver="bjc-PIXMA-MG5100" manufacturer="Canon" model="8005100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG5100" />
       <printer translate="name" name="Canon PIXMA MG5200" driver="bjc-PIXMA-MG5200" manufacturer="Canon" model="8005200" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG5200" />
+      <printer translate="name" name="Canon PIXMA MG5300" driver="bjc-PIXMA-MG5300" manufacturer="Canon" model="8005300" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG5300" />
       <printer translate="name" name="Canon PIXMA MG6100" driver="bjc-PIXMA-MG6100" manufacturer="Canon" model="8006100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG6100" />
+      <printer translate="name" name="Canon PIXMA MG6200" driver="bjc-PIXMA-MG6200" manufacturer="Canon" model="8006200" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG6200" />
       <printer translate="name" name="Canon PIXMA MG8100" driver="bjc-PIXMA-MG8100" manufacturer="Canon" model="8008100" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG8100" />
+      <printer translate="name" name="Canon PIXMA MG8200" driver="bjc-PIXMA-MG8200" manufacturer="Canon" model="8008200" parameters="PIXMA_iP4300_params" foomaticid="Canon-PIXMA-MG8200" />
       <printer translate="name" name="Canon PIXMA MX300" driver="bjc-MULTIPASS-MX300" manufacturer="Canon" model="9000300" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX300" />
-      <printer translate="name" name="Canon PIXMA MX310" driver="bjc-MULTIPASS-MX300" manufacturer="Canon" model="9000300" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX310" />
+      <printer translate="name" name="Canon PIXMA MX310" driver="bjc-MULTIPASS-MX310" manufacturer="Canon" model="9000300" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX310" />
+      <printer translate="name" name="Canon PIXMA MX320" driver="bjc-MULTIPASS-MX320" manufacturer="Canon" model="9000330" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX320" />
       <printer translate="name" name="Canon PIXMA MX330" driver="bjc-MULTIPASS-MX330" manufacturer="Canon" model="9000330" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX330" />
       <printer translate="name" name="Canon PIXMA MX340" driver="bjc-MULTIPASS-MX340" manufacturer="Canon" model="9000340" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX340" />
-      <printer translate="name" name="Canon PIXMA MX350" driver="bjc-MULTIPASS-MX340" manufacturer="Canon" model="9000340" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX350" />
+      <printer translate="name" name="Canon PIXMA MX350" driver="bjc-MULTIPASS-MX350" manufacturer="Canon" model="9000340" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX350" />
       <printer translate="name" name="Canon PIXMA MX360" driver="bjc-MULTIPASS-MX360" manufacturer="Canon" model="9000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX360" />
+      <printer translate="name" name="Canon PIXMA MX370" driver="bjc-MULTIPASS-MX370" manufacturer="Canon" model="9000370" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX370" />
       <printer translate="name" name="Canon PIXMA MX410" driver="bjc-MULTIPASS-MX410" manufacturer="Canon" model="9000360" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX410" />
       <printer translate="name" name="Canon PIXMA MX420" driver="bjc-MULTIPASS-MX420" manufacturer="Canon" model="9000420" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX420" />
+      <printer translate="name" name="Canon PIXMA MX430" driver="bjc-MULTIPASS-MX430" manufacturer="Canon" model="9000370" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX430" />
+      <printer translate="name" name="Canon PIXMA MX510" driver="bjc-MULTIPASS-MX510" manufacturer="Canon" model="9000510" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX510" />
       <printer translate="name" name="Canon PIXMA MX700" driver="bjc-MULTIPASS-MX700" manufacturer="Canon" model="9000700" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX700" />
-       <printer translate="name" name="Canon PIXMA MX850" driver="bjc-MULTIPASS-MX850" manufacturer="Canon" model="9000850" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX850" />
-       <printer translate="name" name="Canon PIXMA MX860" driver="bjc-MULTIPASS-MX860" manufacturer="Canon" model="9000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX860" />
-       <printer translate="name" name="Canon PIXMA MX870" driver="bjc-MULTIPASS-MX870" manufacturer="Canon" model="9000870" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX870" />
-       <printer translate="name" name="Canon PIXMA MX880" driver="bjc-MULTIPASS-MX880" manufacturer="Canon" model="9000880" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX880" />
-       <printer translate="name" name="Canon PIXMA MX7600" driver="bjc-MULTIPASS-MX7600" manufacturer="Canon" model="9007600" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX7600" />
-      <printer translate="name" name="Canon i80" driver="bjc-i80"   manufacturer="Canon" model="2000080" parameters="density_800_params" foomaticid="Canon-i80" />
+      <printer translate="name" name="Canon PIXMA MX710" driver="bjc-MULTIPASS-MX710" manufacturer="Canon" model="9000710" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX710" />
+      <printer translate="name" name="Canon PIXMA MX850" driver="bjc-MULTIPASS-MX850" manufacturer="Canon" model="9000850" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX850" />
+      <printer translate="name" name="Canon PIXMA MX860" driver="bjc-MULTIPASS-MX860" manufacturer="Canon" model="9000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX860" />
+      <printer translate="name" name="Canon PIXMA MX870" driver="bjc-MULTIPASS-MX870" manufacturer="Canon" model="9000870" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX870" />
+      <printer translate="name" name="Canon PIXMA MX880" driver="bjc-MULTIPASS-MX880" manufacturer="Canon" model="9000880" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX880" />
+      <printer translate="name" name="Canon PIXMA MX890" driver="bjc-MULTIPASS-MX890" manufacturer="Canon" model="9000710" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX890" />
+      <printer translate="name" name="Canon PIXMA MX7600" driver="bjc-MULTIPASS-MX7600" manufacturer="Canon" model="9007600" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-MX7600" />
+      <printer translate="name" name="Canon PIXMA E500" driver="bjc-MULTIPASS-E500" manufacturer="Canon" model="12000500" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-E500" />
+      <printer translate="name" name="Canon PIXMA E600" driver="bjc-MULTIPASS-E600" manufacturer="Canon" model="12000600" parameters="PIXMA_iP4000_params" foomaticid="Canon-MULTIPASS-E600" />
+      <printer translate="name" name="Canon 50i" driver="bjc-50i" manufacturer="Canon" model="2000050" parameters="density_800_params" foomaticid="Canon-50i" />
+      <printer translate="name" name="Canon 80i" driver="bjc-80i" manufacturer="Canon" model="2000080" parameters="density_800_params" foomaticid="Canon-80i" />
+      <printer translate="name" name="Canon 450i" driver="bjc-450i" manufacturer="Canon" model="2000450" parameters="density_800_params" foomaticid="Canon-450i" />
+      <printer translate="name" name="Canon 455i" driver="bjc-455i" manufacturer="Canon" model="2000455" parameters="density_800_params" foomaticid="Canon-455i" />
+      <printer translate="name" name="Canon 470PD" driver="bjc-470PD" manufacturer="Canon" model="2000450" parameters="density_800_params" foomaticid="Canon-470PD" />
+      <printer translate="name" name="Canon 475PD" driver="bjc-475PD" manufacturer="Canon" model="2000455" parameters="density_800_params" foomaticid="Canon-475PD" />
+      <printer translate="name" name="Canon 550i" driver="bjc-550i" manufacturer="Canon" model="2000550" parameters="density_800_params" foomaticid="Canon-550i" />
+      <printer translate="name" name="Canon 560i" driver="bjc-560i" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" foomaticid="Canon-560i" />
+      <printer translate="name" name="Canon 850i" driver="bjc-850i" manufacturer="Canon" model="2000850" parameters="PIXMA_iP4000_params" foomaticid="Canon-850i" />
+      <printer translate="name" name="Canon 860i" driver="bjc-860i" manufacturer="Canon" model="2000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-860i" />
+      <printer translate="name" name="Canon 865R" driver="bjc-865R" manufacturer="Canon" model="2000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-865R" />
+      <printer translate="name" name="Canon 900PD" driver="bjc-900PD" manufacturer="Canon" model="2000900" parameters="PIXMA_iP4000_params" foomaticid="Canon-900PD" />
+      <printer translate="name" name="Canon 950i" driver="bjc-950i" manufacturer="Canon" model="2000950" parameters="PIXMA_iP4000_params" foomaticid="Canon-950i" />
+      <printer translate="name" name="Canon 960i" driver="bjc-960i" manufacturer="Canon" model="2000960" parameters="PIXMA_iP4000_params" foomaticid="Canon-960i" />
+      <printer translate="name" name="Canon 990i" driver="bjc-990i" manufacturer="Canon" model="2000990" parameters="PIXMA_iP4000_params" foomaticid="Canon-990i" />
+      <printer translate="name" name="Canon 6100i" driver="bjc-6100i" manufacturer="Canon" model="2006100" parameters="PIXMA_iP4000_params" foomaticid="Canon-6100i" />
+      <printer translate="name" name="Canon 6500i" driver="bjc-6500i" manufacturer="Canon" model="2006100" parameters="PIXMA_iP4000_params" foomaticid="Canon-6500i" />
+      <printer translate="name" name="Canon 9100i" driver="bjc-9100i" manufacturer="Canon" model="2009100" parameters="PIXMA_iP4000_params" foomaticid="Canon-9100i" />
+      <printer translate="name" name="Canon 9900i" driver="bjc-9900i" manufacturer="Canon" model="2009900" parameters="PIXMA_iP4000_params" foomaticid="Canon-9900i" />
+      <printer translate="name" name="Canon i70" driver="bjc-i70" manufacturer="Canon" model="2000050" parameters="density_800_params" foomaticid="Canon-i70" />
+      <printer translate="name" name="Canon i80" driver="bjc-i80" manufacturer="Canon" model="2000080" parameters="density_800_params" foomaticid="Canon-i80" />
+      <printer translate="name" name="Canon i450" driver="bjc-i450" manufacturer="Canon" model="2000450" parameters="density_800_params" foomaticid="Canon-i450" />
+      <printer translate="name" name="Canon i450X" driver="bjc-i450X" manufacturer="Canon" model="2000450" parameters="density_800_params" foomaticid="Canon-i450X" />
+      <printer translate="name" name="Canon i455" driver="bjc-i455" manufacturer="Canon" model="2000455" parameters="density_800_params" foomaticid="Canon-i455" />
+      <printer translate="name" name="Canon i455X" driver="bjc-i455X" manufacturer="Canon" model="2000455" parameters="density_800_params" foomaticid="Canon-i455X" />
+      <printer translate="name" name="Canon i470D" driver="bjc-i470D" manufacturer="Canon" model="2000450" parameters="density_800_params" foomaticid="Canon-i470D" />
+      <printer translate="name" name="Canon i475D" driver="bjc-i475D" manufacturer="Canon" model="2000455" parameters="density_800_params" foomaticid="Canon-i475D" />
+      <printer translate="name" name="Canon i550" driver="bjc-i550" manufacturer="Canon" model="2000550" parameters="density_800_params" foomaticid="Canon-i550" />
+      <printer translate="name" name="Canon i550X" driver="bjc-i550X" manufacturer="Canon" model="2000550" parameters="density_800_params" foomaticid="Canon-i550X" />
       <printer translate="name" name="Canon i560" driver="bjc-i560" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" foomaticid="Canon-i560" />
-      <printer translate="name" name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i850" />
-      <printer translate="name" name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i860" />
-      <printer translate="name" name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i865" />
+      <printer translate="name" name="Canon i560X" driver="bjc-i560X" manufacturer="Canon" model="2000560" parameters="gamma_6_density_800_params" foomaticid="Canon-i560X" />
+      <printer translate="name" name="Canon i850old" driver="bjc-i850old" manufacturer="Canon" model="3003000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i850old" />
+      <printer translate="name" name="Canon i850" driver="bjc-i850" manufacturer="Canon" model="2000850" parameters="PIXMA_iP4000_params" foomaticid="Canon-i850" />
+      <printer translate="name" name="Canon i860old" driver="bjc-i860old" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i860old" />
+      <printer translate="name" name="Canon i860" driver="bjc-i860" manufacturer="Canon" model="2000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-i860" />
+      <printer translate="name" name="Canon i865old" driver="bjc-i865old" manufacturer="Canon" model="3004000" parameters="PIXMA_iP4000_params" foomaticid="Canon-i865old" />
+      <printer translate="name" name="Canon i865" driver="bjc-i865" manufacturer="Canon" model="2000860" parameters="PIXMA_iP4000_params" foomaticid="Canon-i865" />
+      <printer translate="name" name="Canon i900D" driver="bjc-i900D" manufacturer="Canon" model="2000900" parameters="PIXMA_iP4000_params" foomaticid="Canon-i900D" />
+      <printer translate="name" name="Canon i905D" driver="bjc-i905D" manufacturer="Canon" model="2000900" parameters="PIXMA_iP4000_params" foomaticid="Canon-i905D" />
+      <printer translate="name" name="Canon i950" driver="bjc-i950" manufacturer="Canon" model="2000950" parameters="PIXMA_iP4000_params" foomaticid="Canon-i950" />
+      <printer translate="name" name="Canon i960" driver="bjc-i960" manufacturer="Canon" model="2000960" parameters="PIXMA_iP4000_params" foomaticid="Canon-i960" />
+      <printer translate="name" name="Canon i965" driver="bjc-i965" manufacturer="Canon" model="2000960" parameters="PIXMA_iP4000_params" foomaticid="Canon-i965" />
+      <printer translate="name" name="Canon i990" driver="bjc-i990" manufacturer="Canon" model="2000990" parameters="PIXMA_iP4000_params" foomaticid="Canon-i990" />
+      <printer translate="name" name="Canon i6100" driver="bjc-i6100" manufacturer="Canon" model="2006100" parameters="PIXMA_iP4000_params" foomaticid="Canon-i6100" />
+      <printer translate="name" name="Canon i6500" driver="bjc-i6500" manufacturer="Canon" model="2006100" parameters="PIXMA_iP4000_params" foomaticid="Canon-i6500" />
+      <printer translate="name" name="Canon i9100" driver="bjc-i9100" manufacturer="Canon" model="2009100" parameters="PIXMA_iP4000_params" foomaticid="Canon-i9100" />
+      <printer translate="name" name="Canon i9900" driver="bjc-i9900" manufacturer="Canon" model="2009900" parameters="PIXMA_iP4000_params" foomaticid="Canon-i9900" />
+      <printer translate="name" name="Canon i9950" driver="bjc-i9950" manufacturer="Canon" model="2009900" parameters="PIXMA_iP4000_params" foomaticid="Canon-i9950" />
     </family>
     <family name="escp2">
       <parameters name="standard_params">
@@ -266,6 +359,7 @@
       <printer translate="name" name="Epson Artisan 710" driver="escp2-artisan710" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Artisan_710" />
       <printer translate="name" name="Epson Artisan 800" driver="escp2-artisan800" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Artisan_800" />
       <printer translate="name" name="Epson Artisan 810" driver="escp2-artisan810" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Artisan_810" />
+      <printer translate="name" name="Epson Artisan 835" driver="escp2-artisan835" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Artisan_835" />
       <printer translate="name" name="Epson B-300" driver="escp2-b300" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-B300" />
       <printer translate="name" name="Epson B-308" driver="escp2-b308" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-B308" />
       <printer translate="name" name="Epson B-310" driver="escp2-b310" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-B310" />
@@ -356,10 +450,14 @@
       <printer translate="name" name="Epson Stylus Office T1100" driver="escp2-of-t1100" manufacturer="Epson" model="99" parameters="standard_params" foomaticid="Epson-Stylus_Office_T1100" />
       <printer translate="name" name="Epson Stylus Office T1110" driver="escp2-of-t1110" manufacturer="Epson" model="99" parameters="standard_params" foomaticid="Epson-Stylus_Office_T1110" />
       <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_Office_BX300F" />
+      <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_BX535WD" />
       <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_BX600FW" />
+      <printer translate="name" name="Epson Stylus Office BX630FW" driver="escp2-of-bx630fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_BX630FW" />
+      <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_BX635FWD" />
       <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_SX600FW" />
       <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_Office_TX300F" />
       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_TX600FW" />
+      <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_Office_TX620FWD" />
       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" foomaticid="Epson-Stylus_Photo" />
       <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" foomaticid="Epson-Stylus_Photo_700" />
       <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" foomaticid="Epson-Stylus_Photo_EX" />
@@ -422,6 +520,7 @@
       <printer translate="name" name="Epson Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R800" />
       <printer translate="name" name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R1800" />
       <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R1900" />
+      <printer translate="name" name="Epson Stylus Photo R2000" driver="escp2-r2000" manufacturer="Epson" model="91" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R2000" />
       <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R2400" />
       <printer translate="name" name="Epson Stylus Photo R2880" driver="escp2-r2880" manufacturer="Epson" model="98" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R2880" />
       <printer translate="name" name="Epson Stylus Photo R3000" driver="escp2-r3000" manufacturer="Epson" model="115" parameters="standard_params" foomaticid="Epson-Stylus_Photo_R3000" />
@@ -441,6 +540,7 @@
       <printer translate="name" name="Epson Stylus Photo RX620" deviceid="MFG:EPSON;MDL:Stylus Photo RX620;DES:EPSON Stylus Photo RX620;CMD:ESCPL2,BDC,D4;" driver="escp2-rx620" manufacturer="Epson" model="84" parameters="standard_params" foomaticid="Epson-Stylus_Photo_RX620" />
       <printer translate="name" name="Epson Stylus Photo RX630" deviceid="MFG:EPSON;MDL:Stylus Photo RX630;DES:EPSON Stylus Photo RX630;CMD:ESCPL2,BDC,D4;" driver="escp2-rx630" manufacturer="Epson" model="84" parameters="standard_params" foomaticid="Epson-Stylus_Photo_RX630" />
       <printer translate="name" name="Epson Stylus Photo RX640" driver="escp2-rx640" manufacturer="Epson" model="81" parameters="claria_params" foomaticid="Epson-Stylus_Photo_RX640" />
+      <printer translate="name" name="Epson Stylus Photo RX650" driver="escp2-rx650" manufacturer="Epson" model="81" parameters="claria_params" foomaticid="Epson-Stylus_Photo_RX650" />
       <printer translate="name" name="Epson Stylus Photo RX680" driver="escp2-rx680" manufacturer="Epson" model="97" parameters="claria_params" foomaticid="Epson-Stylus_Photo_RX680" />
       <printer translate="name" name="Epson Stylus Photo RX685" driver="escp2-rx685" manufacturer="Epson" model="97" parameters="claria_params" foomaticid="Epson-Stylus_Photo_RX685" />
       <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" foomaticid="Epson-Stylus_Photo_RX690" />
@@ -465,6 +565,7 @@
       <printer translate="name" name="Epson Stylus Pro 7800" driver="escp2-7800" manufacturer="Epson" model="103" parameters="standard_params" foomaticid="Epson-Stylus_Pro_7800" />
       <printer translate="name" name="Epson Stylus Pro 7880" driver="escp2-7880" manufacturer="Epson" model="89" parameters="standard_params" foomaticid="Epson-Stylus_Pro_7880" />
       <printer translate="name" name="Epson Stylus Pro 7890" driver="escp2-7890" manufacturer="Epson" model="89" parameters="standard_params" foomaticid="Epson-Stylus_Pro_7890" />
+      <printer translate="name" name="Epson Stylus Pro 7900" driver="escp2-7900" manufacturer="Epson" model="116" parameters="standard_params" foomaticid="Epson-Stylus_Pro_7900" />
       <printer translate="name" name="Epson Stylus Pro 9000" driver="escp2-9000" manufacturer="Epson" model="30" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9000" />
       <printer translate="name" name="Epson Stylus Pro 9500" driver="escp2-9500" manufacturer="Epson" model="31" parameters="pro_5500_params" foomaticid="Epson-Stylus_Pro_9500" />
       <printer translate="name" name="Epson Stylus Pro 9600" driver="escp2-9600" manufacturer="Epson" model="49" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9600" />
@@ -472,6 +573,7 @@
       <printer translate="name" name="Epson Stylus Pro 9800" driver="escp2-9800" manufacturer="Epson" model="104" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9800" />
       <printer translate="name" name="Epson Stylus Pro 9880" driver="escp2-9880" manufacturer="Epson" model="90" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9880" />
       <printer translate="name" name="Epson Stylus Pro 9890" driver="escp2-9890" manufacturer="Epson" model="90" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9890" />
+      <printer translate="name" name="Epson Stylus Pro 9900" driver="escp2-9900" manufacturer="Epson" model="117" parameters="standard_params" foomaticid="Epson-Stylus_Pro_9900" />
       <printer translate="name" name="Epson Stylus Pro 10000" driver="escp2-10000" manufacturer="Epson" model="41" parameters="standard_params" foomaticid="Epson-Stylus_Pro_10000" />
       <printer translate="name" name="Epson Stylus Pro 11800/11880 Back Compatible" driver="escp2-11600" manufacturer="Epson" model="113" parameters="standard_params" foomaticid="Epson-Stylus_Pro_11600" />
       <printer translate="name" name="Epson Stylus Pro 11800" driver="escp2-11800" manufacturer="Epson" model="105" parameters="standard_params" foomaticid="Epson-Stylus_Pro_11800" />
@@ -488,6 +590,7 @@
       <printer translate="name" name="Epson Stylus CX3800" deviceid="MFG:EPSON;MDL:Stylus CX3800;DES:EPSON Stylus CX3800;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3800" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_CX3800" />
       <printer translate="name" name="Epson Stylus CX3805" deviceid="MFG:EPSON;MDL:Stylus CX3805;DES:EPSON Stylus CX3805;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3805" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_CX3805" />
       <printer translate="name" name="Epson Stylus CX3810" deviceid="MFG:EPSON;MDL:Stylus CX3810;DES:EPSON Stylus CX3810;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3810" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_CX3810" />
+      <printer translate="name" name="Epson Stylus CX3900" deviceid="MFG:EPSON;MDL:Stylus CX3900;DES:EPSON Stylus CX3900;CMD:ESCPL2,BDC,D4;" driver="escp2-cx3900" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_CX3900" />
       <printer translate="name" name="Epson Stylus CX4100" deviceid="MFG:EPSON;MDL:Stylus CX4100;DES:EPSON Stylus CX4100;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4100" manufacturer="Epson" model="95" parameters="cx3500_params" foomaticid="Epson-Stylus_CX4100" />
       <printer translate="name" name="Epson Stylus CX4200" deviceid="MFG:EPSON;MDL:Stylus CX4200;DES:EPSON Stylus CX4200;CMD:ESCPL2,BDC,D4;" driver="escp2-cx4200" manufacturer="Epson" model="95" parameters="cx3500_params" foomaticid="Epson-Stylus_CX4200" />
       <printer translate="name" name="Epson Stylus CX4400" driver="escp2-cx4400" manufacturer="Epson" model="72" parameters="standard_params" foomaticid="Epson-Stylus_CX4400" />
@@ -544,12 +647,15 @@
       <printer translate="name" name="Epson Stylus NX100" driver="escp2-nx100" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX100" />
       <printer translate="name" name="Epson Stylus NX105" driver="escp2-nx105" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX105" />
       <printer translate="name" name="Epson Stylus NX115" driver="escp2-nx115" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX115" />
-      <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX200" />
+      <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_NX200" />
       <printer translate="name" name="Epson Stylus NX215" driver="escp2-nx215" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX215" />
       <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX300" />
       <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_NX400" />
       <printer translate="name" name="Epson Stylus NX415" driver="escp2-nx415" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_NX415" />
+      <printer translate="name" name="Epson Stylus NX420" driver="escp2-nx420" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_NX420" />
       <printer translate="name" name="Epson Stylus NX515" driver="escp2-nx515" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_NX515" />
+      <printer translate="name" name="Epson Stylus NX530" driver="escp2-nx530" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_NX530" />
+      <printer translate="name" name="Epson Stylus NX635" driver="escp2-nx635" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_NX635" />
       <printer translate="name" name="Epson Stylus Photo PX650" driver="escp2-px650" manufacturer="Epson" model="97" parameters="standard_params" foomaticid="Epson-Stylus_Photo_PX650" />
       <printer translate="name" name="Epson Stylus Photo PX700W" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Stylus_Photo_PX700W" />
       <printer translate="name" name="Epson Stylus Photo PX710W" driver="escp2-px710fw" manufacturer="Epson" model="96" parameters="claria_params" foomaticid="Epson-Stylus_Photo_PX710W" />
@@ -562,16 +668,19 @@
       <printer translate="name" name="Epson Stylus SX105" driver="escp2-sx105" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX105" />
       <printer translate="name" name="Epson Stylus SX110" driver="escp2-sx110" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX110" />
       <printer translate="name" name="Epson Stylus SX115" driver="escp2-sx115" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX115" />
-      <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX200" />
-      <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX205" />
+      <printer translate="name" name="Epson Stylus SX200" driver="escp2-sx200" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX200" />
+      <printer translate="name" name="Epson Stylus SX205" driver="escp2-sx205" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX205" />
       <printer translate="name" name="Epson Stylus SX210" driver="escp2-sx210" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX210" />
       <printer translate="name" name="Epson Stylus SX215" driver="escp2-sx215" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX215" />
       <printer translate="name" name="Epson Stylus SX400" driver="escp2-sx400" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX400" />
       <printer translate="name" name="Epson Stylus SX405" driver="escp2-sx405" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX405" />
       <printer translate="name" name="Epson Stylus SX410" driver="escp2-sx410" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX410" />
       <printer translate="name" name="Epson Stylus SX415" driver="escp2-sx415" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_SX415" />
+      <printer translate="name" name="Epson Stylus SX420" driver="escp2-sx420" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_SX420" />
       <printer translate="name" name="Epson Stylus SX510W" driver="escp2-sx510w" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX510W" />
       <printer translate="name" name="Epson Stylus SX515" driver="escp2-sx515" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX515" />
+      <printer translate="name" name="Epson Stylus SX525" driver="escp2-sx525" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX525" />
+      <printer translate="name" name="Epson Stylus SX535FW" driver="escp2-sx535FW" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX535FW" />
       <printer translate="name" name="Epson Stylus SX600FW" driver="escp2-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX600FW" />
       <printer translate="name" name="Epson Stylus SX610FW" driver="escp2-sx610fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX610FW" />
       <printer translate="name" name="Epson Stylus SX615" driver="escp2-sx615" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_SX615" />
@@ -602,6 +711,7 @@
       <printer translate="name" name="Epson Stylus TX300F" driver="escp2-tx300f" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_TX300F" />
       <printer translate="name" name="Epson Stylus TX400" driver="escp2-tx400" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_TX400" />
       <printer translate="name" name="Epson Stylus TX410" driver="escp2-tx410" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-Stylus_TX410" />
+      <printer translate="name" name="Epson Stylus TX420" driver="escp2-tx420" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-Stylus_TX420" />
       <printer translate="name" name="Epson Stylus TX510FN" driver="escp2-tx510fn" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_TX510FN" />
       <printer translate="name" name="Epson Stylus TX550W" driver="escp2-tx550w" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_TX550W" />
       <printer translate="name" name="Epson Stylus TX610FW" driver="escp2-tx610fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-Stylus_TX610FW" />
@@ -631,9 +741,13 @@
       <printer translate="name" name="Epson WorkForce 310" driver="escp2-wf310" manufacturer="Epson" model="85" parameters="standard_params" foomaticid="Epson-WorkForce_310" />
       <printer translate="name" name="Epson WorkForce 315" driver="escp2-wf315" manufacturer="Epson" model="85" parameters="standard_params" foomaticid="Epson-WorkForce_315" />
       <printer translate="name" name="Epson WorkForce 500" driver="escp2-wf500" manufacturer="Epson" model="93" parameters="standard_params" foomaticid="Epson-WorkForce_500" />
+      <printer translate="name" name="Epson WorkForce 545" driver="escp2-wf545" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_545" />
       <printer translate="name" name="Epson WorkForce 600" driver="escp2-wf600" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_600" />
       <printer translate="name" name="Epson WorkForce 610" driver="escp2-wf610" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_610" />
       <printer translate="name" name="Epson WorkForce 615" driver="escp2-wf615" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_615" />
+      <printer translate="name" name="Epson WorkForce 630" driver="escp2-wf630" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_630" />
+      <printer translate="name" name="Epson WorkForce 635" driver="escp2-wf636" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_635" />
+      <printer translate="name" name="Epson WorkForce 645" driver="escp2-wf645" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-WorkForce_645" />
       <printer translate="name" name="Epson WorkForce 1100" driver="escp2-wf1100" manufacturer="Epson" model="99" parameters="standard_params" foomaticid="Epson-WorkForce_1100" />
       <printer translate="name" name="Epson CL 700" driver="escp2-cl700" manufacturer="Epson" model="38" parameters="480_params" foomaticid="Epson-CL_700" />
       <printer translate="name" name="Epson CL 750" driver="escp2-cl750" manufacturer="Epson" model="43" parameters="480_params" foomaticid="Epson-CL_750" />
@@ -666,6 +780,7 @@
       <printer translate="name" name="Epson ME Office 600F" driver="escp2-meof600f" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-ME_Office_600F" />
       <printer translate="name" name="Epson ME Office 620F" driver="escp2-meof620f" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-ME_Office_620F" />
       <printer translate="name" name="Epson ME Office 700FW" driver="escp2-meof700fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-ME_Office_700FW" />
+      <printer translate="name" name="Epson ME Office 940FW" driver="escp2-meof940fw" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-ME_Office_940FW" />
       <printer translate="name" name="Epson ME Office 1100" driver="escp2-meof1100" manufacturer="Epson" model="99" parameters="standard_params" foomaticid="Epson-ME_Office_1100" />
       <printer translate="name" name="Epson MJ 930C" driver="escp2-mj930c" manufacturer="Epson" model="4" parameters="standard_params" foomaticid="Epson-MJ_930C" />
       <printer translate="name" name="Epson MJ 5100C" driver="escp2-mj5100c" manufacturer="Epson" model="39" parameters="standard_params" foomaticid="Epson-MJ_5100C" />
@@ -724,9 +839,12 @@
       <printer translate="name" name="Epson PX A650" driver="escp2-pxa650" manufacturer="Epson" model="95" parameters="cx3500_params" foomaticid="Epson-PX_A650" />
       <printer translate="name" name="Epson Offirio PX B300" driver="escp2-pxb300" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-Offirio-PX_B300" />
       <printer translate="name" name="Epson Offirio PX B500" driver="escp2-pxb500" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-Offirio-PX_B500" />
+      <printer translate="name" name="Epson PX 7V" driver="escp2-px7v" manufacturer="Epson" model="91" parameters="standard_params" foomaticid="Epson-PX_7V" />
       <printer translate="name" name="Epson PX 101" driver="escp2-px101" manufacturer="Epson" model="85" parameters="standard_params" foomaticid="Epson-PX_101" />
       <printer translate="name" name="Epson PX 201" driver="escp2-px201" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-PX_201" />
+      <printer translate="name" name="Epson PX 204" driver="escp2-px204" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-PX_204" />
       <printer translate="name" name="Epson PX 401A" driver="escp2-px401a" manufacturer="Epson" model="94" parameters="standard_params" foomaticid="Epson-PX_401" />
+      <printer translate="name" name="Epson PX 504A" driver="escp2-px504a" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-PX_504A" />
       <printer translate="name" name="Epson PX 601F" driver="escp2-px601f" manufacturer="Epson" model="92" parameters="standard_params" foomaticid="Epson-PX_601F" />
       <printer translate="name" name="Epson PX 1001" driver="escp2-px1001" manufacturer="Epson" model="100" parameters="standard_params" foomaticid="Epson-PX_1001" />
       <printer translate="name" name="Epson PX G900" driver="escp2-pxg900" manufacturer="Epson" model="64" parameters="standard_params" foomaticid="Epson-PX_G900" />
@@ -1734,21 +1852,36 @@
       <printer translate="name" name="Canon CP-220" driver="canon-cp220" manufacturer="Canon" model="1001" foomaticid="Canon-CP-220" />
       <printer translate="name" name="Canon CP-300" driver="canon-cp300" manufacturer="Canon" model="1000" foomaticid="Canon-CP-300" />
       <printer translate="name" name="Canon CP-330" driver="canon-cp330" manufacturer="Canon" model="1001" foomaticid="Canon-CP-330" />
-      <printer translate="name" name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-400" />
-      <printer translate="name" name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-500" />
-      <printer translate="name" name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-510" />
-      <printer translate="name" name="Canon SELPHY-CP-520" driver="canon-cp520" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-520" />
-      <printer translate="name" name="Canon SELPHY-CP-530" driver="canon-cp530" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-530" />
-      <printer translate="name" name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-600" />
-      <printer translate="name" name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-710" />
-      <printer translate="name" name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-720" />
-      <printer translate="name" name="Canon SELPHY-CP-730" driver="canon-cp730" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-730" />
-      <printer translate="name" name="Canon SELPHY-CP-740" driver="canon-cp740" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-740" />
-      <printer translate="name" name="Canon SELPHY-CP-750" driver="canon-cp750" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-750" />
-      <printer translate="name" name="Canon SELPHY-CP-800" driver="canon-cp800" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-800" />
+      <printer translate="name" name="Canon SELPHY-CP400" driver="canon-cp400" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-400" />
+      <printer translate="name" name="Canon SELPHY-CP500" driver="canon-cp500" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-500" />
+      <printer translate="name" name="Canon SELPHY-CP510" driver="canon-cp510" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-510" />
+      <printer translate="name" name="Canon SELPHY-CP520" driver="canon-cp520" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-520" />
+      <printer translate="name" name="Canon SELPHY-CP530" driver="canon-cp530" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-530" />
+<!--
+      <printer translate="name" name="Canon SELPHY-CP600" driver="canon-cp600" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-600" />
+-->
+      <printer translate="name" name="Canon SELPHY-CP710" driver="canon-cp710" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-710" />
+<!--
+      <printer translate="name" name="Canon SELPHY-CP720" driver="canon-cp720" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-720" />
+-->
+      <printer translate="name" name="Canon SELPHY-CP730" driver="canon-cp730" manufacturer="Canon" model="1001" foomaticid="Canon-SELPHY-CP-730" />
+      <printer translate="name" name="Canon SELPHY-CP740" driver="canon-cp740" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-740" />
+      <printer translate="name" name="Canon SELPHY-CP750" driver="canon-cp750" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-750" />
+      <printer translate="name" name="Canon SELPHY-CP760" driver="canon-cp760" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-760" />
+      <printer translate="name" name="Canon SELPHY-CP770" driver="canon-cp770" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-770" />
+<!--
+      <printer translate="name" name="Canon SELPHY-CP780" driver="canon-cp780" manufacturer="Canon" model="1004" foomaticid="Canon-SELPHY-CP-780" />
+-->
+      <printer translate="name" name="Canon SELPHY-CP790" driver="canon-cp790" manufacturer="Canon" model="1008" foomaticid="Canon-SELPHY-CP-790" />
+<!--
+      <printer translate="name" name="Canon SELPHY-CP800" driver="canon-cp800" manufacturer="Canon" model="1009" foomaticid="Canon-SELPHY-CP-800" />
       <printer translate="name" name="Canon SELPHY ES1" driver="canon-es1" manufacturer="Canon" model="1003" foomaticid="Canon-SELPHY-ES1" />
-      <printer translate="name" name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1003" foomaticid="Canon-SELPHY-ES2" />
-      <printer translate="name" name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1003" foomaticid="Canon-SELPHY-ES20" />
+      <printer translate="name" name="Canon SELPHY ES2" driver="canon-es2" manufacturer="Canon" model="1005" foomaticid="Canon-SELPHY-ES2" />
+      <printer translate="name" name="Canon SELPHY ES3" driver="canon-es3" manufacturer="Canon" model="1006" foomaticid="Canon-SELPHY-ES3" />
+      <printer translate="name" name="Canon SELPHY ES20" driver="canon-es20" manufacturer="Canon" model="1005" foomaticid="Canon-SELPHY-ES20" />
+      <printer translate="name" name="Canon SELPHY ES30" driver="canon-es30" manufacturer="Canon" model="1006" foomaticid="Canon-SELPHY-ES30" />
+      <printer translate="name" name="Canon SELPHY ES40" driver="canon-es40" manufacturer="Canon" model="1007" foomaticid="Canon-SELPHY-ES40" />
+-->
       <printer translate="name" name="Sony DPP-EX5" driver="sony-dppex5" manufacturer="Sony" model="2002" foomaticid="Sony-DPP-EX5" />
       <printer translate="name" name="Sony DPP-EX7" driver="sony-dppex7" manufacturer="Sony" model="2002" foomaticid="Sony-DPP-EX7" />
       <printer translate="name" name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000" foomaticid="Sony-UP-DP10" />
diff --git a/test/Makefile.in b/test/Makefile.in
index 1d6b1a3..cf5f601 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -143,6 +143,7 @@ DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
+DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
@@ -219,6 +220,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -239,6 +241,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
@@ -262,6 +266,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -308,7 +313,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
diff --git a/test/pixma_parse.c b/test/pixma_parse.c
index 5068e61..0fc368b 100644
--- a/test/pixma_parse.c
+++ b/test/pixma_parse.c
@@ -26,6 +26,8 @@
 
 #define MAX_COLORS 36  /* was: 8 maximum number of Colors: CMYKcmyk */
 
+#define DEBUG 0 /* 1 for debugging only */
+
 #include "pixma_parse.h"
 
 /*TODO: 
@@ -66,13 +68,13 @@ static int nextcmd( FILE *infile,unsigned char* cmd,unsigned char *buf, unsigned
 		    /* start: */
 		    startxml=680;
 		    xmldata=fread(buf,1,679,infile); /* 1 less than 680 */
-		    printf("nextcmd: read starting XML %d %d\n", *xml_read, startxml);
+		    fprintf(stderr,"nextcmd: read starting XML %d %d\n", *xml_read, startxml);
 		    *xml_read=1;
 		  }else if (*xml_read==1) {
 		    /* end */
 		    endxml=263;
 		    xmldata=fread(buf,1,262,infile); /* 1 less than 263*/
-		    printf("nextcmd: read ending XML %d %d\n", *xml_read, endxml);
+		    fprintf(stderr,"nextcmd: read ending XML %d %d\n", *xml_read, endxml);
 		    *xml_read=2;
 		  }
 		  /* no alternatives yet */
@@ -90,20 +92,20 @@ static int nextcmd( FILE *infile,unsigned char* cmd,unsigned char *buf, unsigned
 				if (*cnt){  /* read arguments */
 					unsigned int read;
 					if((read=fread(buf,1,*cnt,infile)) != *cnt){
-						printf("nextcmd: read error - not enough data %d %d\n", read, *cnt);
+						fprintf(stderr,"nextcmd: read error - not enough data %d %d\n", read, *cnt);
 						return -1;
 					}
 				}
 				return 0;
 			}else if(c2 == '@'){ /* ESC@ */
-				printf("ESC @ Return to neutral mode\n");
+				fprintf(stderr,"ESC @ Return to neutral mode\n");
 			} else {
-				printf("unknown byte following ESC %x \n",c2);
+				fprintf(stderr,"unknown byte following ESC %x \n",c2);
 			}
 		}else if(c1==0x0c){ /* Form Feed */
-			printf("-->Form Feed\n");
+			fprintf(stderr,"-->Form Feed\n");
 		}else{
-			printf("UNKNOWN BYTE 0x%x @ %lu\n",c1,ftell(infile));
+			fprintf(stderr,"UNKNOWN BYTE 0x%x @ %lu\n",c1,ftell(infile));
 		}
 	}
 	return -1;
@@ -119,12 +121,25 @@ static color_t* get_color(image_t* img,char name){
 	return NULL;
 }
 
+/* return pointer to color info structure matching name less 0x80 */
+static color_t* get_color2(image_t* img,char name){
+	int i;
+	for(i=0;i<MAX_COLORS;i++) {
+	  /*printf("get_color2: %i -- name=%c\n",i,img->color[i].name);*/
+	  if(img->color[i].name==(name)) { /* add 0x80 to get the hex value in the inkset */
+	    /*printf("get_color2: %i returning for %c\n",i,img->color[i].name);*/
+	    return &(img->color[i]);
+	  }
+	}
+	return NULL;
+}
+
 static int valid_color(unsigned char color){
 	int i;
 	for(i=0;i<sizeof(valid_colors) / sizeof(valid_colors[0]);i++)
 		if(valid_colors[i] == color)
 			return 1;
-	printf("unknown color %c 0x%x\n",color,color);
+	fprintf(stderr," [valid_color] unknown color 0x%x\n",color);
 	return 0;
 }
 
@@ -151,21 +166,27 @@ static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned c
         char* buf = (char*)buffer;
 	int size=0; /* size of unpacked buffer */
 	int cur_line=0; /* line relative to block begin */
-
 	unsigned char* dst=malloc(len*256); /* the destination buffer */
 	unsigned char* dstr=dst;
-	if(!color){
-          printf("no matching color for %c (0x%x, %i) in the database => ignoring %i bytes\n",color_name,color_name,color_name, len);
+	/* if(!color){
+	   printf("no matching color for %c (0x%x, %i) in the database => ignoring %i bytes\n",color_name,color_name,color_name, len); 
+	   } */
+	if (DEBUG) {
+	  fprintf(stderr,"DEBUG enter Raster len=%i,color=%c\n",len,color_name);
 	}
 
 	/* decode pack bits */
-	while( len > 0){
+	while( len > 0){ /* why does this not work: because unsigned integer wraps! */
 		int c = *buf;
 		++buf;
 		--len;
+	
+		/*printf("DEBUG top of while loop len=%i\n",len);*/
+	
 		if(c >= 128)
 			c -=256;
 		if(c== -128){ /* end of line => decode and copy things here */
+		  /*printf("DEBUG end of line---decode and copy things here\n");*/
 			/* create new list entry */
 			if(color && size){
 				if(!color->tail)
@@ -179,9 +200,11 @@ static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned c
 					color->head->buf=calloc(1,size+8); /* allocate slightly bigger buffer for get_bits */
 					memcpy(color->head->buf,dstr,size);
 					color->head->len=size;
+					/*printf("DEBUG color not compressed\n");*/
 				}else{ /* handle 5pixel in 8 bits compression */
 					color->head->buf=calloc(1,size*2+8);
 					size=color->head->len=eight2ten(dstr,color->head->buf,size,size*2);
+					/*printf("DEBUG color compressed 5pixel in 8 bits \n");*/
 				}
 			}
 			/* adjust the maximum image width */
@@ -202,12 +225,15 @@ static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned c
 				c=*buf;
 				++buf;
 				--len;
+				/*printf("DEBUG repeat character %i\n",len);*/
 				memset(dst,c,i);
 				dst +=i;
 				size+=i;
 			}else{ /* normal code */
+			        /*printf("DEBUG normal code\n");*/
 				i=c+1;
 				len-=i;
+				/*printf("DEBUG before memcpy dst,buf,i. %d, %i\n",i,len);*/
 				memcpy( dst, buf, i);
 				buf +=i;
 				dst +=i;
@@ -222,6 +248,17 @@ static int Raster(image_t* img,unsigned char* buffer,unsigned int len,unsigned c
 
 /* checks if the buffer contains a pixel definition at the given x and y position */
 static inline int inside_range(color_t* c,int x,int y){
+  /* debug*/
+  /*  if ((c->name=='C' || c->name=='M' || c->name=='Y' || c->name=='c' || c->name=='m') && x==0 && y==0){
+    printf("%c: bpp: %d\n",c->name,c->bpp);
+    printf("%c: y: %d\n",c->name,y);
+    printf("%c: c->pos->line: %d\n",c->name,c->pos->line);
+    printf("%c: c->pos->len: %d\n",c->name,c->pos->len);
+    printf("%c: x: %d\n",c->name,x);
+    printf("%c: c->bpp*x: %d\n",c->name,c->bpp*x);
+    printf("%c: c->pos->len *8: %d\n",c->name,c->pos->len *8);
+    printf("---\n");
+    }*/
 	if(c->bpp && c->pos &&  c->pos->line==y && c->pos->len && (c->pos->len *8 >= c->bpp*x))
 		return 1;
 	return 0;
@@ -254,9 +291,16 @@ static void write_line(image_t*img,FILE* fp,int pos_y){
 	color_t* m=get_color(img,'m');
 	color_t* y=get_color(img,'y');
 	color_t* k=get_color(img,'k');
-	color_t* H=get_color(img,'H');
-	color_t* R=get_color(img,'R');
-	color_t* G=get_color(img,'G');
+	/*color_t* H=get_color(img,'H');*/
+	/*color_t* R=get_color(img,'R');*/
+	/*color_t* G=get_color(img,'G');*/
+	/* experimenting with strange colors */
+	color_t* P=get_color2(img,'P');
+	color_t* Q=get_color2(img,'Q');
+	color_t* R=get_color2(img,'R');
+	color_t* S=get_color2(img,'S');
+	color_t* T=get_color2(img,'T');
+
 	/* color_t* A=get_color(img,'A'); */
 	/* color_t* B=get_color(img,'B'); */
 	/* color_t* D=get_color(img,'D'); */
@@ -292,23 +336,51 @@ static void write_line(image_t*img,FILE* fp,int pos_y){
 	}
 	for(x=0;x<img->width;x++){
 		int lK=0,lM=0,lY=0,lC=0;
-		/* get pixel values */
+		/* initialize so can add same colors together later  */
+		for(i=0;i<MAX_COLORS;i++){
+		  img->color[i].value=0;
+		  }
 		for(i=0;i<MAX_COLORS;i++){
-		  if(inside_range(&img->color[i],x,pos_y))
-		    img->color[i].value = get_bits(&gb[i],img->color[i].bpp);
-		  else
+		  if(inside_range(&img->color[i],x,pos_y)) {
+		    /*img->color[i].value = get_bits(&gb[i],img->color[i].bpp);*/
+		    img->color[i].value += get_bits(&gb[i],img->color[i].bpp);
+		    /*		    printf("getting pixel values for color %d\n",i);*/
+		    /*if (img->color[i].value != 0)
+		      printf("what pixel values for color %d: %x\n",i,img->color[i].value);*/
+		    if (i>7){
+		      fprintf(stderr,"getting pixel values for color %d\n",i);/* only going 0 1 2 4 5 --- missing i>7 bugger! */
+		      /*img->color[i].value = 1;*/
+		      fprintf(stderr,"color %c has value %d\n",img->color[i].name,img->color[i].value);
+		    }
+		    /* add 0x80 to colors where 0x80 is seen added in inkset */
+		  }
+		  else if(i>7) {
+		    /* can we force some results here? */
+		    /*img->color[i].value = 1;*/
+		    /*get_bits(&gb[i],img->color[i].bpp);*/
+		  }
+		  else {
+		    /*printf(" NOT getting pixel values for color %d\n",i);*/
 		    img->color[i].value = 0;
+		  }
 		  /* update statistics */
 		  (img->color[i].dots)[img->color[i].value] += 1;
 		  /* set to 1 if the level is used */	
 		  (img->color[i].usedlevels)[img->color[i].value]=1;
 		}
 		/* calculate CMYK values */
+		/*
+		lK=K->density * K->value/(K->level-1) + k->density * k->value/(k->level-1);
+		lM=M->density * M->value/(M->level-1) + m->density * m->value/(m->level-1);
+		lY=Y->density * Y->value/(Y->level-1) + y->density * y->value/(y->level-1);
+		lC=C->density * C->value/(C->level-1) + c->density * c->value/(c->level-1);*/
+
 		lK=K->density * K->value/(K->level-1) + k->density * k->value/(k->level-1);
 		lM=M->density * M->value/(M->level-1) + m->density * m->value/(m->level-1);
 		lY=Y->density * Y->value/(Y->level-1) + y->density * y->value/(y->level-1);
 		lC=C->density * C->value/(C->level-1) + c->density * c->value/(c->level-1);
 
+
 		/* detect image edges */
 		if(lK || lM || lY || lC){
 			if(!img->image_top)
@@ -338,8 +410,9 @@ static void write_line(image_t*img,FILE* fp,int pos_y){
 	}
 
 	/* output line */
-	if((written = fwrite(line,img->width,3,fp)) != 3)
-		printf("fwrite failed %u vs %u\n",written,img->width*3);
+	if((written = fwrite(line,img->width,3,fp)) != 3) {
+		fprintf(stderr,"fwrite failed %u vs %u\n",written,img->width*3);
+	}
 	free(line);
 }
 
@@ -420,7 +493,7 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 	unsigned int xml_read;
 	xml_read=0;
 
-	printf("------- parsing the printjob -------\n");
+	fprintf(stderr,"------- parsing the printjob -------\n");
 	while(!returnv && !feof(in)){
 		unsigned char cmd;
 		unsigned int cnt = 0;
@@ -428,52 +501,60 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 			break;
 		switch(cmd){
 			case 'c':
-				printf("ESC (c set media (len=%i):\n",cnt);
-				printf(" model id %x bw %x",buf[0]>> 4,buf[0]&0xf);
-				printf(" media %x",buf[1]);
-				printf(" direction %x quality %x\n",(buf[2]>>4)&3 ,buf[2]&0xf);
+				fprintf(stderr,"ESC (c set media (len=%i):\n",cnt);
+				fprintf(stderr," model id %x bw %x",buf[0]>> 4,buf[0]&0xf);
+				fprintf(stderr," media %x",buf[1]);
+				fprintf(stderr," direction %x quality %x\n",(buf[2]>>4)&3 ,buf[2]&0xf);
 				break;
 			case 'K':
 				if(buf[1]==0x1f){
-					printf("ESC [K go to command mode\n");
+				  fprintf(stderr,"ESC [K go to command mode\n");
 					do{
 						fgets((char*)buf,0xFFFF,in);
-						printf(" %s",buf);
+						fprintf(stderr," %s",buf);
 					}while(strcmp((char*)buf,"BJLEND\n"));
 				}else if(cnt == 2 && buf[1]==0x0f){
-					printf("ESC [K reset printer\n");
+					fprintf(stderr,"ESC [K reset printer\n");
 					img->width=0;
 					img->height=0;
-				}else
-					printf("ESC [K unsupported param (len=%i): %x\n",cnt,buf[1]);
+				}else{
+					fprintf(stderr,"ESC [K unsupported param (len=%i): %x\n",cnt,buf[1]);
+				}
 				break;
 			case 'b':
-				printf("ESC (b set data compression (len=%i): %x\n",cnt,buf[0]);
+				fprintf(stderr,"ESC (b set data compression (len=%i): %x\n",cnt,buf[0]);
 				break;
 			case 'I':
-				printf("ESC (I select data transmission (len=%i): ",cnt);
-				if(buf[0]==0)printf("default");
-				else if(buf[0]==1)printf("multi raster");
-				else printf("unknown 0x%x %i",buf[0],buf[0]);
-				printf("\n");
+				fprintf(stderr,"ESC (I select data transmission (len=%i): ",cnt);
+				if(buf[0]==0)fprintf(stderr,"default");
+				else if(buf[0]==1)fprintf(stderr,"multi raster");
+				else fprintf(stderr,"unknown 0x%x %i",buf[0],buf[0]);
+				fprintf(stderr,"\n");
 				break;
 			case 'l':
-				printf("ESC (l select paper loading (len=%i):\n",cnt);
-				printf(" model id 0x%x ",buf[0]>>4);
-				printf(" source 0x%x",buf[0]&15);
-				printf(" media: %x",buf[1]);
-				printf(" paper gap: %x\n",buf[2]);
+				fprintf(stderr,"ESC (l select paper loading (len=%i):\n",cnt);
+				fprintf(stderr," model id 0x%x ",buf[0]>>4);
+				fprintf(stderr," source 0x%x",buf[0]&15);
+				if ( cnt == 3 ) {
+				  fprintf(stderr," media: %x",buf[1]);
+				  fprintf(stderr," paper gap: %x\n",buf[2]);
+				} else
+				  fprintf(stderr," media: %x\n",buf[1]);
 				break;
 			case 'd':
 				img->xres = (buf[0]<<8)|buf[1];
 				img->yres = (buf[2]<<8)|buf[3];
-				printf("ESC (d set raster resolution (len=%i): %i x %i\n",cnt,img->xres,img->yres);
+				fprintf(stderr,"ESC (d set raster resolution (len=%i): %i x %i\n",cnt,img->xres,img->yres);
 				break;
 			case 't':
-				printf("ESC (t set image cnt %i\n",cnt);
+			  fprintf(stderr,"ESC (t set image cnt %i\n",cnt);
 				if(buf[0]>>7){
 				        /* usual order */
-				        char order[]="CMYKcmykHRGABDEFIJLMNOPQSTUVWXZabdef";
+				        /*char order[]="CMYKcmykHRGABDEFIJLMNOPQSTUVWXZabdef";*/
+				        /* iP3500 test */
+				        char order[]="CMYKcmykHRGBCMYcmykabd";
+				        /*char order[]="CMYKcmykHpnoPQRSTykabd";*/
+				        /*char order[]="KCMYkcmyHpnoPQRSTykabd";*/
 				        /* MP960 photo modes: k instead of K */
 					/* char order[]="CMYkcmyKHRGABDEFIJLMNOPQSTUVWXZabdef";*/
 					/* T-shirt transfer mode: y changed to k --- no y, no K */
@@ -484,23 +565,23 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 				        /* char order[]="KCcMmYykRHGABDEFIJLMNOPQSTUVWXZabdef"; */
 					int black_found = 0;
 					int num_colors = (cnt - 3)/3;
-					printf(" bit_info: using detailed color settings for max %i colors\n",num_colors);
+					fprintf(stderr," bit_info: using detailed color settings for max %i colors\n",num_colors);
 					if(buf[1]==0x80)
-						printf(" format: BJ indexed color image format\n");
+					  fprintf(stderr," format: BJ indexed color image format\n");
                                         else if(buf[1]==0x00)
-						printf(" format: iP8500 flag set, BJ indexed color image format\n");
+						fprintf(stderr," format: iP8500 flag set, BJ indexed color image format\n");
                                         else if(buf[1]==0x90)
-						printf(" format: Pro9500 flag set, BJ indexed color image format\n");
+						fprintf(stderr," format: Pro9500 flag set, BJ indexed color image format\n");
 					else{
-						printf(" format: settings not supported 0x%x\n",buf[1]);
+						fprintf(stderr," format: settings not supported 0x%x\n",buf[1]);
 						/* returnv = -2; */
 					}
 					if(buf[2]==0x1)
-					        printf(" ink: BJ indexed setting, also for iP8500 flag\n");
+					        fprintf(stderr," ink: BJ indexed setting, also for iP8500 flag\n");
 					else if(buf[2]==0x4)
-					        printf(" ink: Pro series setting \n");
+					        fprintf(stderr," ink: Pro series setting \n");
 					else{
-						printf(" ink: settings not supported 0x%x\n",buf[2]);
+						fprintf(stderr," ink: settings not supported 0x%x\n",buf[2]);
 						/* returnv = -2; */
 					}
 
@@ -524,12 +605,17 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 					    
 					    /* this is not supposed to give accurate images */
 					    /* if(i<4) */ /* set to actual colors CMYK */
-					    if((img->color[i].name =='K')||(img->color[i].name =='C')||(img->color[i].name =='M')||(img->color[i].name =='Y') ) 
+					    if((img->color[i].name =='K')||(img->color[i].name =='C')||(img->color[i].name =='M')||(img->color[i].name =='Y') ) {
 					      img->color[i].density = 255;
+					      /*if (i>7)*/
+						/*img->color[i].density -= 128; */
+					      /* see if can subtract something from CMYK where 0x80 involved */
+					    }					    
 					    else
 					      img->color[i].density = 128; /*128+96;*/ /* try to add 0x80 to sub-channels for MP450 hi-quality mode */
 					    if((order[i] == 'K' || order[i] == 'k') && img->color[i].bpp)
 					      black_found = 1;
+					    /*
 					    if(order[i] == 'y' && !black_found && img->color[i].level){
 					      printf("iP6700 hack: treating color definition at the y position as k\n");
 					      img->color[i].name = 'k';
@@ -537,11 +623,13 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 					      order[i+1] = 'y';
 					      black_found = 1;
 					      img->color[i].density = 255;
-					    } /* %c*/
-					    printf(" Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
+					    } 
+					    */
+					    /* %c*/
+					    fprintf(stderr," Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
 						   img->color[i].compression,img->color[i].bpp,img->color[i].level);
 					  }else{
-					    printf(" Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
+					    fprintf(stderr," Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
 						   img->color[i].compression,img->color[i].bpp,img->color[i].level);
 					    /*printf(" Color ignoring setting %x %x %x\n",buf[3+i*3],buf[3+i*3+1],buf[3+i*3+2]);*/
 					  }
@@ -550,14 +638,16 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 					
 					
 				}else if(buf[0]==0x1 && buf[1]==0x0 && buf[2]==0x1){
-					printf(" 1bit-per pixel\n");
+					fprintf(stderr," 1bit-per pixel\n");
 					int num_colors = cnt*3; /*no idea yet! 3 for iP4000 */
 					/*num_colors=9;*/
 					/*for(i=0;i<MAX_COLORS;i++){*/
 					for(i=0;i<num_colors;i++){
 					  if(i<MAX_COLORS){	
 					        /* usual */
-					        const char order[]="CMYKcmykHRGABDEFIJLMNOPQSTUVWXZabdef";
+					        /* const char order[]="CMYKcmykHRGABDEFIJLMNOPQSTUVWXZabdef";*/
+				                /* iP3500 test */
+				                char order[]="CMYKcmykHRGBCMYcmykabd";
 						/* MP990, MG6100, MG8100 plain modes */
 						/*const char order[]="KCcMmYykRHGABDEFIJLMNOPQSTUVWXZabdef";*/
 						img->color[i].name=order[i];
@@ -566,46 +656,47 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 						img->color[i].level=2;
 						img->color[i].density = 255;
 						/*add color printout for this type also %c */
-						printf(" Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
+						fprintf(stderr," Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
 						       img->color[i].compression,img->color[i].bpp,img->color[i].level);
 					  }else{
-					    printf(" Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
+					    fprintf(stderr," Color %c Compression: %i bpp %i level %i\n",img->color[i].name,
 						       img->color[i].compression,img->color[i].bpp,img->color[i].level);
 						/*printf(" Color ignoring setting %x %x %x\n",buf[3+i*3],buf[3+i*3+1],buf[3+i*3+2]);*/
 					  }
 					}
 				}else{
-					printf(" bit_info: unknown settings 0x%x 0x%x 0x%x\n",buf[0],buf[1],buf[2]);
+					fprintf(stderr," bit_info: unknown settings 0x%x 0x%x 0x%x\n",buf[0],buf[1],buf[2]);
 					/* returnv=-2; */
 				}
 				break;
 			case 'L':
-				printf("ESC (L set component order for F raster command (len=%i): ",cnt);
+				fprintf(stderr,"ESC (L set component order for F raster command (len=%i): ",cnt);
 				img->color_order=calloc(1,cnt+1);
 				/* check if the colors are sane => the iP4000 driver appends invalid bytes in the highest resolution mode */
 				for(i=0;i<cnt;i++){
 				  if (!valid_color(buf[i]))
-				    if (!(valid_color(buf[i]-0x80))) {
-				      printf("invalid color char [failed on initial]\n");
-				      break;
-				    }
-				    else {
-				      buf[i]=buf[i]-0x80;
-				      printf("subtracting 0x80 to give [corrected]: %c\n", buf[i]);
+                                    {
+				    /*if (!(valid_color(buf[i]-0x60))) {*/
+				    /*  printf("invalid color char %c [failed on initial]\n", buf[i]);*/
+				    /*  break; */
+				    /*}*/
+				    /*else {*/
+				      buf[i]=buf[i]-0x60;
+				      fprintf(stderr,"subtracting 0x60 to give [corrected]: %c\n", buf[i]);
 				    }
 				  else
-				    printf("found valid color char: %c\n",buf[i]);
+				    fprintf(stderr,"found valid color char: %c\n",buf[i]);
 				}
 				cnt = i;
 				memcpy(img->color_order,buf,cnt);
-				printf("%s\n",img->color_order);
+				fprintf(stderr,"%s\n",img->color_order);
 				img->num_colors = cnt;
 				img->cur_color=0;
 				break;
 			case 'p':
-				printf("ESC (p set extended margin (len=%i):\n",cnt);
-                                printf(" printed length %i left %i\n",((buf[0]<<8 )+buf[1]) *6 / 5,(buf[2]<<8) + buf[3]);
-                                printf(" printed width %i top %i\n",((buf[4]<<8 )+buf[5]) * 6 / 5,(buf[6]<<8) + buf[7]);
+				fprintf(stderr,"ESC (p set extended margin (len=%i):\n",cnt);
+                                fprintf(stderr," printed length %i left %i\n",((buf[0]<<8 )+buf[1]) *6 / 5,(buf[2]<<8) + buf[3]);
+                                fprintf(stderr," printed width %i top %i\n",((buf[4]<<8 )+buf[5]) * 6 / 5,(buf[6]<<8) + buf[7]);
 
                                 if(cnt > 8){
 					int unit = (buf[12] << 8)| buf[13];
@@ -617,30 +708,30 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 					int paper_top = read_uint32(buf+34);
 					unsigned int paper_width = read_uint32(buf+38);
 					unsigned int paper_length = read_uint32(buf+42);
-                                        printf(" unknown %i\n",read_uint32(buf+8));
-                                        printf(" unit %i [1/in]\n",unit);
-                                        printf(" area_right %i %.1f mm\n",area_right,area_right * 25.4 / unit);
-                                        printf(" area_top %i %.1f mm\n",area_top,area_top * 25.4 / unit);
-                                        printf(" area_width %u %.1f mm\n",area_width, area_width * 25.4 / unit);
-                                        printf(" area_length %u %.1f mm\n",area_length,area_length * 25.4 / unit);
-                                        printf(" paper_right %i %.1f mm\n",paper_right,paper_right * 25.4 / unit);
-                                        printf(" paper_top %i %.1f mm\n",paper_top,paper_top * 25.4 / unit);
-                                        printf(" paper_width %u %.1f mm\n",paper_width,paper_width * 25.4 / unit);
-                                        printf(" paper_length %u %.1f mm\n",paper_length,paper_length * 25.4 / unit);
+                                        fprintf(stderr," unknown %i\n",read_uint32(buf+8));
+                                        fprintf(stderr," unit %i [1/in]\n",unit);
+                                        fprintf(stderr," area_right %i %.1f mm\n",area_right,area_right * 25.4 / unit);
+                                        fprintf(stderr," area_top %i %.1f mm\n",area_top,area_top * 25.4 / unit);
+                                        fprintf(stderr," area_width %u %.1f mm\n",area_width, area_width * 25.4 / unit);
+                                        fprintf(stderr," area_length %u %.1f mm\n",area_length,area_length * 25.4 / unit);
+                                        fprintf(stderr," paper_right %i %.1f mm\n",paper_right,paper_right * 25.4 / unit);
+                                        fprintf(stderr," paper_top %i %.1f mm\n",paper_top,paper_top * 25.4 / unit);
+                                        fprintf(stderr," paper_width %u %.1f mm\n",paper_width,paper_width * 25.4 / unit);
+                                        fprintf(stderr," paper_length %u %.1f mm\n",paper_length,paper_length * 25.4 / unit);
 					img->top = (float)area_top / unit;
 					img->left = (float)area_top / unit;
                                 }
 				break;
 			case '$':
-				printf("ESC ($ set duplex (len=%i)\n",cnt);
+				fprintf(stderr,"ESC ($ set duplex (len=%i)\n",cnt);
 				break;
 			case 'J':
-				printf("ESC (J select number of raster lines per block (len=%i): %i\n",cnt,buf[0]);
+				fprintf(stderr,"ESC (J select number of raster lines per block (len=%i): %i\n",cnt,buf[0]);
 				img->lines_per_block=buf[0];
 				break;
 			case 'F':
 				if(verbose)
-					printf("ESC (F raster block (len=%i):\n",cnt);
+					fprintf(stderr,"ESC (F raster block (len=%i):\n",cnt);
 				if((returnv = Raster(img,buf,cnt,img->color_order[img->cur_color],maxw)))
 					break;
 				++img->cur_color;
@@ -650,17 +741,17 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 				}
 				break;
 			case 'q':
-				printf("ESC (q set page id (len=%i):%i\n",cnt,buf[0]);
+				fprintf(stderr,"ESC (q set page id (len=%i):%i\n",cnt,buf[0]);
 				break;
 			case 'r':
-				printf("ESC (r printer specific command (len=%i): ",cnt);
+				fprintf(stderr,"ESC (r printer specific command (len=%i): ",cnt);
 				for(i=0;i<cnt;i++)
-					printf("0x%x ",buf[i]);
-				printf("\n");
+					fprintf(stderr,"0x%x ",buf[i]);
+				fprintf(stderr,"\n");
 				break;
 			case 'A':
 				if(verbose)
-					printf("ESC (A raster line (len=%i): color %c\n",cnt,buf[0]);
+					fprintf(stderr,"ESC (A raster line (len=%i): color %c\n",cnt,buf[0]);
 				/* the single line rasters are not terminated by 0x80 => do it here
 				 * instead of 0x80 every raster A command is followed by a 0x0d byte
 				 * the selected color is stored in the first byte
@@ -668,13 +759,13 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 				buf[cnt]=0x80;
 				returnv = Raster(img,buf+1,cnt,buf[0],maxw);
 				if (fgetc(in)!=0x0d){
-					printf("Raster A not terminated by 0x0d\n");
+					fprintf(stderr,"Raster A not terminated by 0x0d\n");
 					returnv=-4;
 				}
 				break;
 			case 'e': /* Raster skip */
 				if(verbose)
-					printf("ESC (e advance (len=%i): %i\n",cnt,buf[0]*256+buf[1]);
+					fprintf(stderr,"ESC (e advance (len=%i): %i\n",cnt,buf[0]*256+buf[1]);
 				if(img->lines_per_block){
 					img->height += (buf[0]*256+buf[1])*img->lines_per_block;
 					img->cur_color=0;
@@ -682,22 +773,22 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
 					img->height += (buf[0]*256+buf[1]);
 				break;
 			default: /* Last but not least completely unknown commands */
-				printf("ESC (%c UNKNOWN (len=%i)\n",cmd,cnt);
+				fprintf(stderr,"ESC (%c UNKNOWN (len=%i)\n",cmd,cnt);
 				for(i=0;i<cnt;i++)
-					printf(" 0x%x",buf[i]);
-				printf("\n");
+					fprintf(stderr," 0x%x",buf[i]);
+				fprintf(stderr,"\n");
 
 		}
 	}
 
-	printf("-------- finished parsing   --------\n");
+	fprintf(stderr,"-------- finished parsing   --------\n");
 	if(returnv < -2){ /* was < 0 :  work around to see what we get */
-		printf("error: parsing the printjob failed error %i\n",returnv);
+		fprintf(stderr,"error: parsing the printjob failed error %i\n",returnv);
 	} else {
 	
-		printf("created bit image with width %i height %i\n",img->width,img->height);
+		fprintf(stderr,"created bit image with width %i height %i\n",img->width,img->height);
 		if(maxh > 0){
-			printf("limiting height to %u\n",maxh);
+			fprintf(stderr,"limiting height to %u\n",maxh);
 			img->height=maxh;
 		}
 
@@ -706,7 +797,7 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
          	*/
 		if(out)
 			write_ppm(img,out);
-		printf("dots: %u\n",img->dots);
+		fprintf(stderr,"dots: %u\n",img->dots);
 
 	}
 	/* deallocate resources */
@@ -748,7 +839,7 @@ int main(int argc,char* argv[]){
 	char* filename_in=NULL,*filename_out=NULL;
 	FILE *in,*out=NULL;
 	int i;
-	printf("pixma_parse - parser for Canon BJL printjobs (c) 2005-2007 Sascha Sommer <saschasommer@freenet.de>\n");
+	printf("pixma_parse - parser for Canon BJL printjobs (c) 2005-2007 Sascha Sommer <saschasommer@freenet.de>\nPlease note parse output now goes to stderr.\n");
 
 	/* parse args */
 	for(i=1;i<argc;i++){
@@ -775,7 +866,7 @@ int main(int argc,char* argv[]){
 					return 1;
 				}
 			}else {
-				printf("unknown parameter %s\n",argv[i]);
+			  printf("unknown parameter %s\n",argv[i]);
 				return 1;
 			}
 		}else if(!filename_in){
@@ -794,13 +885,13 @@ int main(int argc,char* argv[]){
 
 	/* open input file */
 	if(!(in=fopen(filename_in,"rb"))){
-		printf("unable to open input file %s\n",filename_in);
+	  printf("unable to open input file %s\n",filename_in);
 		return 1;
 	}
 
 	/* open output file */
 	if(filename_out && !(out=fopen(filename_out,"wb"))){
-		printf("can't create the output file %s\n",filename_out);
+	  printf("can't create the output file %s\n",filename_out);
 		fclose(in);
 		return 1;
 	}
diff --git a/test/pixma_parse.h b/test/pixma_parse.h
index 5faebd9..3307204 100644
--- a/test/pixma_parse.h
+++ b/test/pixma_parse.h
@@ -258,7 +258,6 @@ typedef struct image_s {
         int lines_per_block;
 } image_t;
 
-/* FIXME what are the 0xa3 and 0xad for? they are used in the PIXMA iP4200 CD mode */
 /*static const unsigned char valid_colors[] = {'C','M','Y','K','c','m','y','k',0xa3,0xad}; */
 static const unsigned char valid_colors[] = {'C','M','Y','K','c','m','y','k','R','G','H','A','B','D','E','F','I','J','L','M','N','O','P','Q','S','T','U','V','W','X','Z','a','b','d','e','f'}; 
 #endif